From patchwork Thu May 22 19:03:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 891747 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 18F3C2BE7BF for ; Thu, 22 May 2025 19:04:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747940644; cv=none; b=fIA6IF4mcMZoK3YXQrxCyTq6mGJNEjC+16COg/mWz2PJd58X+WbjJxlZLbbGKbeTlFfLUK3pyMawcthWwnXY+lVrdgT37cS6agQbt3q1Cs+Bq6O9RdCmjNMVX+uLU8odBGW1l/2nuzD+iHlt/TF3B0rn9D8KlxfHs9qPypZ+dbM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747940644; c=relaxed/simple; bh=/l6FnDU8h9v7nqRGrkMpZ1JZrw+P23WN5JgLXhQ6sBY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Kbape2zjRWYp21xSSBpzRQtPj0l6kouCnBTYN3KURZ+vwPszZ1IdIpyLUSzYjbJ0I9gVNyzUyNPRZCv/ZO12SH6BPiLbTRGESMKtcyDZcpVNqdebSypGDwij3QnTzLDyPMJXdVnnaV3E5i+Ksg9HVHuKGpzstVwXG8ADkAFjkvE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=mPHlmqgd; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="mPHlmqgd" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 54MHfARN024983 for ; Thu, 22 May 2025 19:04:02 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= SAXuCHIXzob7I7yDg4by0JQEOARzxYVn7zXbtJ2VPvk=; b=mPHlmqgdOd+nPfI0 NHDnL8hyhJjcyor/EpLFFA546rCa0gX5hsTTx8ACMqWiTlCdaRddg/py1jqfFpAI A/xxHkY8/2nn15WM/xohI9f+sn6+EQo8CloAE4LZRSrIVcZOorbBmzpXrLKVBDBv KOa466GL4dwwtsW1/gDsvcAcULvDIZClTN6epOhVRVbp8dLBbMzoxVopd7pP3jyg Jgc4CeFkg17280DBE2pFh7Eq3MqDCMdYrD/GE4T+Iz9EJos2NWUSFtE9PqdCdWEd xAaNGlBS+J6nq3XKyDT/TLjK8VLyUm2DvQ1IxeTP8to+JbhzLDEIWv1q9Ip4qT1a NtgdDA== Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 46rwf4yd0b-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 19:04:01 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-7c793d573b2so1453383285a.1 for ; Thu, 22 May 2025 12:04:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747940640; x=1748545440; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SAXuCHIXzob7I7yDg4by0JQEOARzxYVn7zXbtJ2VPvk=; b=JYzQqqXqhOO4CnozNyNNvMmIIneRzhxcRcMzvcL3QgN8TR1YM7ZkA60c8ZFNmgjvU5 P5aEtcG5A0ON0hgiAojUTsUjY0sSOgYIT14LiNtdIp0DL6LPktmQckZEUKNUN6ywIpve Uf2zZzH8Hr9s9j6gjAseGik7E6K/ubIhJdR42yFqkgVpFCmpfz8JBNfxtxV7EmwhATWa o6q8ccG0koYiljbPYN/HDwQITnAt29sykMgPUbFitjdwHXnb87RjmTodXkIP2S7jWs5P toRtfMJsXM7Zjs+0wxD8R/QN+LplriTYDzKOacaLPz38u+83SBuuTXrrHUxckQBk/4RN vZWg== X-Forwarded-Encrypted: i=1; AJvYcCXsmjOTMvKenAsAeg6utgAuv1XmOS9Y9gvmJjdAAS6g8/QV27/CUqXV4nNSr4ap+Wk1RKVcDdH3lFo8fw01@vger.kernel.org X-Gm-Message-State: AOJu0YyaF4kOegmQazSH0nXPgVgl36b8IF8dld7unW0da1d6OK7T43A/ YuVlPp1Dynj2e868yjE9QvxIfP6+OYPy7OePgONNrgbe4c6ZRoJV2p12mH97dQyhs0HiOv17pGQ pGwIbhQEBvGOjTj5TciptIH4t0ZcWGHt1ZrJ5WthPi5k/dTN4vCKEks0hqSaeV7vQnbNh X-Gm-Gg: ASbGncv9G2Xn2/BqvRlqqNk5yE7eagF6A0p6AH0LISzADG42Zxccw6UU1beoFarfc5b g3iDmaCr0GfHntbQcjsNpLELTilaisSnp/8z3IvlLSsjGSGMtGQJBvX3y63I7pUoezMOMdKUrz6 KSbmly6vYw1B09++HgFeIuNrEKdMeVRZrMqpcOwo3GokNZc9EowWTzvqv96objJLPYarX/ZW3l3 BKYEOhn6tocj5t/63M7PvTdpWCixl4Jm58bP2XEsTiaQxoorwCk3d9UNZMW67o2YG2BjSjMpbqa Cm8/fx87QI/sfTKybg6/AAehK+75gIDNfZu3noRbaqqFUuWre6SzwAnbHUEhGcnZx/GleGhN7zz 1X8kmJwXD0IfHXIwOeOvj8EtC X-Received: by 2002:a05:620a:400f:b0:7ce:d352:e2c0 with SMTP id af79cd13be357-7ced352e386mr1146830185a.25.1747940639731; Thu, 22 May 2025 12:03:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFtop1DYOBlB+JkelLga98KWOgpBTnz/VdiqX4EP3GRjMG13kaJhcMsqY3geHDRZhiht48xFA== X-Received: by 2002:a05:620a:400f:b0:7ce:d352:e2c0 with SMTP id af79cd13be357-7ced352e386mr1146825485a.25.1747940639378; Thu, 22 May 2025 12:03:59 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-550e703c2f3sm3482506e87.214.2025.05.22.12.03.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 12:03:55 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 22 May 2025 22:03:29 +0300 Subject: [PATCH v5 10/30] drm/msm/dpu: get rid of DPU_CTL_FETCH_ACTIVE Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250522-dpu-drop-features-v5-10-3b2085a07884@oss.qualcomm.com> References: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> In-Reply-To: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: Neil Armstrong , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Dmitry Baryshkov X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2649; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=73PNb9U9hPhtgDIYoKDO+U5RvVBCB7fQuR7leMk88VQ=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoL3T9Ulgcc13VbVg3mZTLs57CraySRoXFZ3SMP Xnb3jmUDjiJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaC90/QAKCRCLPIo+Aiko 1cwyB/0VZxlJnkCsz1D9/IronGDMdIKooY2W+C8xzh923SPBrMQs1H1xI2jVhTZx+u14OTyjE0R SNUFfR0RDAbgcVxRmjtHM2iQFpLNCfzZae+qPvsw4LhwZEI+dQN0Q0nmtaHUnCNiWt2cBtUni0E DB2ow8sHTIMbXq7vWcOgMFJ28Yn/ZDvsp24MMI4UO4uGoVmkT/h79xCSDZ29k3Olh61DreMw8a+ +kC2lb4oW1WemQu1BMBLsgGzUHRr/bl4grnC1Ma7M8kZlUw/dT6Atug8bzxJyvgIPg+THdsEzH5 Y0nlt3/br5DFL3aipAVNa/V+I1gIxso1XumVWcETHsAKxFaP X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: 04lAjMFkMcSdSdYrXZj6lVdp3WW4AecA X-Proofpoint-ORIG-GUID: 04lAjMFkMcSdSdYrXZj6lVdp3WW4AecA X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE5MiBTYWx0ZWRfX4TPp0w7hAb8v q/30VJ/IT9mVUSYjY7jaQMDpxob4SPMvtrfFk7Ta04EypwM7pauOf6inZZ3RMjQdH5ts63Ipbxl sCdP2L7hyiY9n3261Bjpcyn8Wd4+NfG/zM4eL/zaZkQw6czocrFsGeWBT8KLQfPayJys1PRKP+r LmekZOGrJhXAZrvhN7D2O3a9CVoh2PNa7N8WUfHBj/B6FQHHUfuc22wPSOD1XyzWB/mIB6AxKII tQqp515ma5zUgBM+sMJ5WqSzF5MlMGMUFL2aJANTiFWZbC28qnPTxxRqhsZC7d8OanWxiSQsW5A 8jcHwIjr4KAlbNyCr7z3d+AEV14J7geQm0EUHBpO2GQKtb0bEZxnz4sdkiJZuis3anOiTCWs0xe yQVXo9nMObjHEJfy7mdKHMN1kZGKV8G83NrEldYR7CJEp+CPYMC6Mr+8nuVukpfAj2WSgYW+ X-Authority-Analysis: v=2.4 cv=R7UDGcRX c=1 sm=1 tr=0 ts=682f7521 cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=dt9VzEwgFbYA:10 a=KKAkSRfTAAAA:8 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=1CFBwsujT04XwbEipTUA:9 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 a=cvBusfyB2V15izCimMoJ:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-22_09,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 clxscore=1015 mlxlogscore=905 priorityscore=1501 spamscore=0 bulkscore=0 lowpriorityscore=0 malwarescore=0 suspectscore=0 mlxscore=0 impostorscore=0 adultscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220192 From: Dmitry Baryshkov Continue migration to the MDSS-revision based checks and replace DPU_CTL_FETCH_ACTIVE feature bit with the core_major_ver >= 7 check. Signed-off-by: Dmitry Baryshkov Reviewed-by: Abhinav Kumar Reviewed-by: Neil Armstrong Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 3 +-- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 2 -- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 2 +- 3 files changed, 2 insertions(+), 5 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 0863e5cfb3283ed32f61ddd4483220742df8633d..6fed2cce082c476c1f7f8ee683f2a6f3eeaa5231 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -105,8 +105,7 @@ (BIT(DPU_PINGPONG_DITHER) | BIT(DPU_PINGPONG_DSC)) #define CTL_SC7280_MASK \ - (BIT(DPU_CTL_FETCH_ACTIVE) | \ - BIT(DPU_CTL_VM_CFG) | \ + (BIT(DPU_CTL_VM_CFG) | \ BIT(DPU_CTL_DSPP_SUB_BLOCK_FLUSH)) #define INTF_SC7180_MASK \ 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 9981d090b689b46bbc378d1965b0efd1df0efa8b..82f04de6300eca7d05ece3ac880c26f3a56505b9 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -132,14 +132,12 @@ enum { /** * CTL sub-blocks * @DPU_CTL_SPLIT_DISPLAY: CTL supports video mode split display - * @DPU_CTL_FETCH_ACTIVE: Active CTL for fetch HW (SSPPs) * @DPU_CTL_VM_CFG: CTL config to support multiple VMs * @DPU_CTL_DSPP_BLOCK_FLUSH: CTL config to support dspp sub-block flush * @DPU_CTL_MAX */ enum { DPU_CTL_SPLIT_DISPLAY = 0x1, - DPU_CTL_FETCH_ACTIVE, DPU_CTL_VM_CFG, DPU_CTL_DSPP_SUB_BLOCK_FLUSH, DPU_CTL_MAX 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 2dfb7db371a3915f663cf134e4dd62f92224185b..772df53bfc4fcc2ff976f66ef7339be1ae3da8f4 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c @@ -809,7 +809,7 @@ struct dpu_hw_ctl *dpu_hw_ctl_init(struct drm_device *dev, else c->ops.update_pending_flush_dspp = dpu_hw_ctl_update_pending_flush_dspp; - if (c->caps->features & BIT(DPU_CTL_FETCH_ACTIVE)) + if (mdss_ver->core_major_ver >= 7) c->ops.set_active_fetch_pipes = dpu_hw_ctl_set_active_fetch_pipes; c->idx = cfg->id;