From patchwork Tue Jun 13 00:12:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 692169 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B7CD1C7EE2E for ; Tue, 13 Jun 2023 00:16:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239152AbjFMAQR (ORCPT ); Mon, 12 Jun 2023 20:16:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52268 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239172AbjFMAPU (ORCPT ); Mon, 12 Jun 2023 20:15:20 -0400 Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [IPv6:2a00:1450:4864:20::12d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 376E01FF2 for ; Mon, 12 Jun 2023 17:13:04 -0700 (PDT) Received: by mail-lf1-x12d.google.com with SMTP id 2adb3069b0e04-4f62cf9755eso5840026e87.1 for ; Mon, 12 Jun 2023 17:13:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686615161; x=1689207161; 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=gUCljY54Ij62McPnq0z5nAUMfwrJa995R+QcNnilpzs=; b=pFf62CWwClcqQaVr9LB+xrXuhF6kV4sq6TuRFDuS+IJZaP/c0+vdDVpo5JM52UVIo4 ZKwYqT0er0AJP9BlSWSWQ8k9A34EawQTPl6vQ9ZGXlcs52zOTSp8hNG0WEBKGu8DxG16 I9z4km0X95BirqzoxPdZ9vu7f1q/fplgvABwazB5CRvJNfK35VODn7jaW0M+xWG7SfNA 5ZIr+LG/F+0upBGKiq3nhA83Xwo07vxPxRcJR+F7NAzNZlsba8M07iEpWBpmDZrxqcZC 8vQquSnBFsMie6z2SyVcI3f96RqiLDniSMVkaMjFy5+azHdQaSckQN3rUQam+ofzvtP1 K4pQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686615161; x=1689207161; 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=gUCljY54Ij62McPnq0z5nAUMfwrJa995R+QcNnilpzs=; b=iQG3oxqg0EUU3IMoPOagzGob0sXQYDr/b5RuzeMlpHv9jBqkQtYmBH/fg4PcQgQEy1 r7wug3jlQHVJ6Q436rH0ib0Ok/DSvajFfsExK4qXQ+BSKEe5C/6xEoR0kDOdt0z+EHKz cUlIN6MZnNQ1KZT6gg6Hp3xSunSJA3/zqx2/zUMoKrmqUmTxDMraiSn114eqdlwbemPf l95qs0Bikvl5vI7OLktWKL6iC5evxIBaWPDViudPNoyJhHlGuwIRVGpA9rcn3wYW3+/w v81qA+9v7VLxmUSW3Vc+mxsaWKW2gMRfbBq4B82eTlNMXK8j2ihOupOSgO5LMyTtFqDy G03Q== X-Gm-Message-State: AC+VfDz2qzOQVCgQZp7pQTla3eiZ9mWw7U9CElrSGuZMHFor6pq/tEvG lmqb5dcuUEnrtjdYsfwRZvBQKf6zGKUTVm408K4= X-Google-Smtp-Source: ACHHUZ6dtx0WqVfXpDJ8TxQWHbCDzfL6UHOQk2RB1WbnYgip4B4UuYCV0z9B3gBkHhWJHNjQe9u7oQ== X-Received: by 2002:a19:4f4e:0:b0:4f6:40e1:4a92 with SMTP id a14-20020a194f4e000000b004f640e14a92mr5255011lfk.13.1686615161737; Mon, 12 Jun 2023 17:12:41 -0700 (PDT) Received: from eriador.lan (dzdqv0yyyyyyyyyyybcwt-3.rev.dnainternet.fi. [2001:14ba:a0db:1f00::8a5]) by smtp.gmail.com with ESMTPSA id h10-20020ac2596a000000b004efd3c2b746sm1586027lfp.162.2023.06.12.17.12.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 17:12:41 -0700 (PDT) From: Dmitry Baryshkov To: Rob Clark , Sean Paul , Abhinav Kumar , Marijn Suijten Cc: Stephen Boyd , David Airlie , Daniel Vetter , Bjorn Andersson , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org Subject: [PATCH v2 22/22] drm/msm/dpu: drop empty features mask INTF_SDM845_MASK Date: Tue, 13 Jun 2023 03:12:39 +0300 Message-Id: <20230613001239.3426881-3-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230613001239.3426881-1-dmitry.baryshkov@linaro.org> References: <20230613001004.3426676-1-dmitry.baryshkov@linaro.org>v2-0018*> <20230613001239.3426881-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The INTF_SDM845_MASK features mask is zero. Drop it completely. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 4 ---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h | 4 ---- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 2 -- 3 files changed, 10 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h index d78cedd35c01..060e6a49b2f9 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h @@ -246,7 +246,6 @@ static const struct dpu_intf_cfg msm8998_intf[] = { { .name = "intf_0", .id = INTF_0, .base = 0x6a000, .len = 0x280, - .features = INTF_SDM845_MASK, .type = INTF_DP, .controller_id = MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case = 21, @@ -256,7 +255,6 @@ static const struct dpu_intf_cfg msm8998_intf[] = { }, { .name = "intf_1", .id = INTF_1, .base = 0x6a800, .len = 0x280, - .features = INTF_SDM845_MASK, .type = INTF_DSI, .controller_id = MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case = 21, @@ -266,7 +264,6 @@ static const struct dpu_intf_cfg msm8998_intf[] = { }, { .name = "intf_2", .id = INTF_2, .base = 0x6b000, .len = 0x280, - .features = INTF_SDM845_MASK, .type = INTF_DSI, .controller_id = MSM_DSI_CONTROLLER_1, .prog_fetch_lines_worst_case = 21, @@ -276,7 +273,6 @@ static const struct dpu_intf_cfg msm8998_intf[] = { }, { .name = "intf_3", .id = INTF_3, .base = 0x6b800, .len = 0x280, - .features = INTF_SDM845_MASK, .type = INTF_HDMI, .prog_fetch_lines_worst_case = 21, .intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 30), diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h index de26f469ebb1..54d7475e1591 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h @@ -260,7 +260,6 @@ static const struct dpu_intf_cfg sdm845_intf[] = { { .name = "intf_0", .id = INTF_0, .base = 0x6a000, .len = 0x280, - .features = INTF_SDM845_MASK, .type = INTF_DP, .controller_id = MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case = 24, @@ -270,7 +269,6 @@ static const struct dpu_intf_cfg sdm845_intf[] = { }, { .name = "intf_1", .id = INTF_1, .base = 0x6a800, .len = 0x280, - .features = INTF_SDM845_MASK, .type = INTF_DSI, .controller_id = MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case = 24, @@ -280,7 +278,6 @@ static const struct dpu_intf_cfg sdm845_intf[] = { }, { .name = "intf_2", .id = INTF_2, .base = 0x6b000, .len = 0x280, - .features = INTF_SDM845_MASK, .type = INTF_DSI, .controller_id = MSM_DSI_CONTROLLER_1, .prog_fetch_lines_worst_case = 24, @@ -290,7 +287,6 @@ static const struct dpu_intf_cfg sdm845_intf[] = { }, { .name = "intf_3", .id = INTF_3, .base = 0x6b800, .len = 0x280, - .features = INTF_SDM845_MASK, .type = INTF_DP, .controller_id = MSM_DP_CONTROLLER_1, .prog_fetch_lines_worst_case = 24, diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c index 4a18fc66a412..3efa22429e5f 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -95,8 +95,6 @@ #define DSPP_SC7180_MASK BIT(DPU_DSPP_PCC) -#define INTF_SDM845_MASK (0) - #define INTF_SC7180_MASK \ (BIT(DPU_INTF_INPUT_CTRL) | \ BIT(DPU_INTF_TE) | \