From patchwork Wed Apr 26 19:20:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abhinav Kumar X-Patchwork-Id: 87966 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp465410vqo; Wed, 26 Apr 2023 12:35:33 -0700 (PDT) X-Google-Smtp-Source: AKy350aAfTLgcX5cDMtmyFsuKhXb2zZowwgpitUzVZfMqcHKPUGC301nteD5GRB0c0KGHV2S2aNp X-Received: by 2002:a05:6a21:3396:b0:f0:6aaf:1abf with SMTP id yy22-20020a056a21339600b000f06aaf1abfmr29920368pzb.4.1682537733500; Wed, 26 Apr 2023 12:35:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682537733; cv=none; d=google.com; s=arc-20160816; b=KcU0ho7tJUGK5fYIRT/ZjtZv6IWtS946oVeQNupb3yNRya74KSfB7ckDXnq3tVB/ba 7WIRLQiLvrRDLsRmKt6fW6rZmVYkdyU2KcZn3fqDwAUP8fOVckQMpSKvl5js6vGb1erg py4Vv7n1uZJDKENV3AkPwmI4Ccm3lJARwXAyjKa5RKAfVikhL0vZsWBZP5QFoj8tRLly Jnn9WTJEQKhoxxX3b9Ff+ya6dBPy3TlT11p1tFKTy2ot+Si5GrZyPH/s/DZ5UZ6zS1+W +WoXtIL2MHXPUVFDDVOKVsYwgndsh8a26kqgL+4qpdp3rqdGcQoe8V9i3gxyeqWrzFRA +yKQ== 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=qrF3PHA/LTofJyqIZNo4xMGwShOGEkjlvcHgFnXUyJs=; b=T5xypjNJnO3r2M8BP/7X4Ax0F/l52qy8cbBdMBTlNzU3u+EnGqormxap8Iwi4+p+K8 ZJc9xxKPmEIUvagtQx278dqRqHpdO24R6mUStRnqnrP+2zAwPxm4mPGCYGqqfxM5xsJJ WbrCtd7Nw7JlLdPl0RZmJbFjgrC5GSUDGAf61WcZn2v4TAsK5juxg+jKXFUZlxMEo77o rpcGghMlkuyCmLK0lOdsMVRFUS511BeFtGDrCiXk4tocztZ1x3V1wmlzgdEXEbjLBPxB LREulMP3hTyeGN/dUc4j1ko1ET+lmpB3s2i1RxrJRIcBK1XN8XgRjFt4LdljN1uzUgsw FQHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=hgtaXsFC; 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=quicinc.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e29-20020a63545d000000b00513ab078092si17544420pgm.438.2023.04.26.12.35.20; Wed, 26 Apr 2023 12:35:33 -0700 (PDT) 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=@quicinc.com header.s=qcppdkim1 header.b=hgtaXsFC; 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=quicinc.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239496AbjDZTVI (ORCPT + 99 others); Wed, 26 Apr 2023 15:21:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50034 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236381AbjDZTVA (ORCPT ); Wed, 26 Apr 2023 15:21:00 -0400 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 153C610EA; Wed, 26 Apr 2023 12:21:00 -0700 (PDT) Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 33QFu0AN018808; Wed, 26 Apr 2023 19:20:54 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=qcppdkim1; bh=qrF3PHA/LTofJyqIZNo4xMGwShOGEkjlvcHgFnXUyJs=; b=hgtaXsFC2bQ3GUODKHFYiNTig0aS78FXefMIAIunNc6ruuRxNReK7XOvBuw4M1f5KvIF BCAOlW0PE8iENWJvfs28SqsIDxtVDUygVuR/7mMdxWTtfvlDlhb0JjtYrxdiYlo1icAo Jb6rqyF7lXFMwGq+Sm2SqEwNMdz7XgVH1QZ4XVbd6QLqUZKWZ5oplTCvk8l9z2l10yY9 /ynrUzjFnMxrzLpnDCUjfFCVjSZUx/XGW1/3B1IY52cDUTbZXTOQdcnUCAa2MlhHQvJ1 L4PC0iZFHcRBpt22sjJhbDLGeOl5E+sIEh/aj/8HBVEDx+xN13QFCxhJYoAKf2ghNtZg Dw== Received: from nalasppmta04.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3q741xgxk3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 26 Apr 2023 19:20:54 +0000 Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA04.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 33QJKrP9020469 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 26 Apr 2023 19:20:53 GMT Received: from abhinavk-linux.qualcomm.com (10.80.80.8) by nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.42; Wed, 26 Apr 2023 12:20:53 -0700 From: Abhinav Kumar To: , Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter CC: , , , , Subject: [PATCH 4/4] drm/msm/dpu: drop DSPP_MSM8998_MASK from hw catalog Date: Wed, 26 Apr 2023 12:20:34 -0700 Message-ID: <20230426192035.5088-4-quic_abhinavk@quicinc.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230426192035.5088-1-quic_abhinavk@quicinc.com> References: <20230426192035.5088-1-quic_abhinavk@quicinc.com> MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) To nalasex01a.na.qualcomm.com (10.47.209.196) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: 8UZk2bg0RE0cdnOf7LC_BC7ZcMbT9n4h X-Proofpoint-ORIG-GUID: 8UZk2bg0RE0cdnOf7LC_BC7ZcMbT9n4h X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-26_10,2023-04-26_03,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 adultscore=0 mlxscore=0 lowpriorityscore=0 mlxlogscore=875 phishscore=0 clxscore=1015 malwarescore=0 bulkscore=0 spamscore=0 suspectscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304260172 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1764268686143034066?= X-GMAIL-MSGID: =?utf-8?q?1764268686143034066?= Since GC and IGC masks have now been dropped DSPP_MSM8998_MASK is same as DSPP_SC7180_MASK. Since DSPP_SC7180_MASK is used more than DSPP_MSM8998_MASK, lets drop the latter. Signed-off-by: Abhinav Kumar --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 4 ++-- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 2 -- 2 files changed, 2 insertions(+), 4 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 2b3ae84057df..5f6e4715aa04 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 @@ -127,9 +127,9 @@ static const struct dpu_pingpong_cfg msm8998_pp[] = { }; static const struct dpu_dspp_cfg msm8998_dspp[] = { - DSPP_BLK("dspp_0", DSPP_0, 0x54000, DSPP_MSM8998_MASK, + DSPP_BLK("dspp_0", DSPP_0, 0x54000, DSPP_SC7180_MASK, &msm8998_dspp_sblk), - DSPP_BLK("dspp_1", DSPP_1, 0x56000, DSPP_MSM8998_MASK, + DSPP_BLK("dspp_1", DSPP_1, 0x56000, DSPP_SC7180_MASK, &msm8998_dspp_sblk), }; 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 badfc3680485..2cabba0bb513 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -91,8 +91,6 @@ #define MERGE_3D_SM8150_MASK (0) -#define DSPP_MSM8998_MASK BIT(DPU_DSPP_PCC) - #define DSPP_SC7180_MASK BIT(DPU_DSPP_PCC) #define INTF_SDM845_MASK (0)