From patchwork Sat Feb 11 11:51:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 55791 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1455189wrn; Sat, 11 Feb 2023 03:53:49 -0800 (PST) X-Google-Smtp-Source: AK7set8nYu/9d0ihApRJSEPjuWVwTDVeFJ5HRPfzycxnH6zY+vZOIw4wd4P46L3fZ+yxN2CDircA X-Received: by 2002:a05:6a20:3d03:b0:bc:d677:6a7b with SMTP id y3-20020a056a203d0300b000bcd6776a7bmr23978546pzi.47.1676116429658; Sat, 11 Feb 2023 03:53:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676116429; cv=none; d=google.com; s=arc-20160816; b=hVHvsF6TG7SZyV95h+QlV7kpxICPBQyLP0x3AEPVJFTZ8fYQVvM+WYSMcKSHqCjfBf bAGCR9Vq/0hm63fqwU3B5SYSjhBggGDetVLGeDtsJAJAGWujNMAxeQMggMHgwmlMiDUj QuclYV0/APHS7rOWIk8ra+1Wf7ExGB4tSgq2wJdF9OMPHt/KfoxrHNAXl0lRcoYAqFQQ NiMZKeYBj0cCO2Yf3AIg6V6dv9Ic6/QZQuPOX9IgwcNlJbgl2bmU66ZXj9v4MQStLgoG KAxfNC9J4V7HDlw4e5Blj10PhVNiZwdR9WgkwgraHqQ0JzDI4qR7334WMd67CGbTi4TJ CPlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=6d/ZVSA0QFC6MXtjamKYBGsXvhDKvXab75YapPa5sNQ=; b=XqUkWG0AeeRMomGOe+1o05rfyKCQlZjGwgpBlDIhKv0hzwctwQuO8GEy0V4HaUdsCK I/h5lrb5Cb59JTGwoty9UPW77wyMHgpEQgQdu/2uxLKK27NOfQC32izTEKD14sx+mQKS z9KWa/ZIxE4WGToVi1xbNhFsU8sAZ9pNv7RGxRt+d81GtZKcjjuxcWOInT9lIrAJadmG oRY76D0j1ceUipDTX0cZgjEOtk0zd9ujhBNrX9UzxwYBMHCF9cGywyaNuXn2YxX70Dwg crb+Gts0D6RESkI2MLZcl/KNNWtk8YOuay9unfL7LSJs8eAJIcDVzXxQFGK5tweZpARs 0mSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rkpcdafC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t28-20020a63955c000000b004fb220ca56bsi6753074pgn.137.2023.02.11.03.53.36; Sat, 11 Feb 2023 03:53:49 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rkpcdafC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230191AbjBKLwM (ORCPT + 99 others); Sat, 11 Feb 2023 06:52:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58764 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229629AbjBKLwG (ORCPT ); Sat, 11 Feb 2023 06:52:06 -0500 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2AC83196AC for ; Sat, 11 Feb 2023 03:51:54 -0800 (PST) Received: by mail-ed1-x52f.google.com with SMTP id u21so7341178edv.3 for ; Sat, 11 Feb 2023 03:51:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6d/ZVSA0QFC6MXtjamKYBGsXvhDKvXab75YapPa5sNQ=; b=rkpcdafCk9gxjEwIKlPV311jheyalW+L/U1VJddyjYZYeZzPJkfScGT3MrI68COmNo u9c/OzbbOCh59N0qCxva15f/1VY5aYUo14KMrwsWuPJ/F+BHkZTNDb7S12sHWWpIZ2EN cDh8F4ovZS6wSo8Pmr0Oa8jC6zMLZjFlLD2XzRjsZZmUBQsRoCi2ilB19nxqd7XUY8bj cjriyF+L1z7+Sqj3nbkTWtSyOQiY4FOPYJFHmPrVL4Kt8cfS2QXbd4PXjnsn6jHwCAlj FEN0CdN3NotV6Tx1qz7qPL/ULJ4VMCs03jem1hN5aM5d+q+uUM+bPAzqY7wY6aGG6g+V o91A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6d/ZVSA0QFC6MXtjamKYBGsXvhDKvXab75YapPa5sNQ=; b=7/YSkDfk0tihBiwzC3kEoVM3XeH6FtJLPWOId87w6aHoCvTlY8BAHdkSHRnYN9pP6V glcdxUUSCeWJrKXWg8U2FS1bQ8P2jVLoQRPHMa2iMqLyZR1eEI8UP6JLh0t+GlVPpx7G UFBGCdY4FmjjHI8GLPEm4RtzD1eVjMbtwlFM7G8GzMuVCw+h+lE6dqsfOqc5XPMIKl48 3amn1RHIEDWejnpZs/geLxuA8HRVOXB2V/lAdRk2XrcYU2gAB9w+w1uj2XcurWetqBUl FOkOvTrkMRo7j7w95xe+Y8u4s9M261gDjQKIG+fqqmH+NISepyXMJHOlt9xERdl7SCIV I2Ww== X-Gm-Message-State: AO0yUKX+FaGNfT9okbOFWXsM1KO+9K8hZeAC91Y0FGBLhn/U9oKLJmIm 7oFbPzSg31pVBWnD82kcrVsLkw== X-Received: by 2002:a50:a6dc:0:b0:4ac:bd84:43d8 with SMTP id f28-20020a50a6dc000000b004acbd8443d8mr311825edc.8.1676116312398; Sat, 11 Feb 2023 03:51:52 -0800 (PST) Received: from localhost.localdomain (abxh117.neoplus.adsl.tpnet.pl. [83.9.1.117]) by smtp.gmail.com with ESMTPSA id r10-20020a50d68a000000b004aabb714230sm3636070edi.35.2023.02.11.03.51.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 03:51:52 -0800 (PST) From: Konrad Dybcio To: linux-arm-msm@vger.kernel.org, andersson@kernel.org, agross@kernel.org, krzysztof.kozlowski@linaro.org Cc: marijn.suijten@somainline.org, Konrad Dybcio , Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , Douglas Anderson , Loic Poulain , Neil Armstrong , Vinod Koul , Vladimir Lypak , dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 03/10] drm/msm/dsi: Zero-terminate msm_dsi_config::io_start Date: Sat, 11 Feb 2023 12:51:03 +0100 Message-Id: <20230211115110.1462920-4-konrad.dybcio@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230211115110.1462920-1-konrad.dybcio@linaro.org> References: <20230211115110.1462920-1-konrad.dybcio@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757535461349845444?= X-GMAIL-MSGID: =?utf-8?q?1757535461349845444?= In preparation for supporting multiple sets of possible base registers, Zero-terminate the array that contains them to remove the need of specifying num_dsi for each set. Signed-off-by: Konrad Dybcio --- drivers/gpu/drm/msm/dsi/dsi_cfg.c | 39 ++++++++++-------------------- drivers/gpu/drm/msm/dsi/dsi_cfg.h | 4 +-- drivers/gpu/drm/msm/dsi/dsi_host.c | 2 +- 3 files changed, 16 insertions(+), 29 deletions(-) diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.c b/drivers/gpu/drm/msm/dsi/dsi_cfg.c index 068d45b3a8f0..5f62c563bd1c 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_cfg.c +++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.c @@ -22,9 +22,8 @@ static const struct msm_dsi_config apq8064_dsi_cfg = { .bus_clk_names = dsi_v2_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_v2_bus_clk_names), .io_start = { - { 0x4700000, 0x5800000 }, + { 0x4700000, 0x5800000, 0 }, }, - .num_dsi = 2, }; static const char * const dsi_6g_bus_clk_names[] = { @@ -44,9 +43,8 @@ static const struct msm_dsi_config msm8974_apq8084_dsi_cfg = { .bus_clk_names = dsi_6g_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_6g_bus_clk_names), .io_start = { - { 0xfd922800, 0xfd922b00 }, + { 0xfd922800, 0xfd922b00, 0 }, }, - .num_dsi = 2, }; static const char * const dsi_8916_bus_clk_names[] = { @@ -65,9 +63,8 @@ static const struct msm_dsi_config msm8916_dsi_cfg = { .bus_clk_names = dsi_8916_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_8916_bus_clk_names), .io_start = { - { 0x1a98000 }, + { 0x1a98000, 0 }, }, - .num_dsi = 1, }; static const char * const dsi_8976_bus_clk_names[] = { @@ -86,9 +83,8 @@ static const struct msm_dsi_config msm8976_dsi_cfg = { .bus_clk_names = dsi_8976_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_8976_bus_clk_names), .io_start = { - { 0x1a94000, 0x1a96000 }, + { 0x1a94000, 0x1a96000, 0 }, }, - .num_dsi = 2, }; static const struct regulator_bulk_data msm8994_dsi_regulators[] = { @@ -107,9 +103,8 @@ static const struct msm_dsi_config msm8994_dsi_cfg = { .bus_clk_names = dsi_6g_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_6g_bus_clk_names), .io_start = { - { 0xfd998000, 0xfd9a0000 }, + { 0xfd998000, 0xfd9a0000, 0 }, }, - .num_dsi = 2, }; static const char * const dsi_8996_bus_clk_names[] = { @@ -129,9 +124,8 @@ static const struct msm_dsi_config msm8996_dsi_cfg = { .bus_clk_names = dsi_8996_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_8996_bus_clk_names), .io_start = { - { 0x994000, 0x996000 }, + { 0x994000, 0x996000, 0 }, }, - .num_dsi = 2, }; static const char * const dsi_msm8998_bus_clk_names[] = { @@ -150,9 +144,8 @@ static const struct msm_dsi_config msm8998_dsi_cfg = { .bus_clk_names = dsi_msm8998_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_msm8998_bus_clk_names), .io_start = { - { 0xc994000, 0xc996000 }, + { 0xc994000, 0xc996000, 0 }, }, - .num_dsi = 2, }; static const char * const dsi_sdm660_bus_clk_names[] = { @@ -170,9 +163,8 @@ static const struct msm_dsi_config sdm660_dsi_cfg = { .bus_clk_names = dsi_sdm660_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_sdm660_bus_clk_names), .io_start = { - { 0xc994000, 0xc996000 }, + { 0xc994000, 0xc996000, 0 }, }, - .num_dsi = 2, }; static const char * const dsi_sdm845_bus_clk_names[] = { @@ -194,9 +186,8 @@ static const struct msm_dsi_config sdm845_dsi_cfg = { .bus_clk_names = dsi_sdm845_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_sdm845_bus_clk_names), .io_start = { - { 0xae94000, 0xae96000 }, + { 0xae94000, 0xae96000, 0 }, }, - .num_dsi = 2, }; static const struct regulator_bulk_data sm8550_dsi_regulators[] = { @@ -210,9 +201,8 @@ static const struct msm_dsi_config sm8550_dsi_cfg = { .bus_clk_names = dsi_sdm845_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_sdm845_bus_clk_names), .io_start = { - { 0xae94000, 0xae96000 }, + { 0xae94000, 0xae96000, 0 }, }, - .num_dsi = 2, }; static const struct regulator_bulk_data sc7180_dsi_regulators[] = { @@ -226,9 +216,8 @@ static const struct msm_dsi_config sc7180_dsi_cfg = { .bus_clk_names = dsi_sc7180_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_sc7180_bus_clk_names), .io_start = { - { 0xae94000 }, + { 0xae94000, 0 }, }, - .num_dsi = 1, }; static const char * const dsi_sc7280_bus_clk_names[] = { @@ -246,9 +235,8 @@ static const struct msm_dsi_config sc7280_dsi_cfg = { .bus_clk_names = dsi_sc7280_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_sc7280_bus_clk_names), .io_start = { - { 0xae94000, 0xae96000 }, + { 0xae94000, 0xae96000, 0 }, }, - .num_dsi = 2, }; static const char * const dsi_qcm2290_bus_clk_names[] = { @@ -266,9 +254,8 @@ static const struct msm_dsi_config qcm2290_dsi_cfg = { .bus_clk_names = dsi_qcm2290_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_qcm2290_bus_clk_names), .io_start = { - { 0x5e94000 }, + { 0x5e94000, 0 }, }, - .num_dsi = 1, }; static const struct msm_dsi_host_cfg_ops msm_dsi_v2_host_ops = { diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.h b/drivers/gpu/drm/msm/dsi/dsi_cfg.h index df9f09876ccb..03493cc6b772 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_cfg.h +++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.h @@ -41,8 +41,8 @@ struct msm_dsi_config { int num_regulators; const char * const *bus_clk_names; const int num_bus_clks; - const resource_size_t io_start[VARIANTS_MAX][DSI_MAX]; - const int num_dsi; + /* Allow + 1 entry for the zero-terminator */ + const resource_size_t io_start[VARIANTS_MAX][DSI_MAX + 1]; }; struct msm_dsi_host_cfg_ops { diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c index 22ba8726b0ea..f5092b4d0757 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_host.c +++ b/drivers/gpu/drm/msm/dsi/dsi_host.c @@ -1868,7 +1868,7 @@ static int dsi_host_get_id(struct msm_dsi_host *msm_host) if (!res) return -EINVAL; - for (i = 0; i < cfg->num_dsi; i++) { + for (i = 0; cfg->io_start[0][i]; i++) { if (cfg->io_start[0][i] == res->start) return i; }