From patchwork Mon Jun 19 21:25:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 694146 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 28A5AC001B3 for ; Mon, 19 Jun 2023 21:25:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229453AbjFSVZl (ORCPT ); Mon, 19 Jun 2023 17:25:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50780 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229562AbjFSVZk (ORCPT ); Mon, 19 Jun 2023 17:25:40 -0400 Received: from mail-lf1-x12b.google.com (mail-lf1-x12b.google.com [IPv6:2a00:1450:4864:20::12b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 21721E64 for ; Mon, 19 Jun 2023 14:25:39 -0700 (PDT) Received: by mail-lf1-x12b.google.com with SMTP id 2adb3069b0e04-4f87592eccfso1400710e87.2 for ; Mon, 19 Jun 2023 14:25:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687209937; x=1689801937; 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=iJAyQYEm7Mb/xAuRWqfTnucOJIbBBF8mYcCHSeOQMIA=; b=SZil/bWzR4jp4hJObngadVPAH1zdkWz/WrvYg9ZJNs8n4ZwVfUXRe9wTpp19aNYb5O b9NOYnc1CmGTsjAJunC2PVnAbasroMUyxdxqqIuaFQ0O/UadBo3n/nSZwgIznZGZHtpp 93aqpWe5PNz/MFVPCOqpkkjwr45Ywl0eYwoZr1NK5DaRp8/T3VY5JRJ6HQCrZxpITa4t YH4+MoXcwfTxdsyt3auvYsmkU5oP9TVEKlJOWNIunV3l1cAr2bOSb2m9Liu/HFihLxhU 8qFoF++ax1JLDiLXlSs2p8hc3ZqDg5DDGRDKGQzwDHvR1NAVCKksSSoCQ/azaEfxWudM 4t1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687209937; x=1689801937; 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=iJAyQYEm7Mb/xAuRWqfTnucOJIbBBF8mYcCHSeOQMIA=; b=VdgppHhdwogh/f0/ckUdRIocpxXMD9W+p0VbLnv4j0swJNG46H4JfUdVNaBIZxy1uE VNdCOGU2iumneGm9F3d2V5/a8rgbxSLmR/dTGky5ZEE5FTfYeq+uRy6oaCKgONPOWrHg n2TQ/lmAw1G9OrMEZDa2cWWKyWcj9JQCdoGfxzmNsuh+ALMJPUJvgIMSc9TFFXaZUdrO RnK2eQgq4FGeZY9/Y9THNj3co3bGvKEfNpwO0b9CouKLzVCnDINbht2w55gk/EbQACgM 6hPV3OP3HK1z5XdmlELK3TgvLUVzowWH3XRAReMKsI7lZh3sZ6uUUmLOKohrWHFQUlfx LU2A== X-Gm-Message-State: AC+VfDxocEdpZa54D0NHtL/n5c+9hv4SjoVGqtzitCwpVpW3qUwJwt+6 ApendT+kF4AacJSFro4Krh8ACQ== X-Google-Smtp-Source: ACHHUZ4To/gVBY47Ed19Ll6nn7R9JUyZMeWamwSgD0j/PI9Q7mp0FiS4WfimOjnFpKwaU5CSwPWMWw== X-Received: by 2002:a19:710f:0:b0:4f7:3ee8:eede with SMTP id m15-20020a19710f000000b004f73ee8eedemr6133930lfc.61.1687209937498; Mon, 19 Jun 2023 14:25:37 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id j12-20020ac253ac000000b004f611dd9935sm84864lfh.152.2023.06.19.14.25.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jun 2023 14:25:37 -0700 (PDT) From: Dmitry Baryshkov To: Rob Clark , Sean Paul , Abhinav Kumar Cc: Marijn Suijten , 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 v4 19/19] drm/msm/dpu: drop empty features mask INTF_SDM845_MASK Date: Tue, 20 Jun 2023 00:25:19 +0300 Message-Id: <20230619212519.875673-20-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230619212519.875673-1-dmitry.baryshkov@linaro.org> References: <20230619212519.875673-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. Reviewed-by: Marijn Suijten Tested-by: Marijn Suijten Signed-off-by: Dmitry Baryshkov Reviewed-by: Abhinav Kumar --- 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 4ce25ed4e36f..7d87dc2d7b1b 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 @@ -244,7 +244,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, @@ -254,7 +253,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, @@ -264,7 +262,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, @@ -274,7 +271,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 5ad82b109ebb..66e3573eb613 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) | \