From patchwork Fri Apr 28 22:36:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abhinav Kumar X-Patchwork-Id: 88764 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1254340vqo; Fri, 28 Apr 2023 15:41:46 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6uMTty+X+IV6QpIAhGZJ0pSCzBQWOWykZ1RHxvvU10spVFLuGSR7PsZpKRzQiq9FNaYHcB X-Received: by 2002:a17:90b:883:b0:247:6364:b8d8 with SMTP id bj3-20020a17090b088300b002476364b8d8mr6827022pjb.6.1682721706052; Fri, 28 Apr 2023 15:41:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682721706; cv=none; d=google.com; s=arc-20160816; b=XuXbg6I4GQhOpgBOh7e3gtPVDnwmD6Zuk3bxCVX/dYgmPN7yWQbvSY8pth+u0ZoR6C BDVeGjr6F4LPV+Oj3Wqy9Ab0ex7dXthzuOPyoSp414XfaLrB7NyvLUFEquu2shAgF+MV RBhTM8Z3f3DVIBA269uWcYyOsL9C0SZ+LAluBdwNUYVl//ZHeORh1oFWX/NsHFlFafNU yDFoRq2YimHpqfqiBRRO+v25wybyP7Sz5qq8VaPn6/sLAZBlD6+I6XgU3Y6qywqB8zMC LzZkMSedKNTJQaGcqxqV+KNbpWPPOgAvfdAYZoZ//cIMf/+s9FNaVAcPZ4lq0/CilIzE XtMg== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=gGNMIvLOzmjsnsVVRS2uN4yp1bQxftElJ84j2epJmAA=; b=aW+wQVc8qUQaMw6g+t9TEzRVQdKvcj5z6UVKKpTNzhgrzaYKxk+/1gwo0TUgVBWUm3 rSWZyp6NHlxunxzEDUbm32LSZNQa92ZgQ5kdV7U6H+8tGkLEP0KA+ZExeZX1zAd4JtGU 8q70pT2nVOJNNV4j6egOhs1qrjsgdyAACmqhGR2o+RMqmPC4mLZ9Oz7DkwSNBjBFrCDs ircP+yYS1E88hUFCCDzo48HHDIvTs00hyTyrKEFoaAcBE+wGnYJ3TJlUv/kHJ3x2Yytw 25sVny89w1nLuCFURzL8hcf3pihA8AN696BRZgT26GiQQHouvR0JVg5y7OtUhoXObjFt dF/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=YEn6VPIQ; 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 js15-20020a17090b148f00b00249846d1f45si3174180pjb.176.2023.04.28.15.41.30; Fri, 28 Apr 2023 15:41:46 -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=YEn6VPIQ; 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 S1346637AbjD1Whb (ORCPT + 99 others); Fri, 28 Apr 2023 18:37:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49028 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230225AbjD1Wh2 (ORCPT ); Fri, 28 Apr 2023 18:37:28 -0400 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C6F66E40; Fri, 28 Apr 2023 15:37:27 -0700 (PDT) Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 33SMbLOs029846; Fri, 28 Apr 2023 22:37:21 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : content-type; s=qcppdkim1; bh=gGNMIvLOzmjsnsVVRS2uN4yp1bQxftElJ84j2epJmAA=; b=YEn6VPIQb1SkUnla3oErLFJ2aCdiUFuSfEpsE4qnAizdzr3w2Ux3GwrefdbJNklLEjlb d430y8/6kCfKCfxR55MZ7QeCz4WSRIWCN9iHBL8s3EYBMxtYM2mkrHV4JbQz0zRj8kr/ C1yaoZEsaV7zw/2u/z66fB++BuVuuLRi5eGDvaXkK2i/bBS4mOhkR5uJd28SUGsm4SS9 l7IMXOH43esziDNQ1mlXELCkx8uDCwZUxJangwW0nMpIIfP3Itc8ITEymX5hfK2BPIvF zF/e2JveajVYfGCY4xUvVSWb8xi05NNdIPI3JuL2g6CYK9IKK85/GdiBw1gwiURU5urw aQ== Received: from nalasppmta05.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3q8abpt85h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 28 Apr 2023 22:37:20 +0000 Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA05.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 33SMbJSl032506 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 28 Apr 2023 22:37:19 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; Fri, 28 Apr 2023 15:37:19 -0700 From: Abhinav Kumar To: , Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter CC: , , , , Subject: [PATCH v3 1/4] drm/msm/dpu: remove DPU_DSPP_GC handling in dspp flush Date: Fri, 28 Apr 2023 15:36:43 -0700 Message-ID: <20230428223646.23595-1-quic_abhinavk@quicinc.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) 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-ORIG-GUID: feiBuX8HmrmS_RghykE7D3NfL7xPtjKO X-Proofpoint-GUID: feiBuX8HmrmS_RghykE7D3NfL7xPtjKO 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-28_08,2023-04-27_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 phishscore=0 suspectscore=0 spamscore=0 impostorscore=0 mlxscore=0 bulkscore=0 malwarescore=0 clxscore=1015 adultscore=0 priorityscore=1501 mlxlogscore=752 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304280188 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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?1764461596080169003?= X-GMAIL-MSGID: =?utf-8?q?1764461596080169003?= Gamma correction blocks (GC) are not used today so lets remove the usage of DPU_DSPP_GC in the dspp flush to make it easier to remove GC from the catalog. We can add this back when GC is properly supported in DPU with one of the standard DRM properties. changes in v3: - drop the link tag which was auto added before Signed-off-by: Abhinav Kumar Reviewed-by: Dmitry Baryshkov Reviewed-by: Marijn Suijten --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c index bbdc95ce374a..57adaebab563 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c @@ -336,9 +336,6 @@ static void dpu_hw_ctl_update_pending_flush_dspp_sub_blocks( case DPU_DSPP_PCC: ctx->pending_dspp_flush_mask[dspp - DSPP_0] |= BIT(4); break; - case DPU_DSPP_GC: - ctx->pending_dspp_flush_mask[dspp - DSPP_0] |= BIT(5); - break; default: return; } From patchwork Fri Apr 28 22:36:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abhinav Kumar X-Patchwork-Id: 88763 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1253160vqo; Fri, 28 Apr 2023 15:38:34 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4kKr5dHsaNHoye66ePJgSfOnXJDBedq/COD8bSV/ancRMRi7e0Wyu4qxjNd0fDQxYI2aUw X-Received: by 2002:a05:6a20:1608:b0:f5:b7c9:57b8 with SMTP id l8-20020a056a20160800b000f5b7c957b8mr9316250pzj.42.1682721514294; Fri, 28 Apr 2023 15:38:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682721514; cv=none; d=google.com; s=arc-20160816; b=q6N2hxCdCUFV7VKSd0bo+cVzFrFXS5L3Jcwl52SK7pXA8vuh1+Fvxs6RO/JFQ9bTSP zfUgITI6XGgOsLMjf6p2xH9jJtP92v4ZZnVzS0XP+vrzfzLavdybMDG2SZ7o2SUlQqax Ade/gqZYh3BWPprmB0C7g+yfXqA77jRc2nd4f9piNSbVA45alvdWfJKBmAxpaoBqsI42 QzeanhinuakBxw2m7o4J+WwwdCBXkUxa9k+aS8mOf2TzYHFsfq3CScawX/LUGPRILVxU vL8F/ZYdlunYyVmYHkRnlvAKx66n6zcje5o5RCnaQSldQ4byJydr6W9m/UwgiYmVHM0O 9bbQ== 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=YcSRDXQ+gVIp36WVYLV9EBeJI7uPGCIHt9sD1alsijU=; b=rhfbPMvFSgWtK5qUpTzceJRSUEMRuI3HxenGgf2wTCEdxwrtuS7wAYZJu4DfeKuWpr hHbVAW+zcnNje+F7N8PSPsiQlwsoR+W+63V+GsnzzvTBFXnDFrieJFcn5qbnfLfEsIlX 2vw8wuHj5bwB5/xh9zyYg40MzBqd5tcYlDK4CVbcuw7fwLvBQnrSpUWOON3Oba6XHJkV C9F3ijkp9FS1z6W8fvD3UlzZx3zMX9JPgPo2UC2u4fe8W636A1U9n8tIWyK75M3TXvTM 2V9PowQSs9vuHGBK4LWnMEw7eVLoa0SDL+PgD7+Epnl4tUH+iCzs0ozBtvmZ7X8oiVQa uScg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=XprLg+3c; 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 a21-20020a63e855000000b00513f070aaa1si23723617pgk.892.2023.04.28.15.38.20; Fri, 28 Apr 2023 15:38:34 -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=XprLg+3c; 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 S1346780AbjD1Whc (ORCPT + 99 others); Fri, 28 Apr 2023 18:37:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49030 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230227AbjD1Wh3 (ORCPT ); Fri, 28 Apr 2023 18:37:29 -0400 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D3D561706; Fri, 28 Apr 2023 15:37:27 -0700 (PDT) Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 33SKS53A031521; Fri, 28 Apr 2023 22:37:23 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=YcSRDXQ+gVIp36WVYLV9EBeJI7uPGCIHt9sD1alsijU=; b=XprLg+3c8fp6CcbSJUBSJqmCLqG7Wr26w14Gi9AbgWxwmDFofFch/V8CdIwMtQJPtkoR fs2Gxp7iYHE7g2uvoNenCktflL+AN+6ATWo3er4LPpKZFpp8Y2VsV6nuUa1ap/rlobm2 DVKSCRKwzAfUN7d4ZTqN4Qii2lRg99cr2y0V8fP2VF4oFTMng82xOuKfRRI7GL+1FVDT PnfgfMgLE7gUDXVQpLWO3mLznj78DQ71mZK6BzGaqV+LcxJTUSva6O6Y3rITn+Srd9kB Yeal7XyIeh2Kc+7Os2+d1cnShagwZxH5cIJ9c0ufUj5flUhnQbQXK/fBhSbecK2duoMy Dg== Received: from nalasppmta01.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3q8fvnh44y-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 28 Apr 2023 22:37:23 +0000 Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA01.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 33SMbL87000348 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 28 Apr 2023 22:37:21 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; Fri, 28 Apr 2023 15:37:21 -0700 From: Abhinav Kumar To: , Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter CC: , , , , Subject: [PATCH v3 2/4] drm/msm/dpu: remove DPU_DSPP_IGC handling in dspp flush Date: Fri, 28 Apr 2023 15:36:44 -0700 Message-ID: <20230428223646.23595-2-quic_abhinavk@quicinc.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230428223646.23595-1-quic_abhinavk@quicinc.com> References: <20230428223646.23595-1-quic_abhinavk@quicinc.com> MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) 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-ORIG-GUID: xK7pLUHJ-ARqq5_At0puxIwRI8dMKlFe X-Proofpoint-GUID: xK7pLUHJ-ARqq5_At0puxIwRI8dMKlFe 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-28_08,2023-04-27_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 mlxlogscore=960 spamscore=0 bulkscore=0 mlxscore=0 adultscore=0 lowpriorityscore=0 phishscore=0 clxscore=1015 malwarescore=0 priorityscore=1501 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304280188 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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?1764461394701504320?= X-GMAIL-MSGID: =?utf-8?q?1764461394701504320?= Inverse gamma correction blocks (IGC) are not used today so lets remove the usage of DPU_DSPP_IGC in the DSPP flush to make it easier to remove IGC from the catalog. We can add this back when IGC is properly supported in DPU with one of the standard DRM properties. changes in v3: - minor change dspp -> DSPP in commit text Signed-off-by: Abhinav Kumar Reviewed-by: Dmitry Baryshkov Reviewed-by: Marijn Suijten --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c index 57adaebab563..b2a1f83ac72c 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c @@ -330,9 +330,6 @@ static void dpu_hw_ctl_update_pending_flush_dspp_sub_blocks( return; switch (dspp_sub_blk) { - case DPU_DSPP_IGC: - ctx->pending_dspp_flush_mask[dspp - DSPP_0] |= BIT(2); - break; case DPU_DSPP_PCC: ctx->pending_dspp_flush_mask[dspp - DSPP_0] |= BIT(4); break; From patchwork Fri Apr 28 22:36:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abhinav Kumar X-Patchwork-Id: 88765 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1254519vqo; Fri, 28 Apr 2023 15:42:10 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4+rDRj6ZNw6wZMg2PwUCHVXMmdo5VgMamCjsnAhqwI5kjNZQ0tJSVZep/M3GZE4n9gzJNL X-Received: by 2002:a17:90b:3683:b0:24b:bb51:d5b5 with SMTP id mj3-20020a17090b368300b0024bbb51d5b5mr7114732pjb.7.1682721730157; Fri, 28 Apr 2023 15:42:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682721730; cv=none; d=google.com; s=arc-20160816; b=1Hs5yqtfGZ1om2mQEJe10QdXpnZ2zLl0a3lYPUDjyWSUUOBHEUZxOGGeezcaMQmidX HnFQ8f5p1PRLKRiNMMGGb3XndAElrukFQs4AYmeccdkM2feyBUlDqXZePVukDf4A+WRO HL13dqN8XeXS1B74pKDp2hPgX4J6x7G4vbyjjwsPrFgZvSgU8X5KG2+jE1LQBXjX0OT4 daaehxqk8lMV4fBQ8p8yT9+uMmVWj9WTpNoUxA8gewTG03u6rm1tQEJ/y6DBl0wX4WPy XSKbP8K7ed4Bt1TS5ZA8mQbW+O71CF1DnBbqkKuqAo3gtHZh3XqXvbjsOIKZLCdGENk+ vDvA== 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=3p15NS1SsiDVfgUqOOa3xRyCx2Wbmd2gK9pcK2qHbsg=; b=FepObKAJA12CSf84D/MIkfKE9R6ktecTp9wGcC5E0RFLmD9Z9HqbdmR2Yti5dMbaz6 bJUwTc5RaRj2NqeTjazS0WlQC7QIynKWEJZQ24OuOsrHqhEG43pzbATUqLMRkauxXK4e 3sW7ZNYz60mfaKwDu6ItXumhznk5WqAzXOE4l9KxM+vhNgNYBE65lB4GmmlEChZp0Fha +SVEfYJhSRn7ZeAUhZuFrP9vsnQqTx+clKU040Pz/Az8dRY68qYM8phH+Li1V/qXzG9X zDEamH9zEnHKbaHRJmw63scmTRxSn+tS8iuWwBO86GqKz62BkM1uo9124wlT5RGZF/lR od7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=Svs+OgFg; 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 mu10-20020a17090b388a00b00246ba1acf0dsi3447869pjb.14.2023.04.28.15.41.55; Fri, 28 Apr 2023 15:42:10 -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=Svs+OgFg; 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 S1346833AbjD1Whi (ORCPT + 99 others); Fri, 28 Apr 2023 18:37:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49074 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346785AbjD1Whd (ORCPT ); Fri, 28 Apr 2023 18:37:33 -0400 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2029646B1; Fri, 28 Apr 2023 15:37:32 -0700 (PDT) Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 33SLZsAV015460; Fri, 28 Apr 2023 22:37:24 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=3p15NS1SsiDVfgUqOOa3xRyCx2Wbmd2gK9pcK2qHbsg=; b=Svs+OgFgIc96V0XQrCIVPJcTP0pyFBMwSeXsBaxLOycnskdvs3dumOrZd70Mp4dNZwfV O/Jo4Z3Do9QRF2TGKunyt81BHhxTex8kt5OtgPgPxsaSkKrG4aJhp0EcjeG0W7AbzCsQ buxylIwA9EVecYXpNWvlqSJ60nF5uWOBWvyTDZTmlHAFJdV6AM9FerKciZMSvmtI/oy2 IsPax7pGWxcAOqu+BZZ4AF9LwIWwi7/yPXQz9vY52JOsb2ZlArk7fpJznnGpGYtLPq0s 8wp96VtZs3VAkLMnnLCYNhTyJdi9Symu40YUbowsgUDD3bfDo+ADO9BKfL0jpjMlFG+4 EA== Received: from nalasppmta04.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3q89kste0u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 28 Apr 2023 22:37:24 +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 33SMbNLP031363 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 28 Apr 2023 22:37:23 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; Fri, 28 Apr 2023 15:37:23 -0700 From: Abhinav Kumar To: , Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter CC: , , , , Subject: [PATCH v3 3/4] drm/msm/dpu: remove GC and IGC related code from dpu catalog Date: Fri, 28 Apr 2023 15:36:45 -0700 Message-ID: <20230428223646.23595-3-quic_abhinavk@quicinc.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230428223646.23595-1-quic_abhinavk@quicinc.com> References: <20230428223646.23595-1-quic_abhinavk@quicinc.com> MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) 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: Q7HKJ9e0Kqv60DGn0d8DsYJbCo_QCWgl X-Proofpoint-ORIG-GUID: Q7HKJ9e0Kqv60DGn0d8DsYJbCo_QCWgl 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-28_08,2023-04-27_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 spamscore=0 priorityscore=1501 adultscore=0 clxscore=1015 bulkscore=0 mlxlogscore=999 impostorscore=0 malwarescore=0 mlxscore=0 lowpriorityscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304280188 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?1764461621058268680?= X-GMAIL-MSGID: =?utf-8?q?1764461621058268680?= Gamma Correction (GC) and Inverse Gamma Correction(IGC) is currently unused. In addition dpu_dspp_sub_blks didn't even have an igc member describing the block. Drop related code from the dpu hardware catalog otherwise this becomes a burden to carry across chipsets in the catalog. changes in v3: - drop IGC related code from dpu_hw_catalog too - update commit text accordingly Signed-off-by: Abhinav Kumar Reviewed-by: Dmitry Baryshkov Reviewed-by: Marijn Suijten --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 4 +--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 10 ---------- 2 files changed, 1 insertion(+), 13 deletions(-) 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 5d994bce696f..791a6fc8bdbf 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -91,7 +91,7 @@ #define MERGE_3D_SM8150_MASK (0) -#define DSPP_MSM8998_MASK BIT(DPU_DSPP_PCC) | BIT(DPU_DSPP_GC) +#define DSPP_MSM8998_MASK BIT(DPU_DSPP_PCC) #define DSPP_SC7180_MASK BIT(DPU_DSPP_PCC) @@ -449,8 +449,6 @@ static const struct dpu_lm_sub_blks qcm2290_lm_sblk = { static const struct dpu_dspp_sub_blks msm8998_dspp_sblk = { .pcc = {.id = DPU_DSPP_PCC, .base = 0x1700, .len = 0x90, .version = 0x10007}, - .gc = { .id = DPU_DSPP_GC, .base = 0x17c0, - .len = 0x90, .version = 0x10007}, }; static const struct dpu_dspp_sub_blks sc7180_dspp_sblk = { diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h index 71584cd56fd7..1230739e37d4 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -127,13 +127,9 @@ enum { /** * DSPP sub-blocks * @DPU_DSPP_PCC Panel color correction block - * @DPU_DSPP_GC Gamma correction block - * @DPU_DSPP_IGC Inverse gamma correction block */ enum { DPU_DSPP_PCC = 0x1, - DPU_DSPP_GC, - DPU_DSPP_IGC, DPU_DSPP_MAX }; @@ -398,7 +394,6 @@ struct dpu_caps { * @hsic: * @memcolor: * @pcc_blk: - * @igc_blk: * @format_list: Pointer to list of supported formats * @num_formats: Number of supported formats * @virt_format_list: Pointer to list of supported formats for virtual planes @@ -419,7 +414,6 @@ struct dpu_sspp_sub_blks { struct dpu_pp_blk hsic_blk; struct dpu_pp_blk memcolor_blk; struct dpu_pp_blk pcc_blk; - struct dpu_pp_blk igc_blk; const u32 *format_list; u32 num_formats; @@ -433,22 +427,18 @@ struct dpu_sspp_sub_blks { * @maxwidth: Max pixel width supported by this mixer * @maxblendstages: Max number of blend-stages supported * @blendstage_base: Blend-stage register base offset - * @gc: gamma correction block */ struct dpu_lm_sub_blks { u32 maxwidth; u32 maxblendstages; u32 blendstage_base[MAX_BLOCKS]; - struct dpu_pp_blk gc; }; /** * struct dpu_dspp_sub_blks: Information of DSPP block - * @gc : gamma correction block * @pcc: pixel color correction block */ struct dpu_dspp_sub_blks { - struct dpu_pp_blk gc; struct dpu_pp_blk pcc; }; From patchwork Fri Apr 28 22:36:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abhinav Kumar X-Patchwork-Id: 88769 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1270736vqo; Fri, 28 Apr 2023 16:20:12 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ62CbJB4Ls6NJbH8CTjSjC59IpaGqohw2dzIDlsSVgGf4Xrj9E4xKxIqdzJlMBmnt6HD+Ao X-Received: by 2002:a17:903:2990:b0:1a2:c05b:151c with SMTP id lm16-20020a170903299000b001a2c05b151cmr7618931plb.34.1682724012643; Fri, 28 Apr 2023 16:20:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682724012; cv=none; d=google.com; s=arc-20160816; b=PeALbHkPznTRsyGPTLxxJXc+K89UQ6djklizvECQqRSfU2D2G2u+Iv2Y2Wg80Iwfby JQlgzYkLMTv/hxXvx4IjttLDBOU76hsIX7ZiTUcfncmRanwU45ac0GoTD7JSsiE//Qwz kIKq4DU3a5ai+LfTbg+/dhKzoIZgT2fvLhiirDuiD62LRhvRl/FtdhciSsxIcYSXai39 o16SAXFX0ex+Y1tllTwojujlL/SAjGDl96fXHYCgMdVAoGMcWw0Tws7ziVr7IF6gLmFR 2rSzjhlxuJQwVzn2R/qq2DVjnvHDwBhKcFTRB4K8tp1/tLvJs5OVZrQqHmPj1VkVZhV+ C6Nw== 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=YoSilu77Juqav4uFECUwWsVVGvTcpVdYAT4bQdmnNaE=; b=pAwqOdNtz8nEpoMNw7k+1WUJcZ9E3VAT53bxmyasJommISeV+OFiPTSLfN/Ll1aVJg xAzsbb16FfeV3UWZU/ZaupuDpZDWGp4DLzOOH0yJIW88LWhRXaQNYCXYN1ZIrQ7wNFlN IxClVdjearaklmqpG50U1Ve2AM83z6W/jAVBAaOXvMubM/tOpXB9sCIKIn7S2OD0IwqX j8ZgOLkSk0Yisoh87TIcAgfV2DXjx5tBteyNWXjH4zmHXE+xzKgqP3nAWuYvqFjfVzbi JP5jF07aBBvYaGfj5jLMN9MhYPA5ASG2bPa0ULwaJsFdVYs2Iy1jhDuEDbLl2Yb9tO08 ad+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=Cuh3+my1; 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 e12-20020a170902784c00b001a6ade4c8c2si20680214pln.142.2023.04.28.16.20.00; Fri, 28 Apr 2023 16:20:12 -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=Cuh3+my1; 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 S1346818AbjD1Whg (ORCPT + 99 others); Fri, 28 Apr 2023 18:37:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49060 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346748AbjD1Whc (ORCPT ); Fri, 28 Apr 2023 18:37:32 -0400 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1F3CA97; Fri, 28 Apr 2023 15:37:31 -0700 (PDT) Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 33SJ9cJv008763; Fri, 28 Apr 2023 22:37:26 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=YoSilu77Juqav4uFECUwWsVVGvTcpVdYAT4bQdmnNaE=; b=Cuh3+my1aC61ND3crOKY7s1tbbN65iQoWuDhTsHpwaNdeBLpCPWbGZlcfKeYHAl3B65G G6yGNvP7WwXpD6nXpSWHjTIuSvvv0S+CAfwIFedPyrqwkYM5RZFdLsrbIEddFQAxyn+o pIFAoy7svJb1JaCDHuB3PhzRrXKx3mw7svvNYYb+2jOMC33Vi638ufLmmMxitKqL1P6o qLewhE6TwPSr/uXa5SN0ugkqMXyUTrcC+XtRnTRr7CXjqprON4yLz3tWnD/IzGW4zt6g AaKe6lQ1pVtj7qaAybtcfNYdbsJPVDTsInsv/2utV4BifinsFkJkJ3uy0tz5nl6MHP2/ 6A== Received: from nalasppmta02.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3q8abpt85s-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 28 Apr 2023 22:37:26 +0000 Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA02.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 33SMbPQS030459 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 28 Apr 2023 22:37:25 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; Fri, 28 Apr 2023 15:37:24 -0700 From: Abhinav Kumar To: , Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter CC: , , , , Subject: [PATCH v3 4/4] drm/msm/dpu: drop DSPP_MSM8998_MASK from hw catalog Date: Fri, 28 Apr 2023 15:36:46 -0700 Message-ID: <20230428223646.23595-4-quic_abhinavk@quicinc.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230428223646.23595-1-quic_abhinavk@quicinc.com> References: <20230428223646.23595-1-quic_abhinavk@quicinc.com> MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) 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-ORIG-GUID: wz4DVunhIB-C9geqtkNaLEbs_rmmxWmG X-Proofpoint-GUID: wz4DVunhIB-C9geqtkNaLEbs_rmmxWmG 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-28_08,2023-04-27_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 phishscore=0 suspectscore=0 spamscore=0 impostorscore=0 mlxscore=0 bulkscore=0 malwarescore=0 clxscore=1015 adultscore=0 priorityscore=1501 mlxlogscore=884 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304280188 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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?1764464014699911019?= X-GMAIL-MSGID: =?utf-8?q?1764464014699911019?= 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 Reviewed-by: Dmitry Baryshkov Reviewed-by: Marijn Suijten --- 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 bdcd554fc8a8..a4679f72a262 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 791a6fc8bdbf..efd466f6122b 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)