From patchwork Fri Apr 25 19:49:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 884559 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 0E14A22155C for ; Fri, 25 Apr 2025 19:49:15 +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=1745610557; cv=none; b=aYMEPXJczKuFX8PCYPxThWU/iMTVsWmadXuKXb1URsr0ePud3xsTfG7IulZ+sVzwqLdP3OTjBRmACSzjBRTtN60sadmxOao7EfJYAB2KRvXPEcH1WuQbwnRLX0/c/11M7jIL61ipKO6pnkIVjXlVkKm0xLmE9ra+sWsi7bpnXfc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745610557; c=relaxed/simple; bh=xEqo+EivkXzxOzoaQDh4iS1g3dZuWredikvOGuMfVEg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jhQgUFSs7JJ65ljpphZOaJtbxJtJXHLkAv7xWT48yXUGPbNlEDXK/SoI0BTuqeQoNzONpYLvOfMzpC89VIMle5atXMmraO29zRMFptpD9VY1RHrsLAX2pZtjkYpD0dD61a+qtIJwGSrUkdJkIiw+z2m9qYw9XnyQzK/fD5Tjv9c= 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=Y/xbVFMr; 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="Y/xbVFMr" Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53PGJwsf032093 for ; Fri, 25 Apr 2025 19:49:15 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= s27H/MGZip346GLJXyEl0+hPEUbbSGTNw9RexNbP/zQ=; b=Y/xbVFMrbGwRmCF7 wsmRYa+s8c1mZEndO+IXcEW51fj4TW23Nh77+FlDnY0WnRAnaDKqSqoDT1QLOnWx njc6Ve/1kObt1zogdkRLg1JUHrX5iOpiIdSfpcqzxfe3AC5gtw+qyOKl/KS/fB3E /wVMeAijvzxVND5UUPO3p2QHE4VDnWDdiWmT6Ia+/XbH+9izxxdy+0RSL/oPRR6D sANFfxbljs5konwVHd5kOSPX6T4U8+oUxm99t0MGfZOrOeAnxVcHGE0eDQpwN/tj TPCiu5wpItqNY5wpLK9TIjudY+nu9WtvhEN01Kvp0Fy8QHfFJ8RLMojURHBk6BF8 x8ciEQ== Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 466jh1a0uw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 25 Apr 2025 19:49:14 +0000 (GMT) Received: by mail-qv1-f69.google.com with SMTP id 6a1803df08f44-6e905e89798so50498706d6.3 for ; Fri, 25 Apr 2025 12:49:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745610554; x=1746215354; 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=s27H/MGZip346GLJXyEl0+hPEUbbSGTNw9RexNbP/zQ=; b=oLRex1iZUNDYAyNZHgHEIUwbQCG5U37cpgxFIRNRXnnHuiHZSiV+zNk5rFc9yuYIFP 9IBgijhaEWlOdvUh1I71qEhQ/xarU4zPU5CO5ObebAsb+0J5bHsyPxbaOMjxdUmulTuK Faus8Fh75HRkMoXMyTt3AmOiF8qQg+atAtllkHpogMqqwJpYtK6oMBw0BRj+P6BTPN41 QHuw4+RiVH1Dox0tPWX/Y5g1sYnjImB80Nk4rMBagGn++rL7JP5PEGHg9Iq7DM6xSGkT 30dp4P51l53sOx/s7/KnDQK5dcBM4uwu/EdtNHVgNQgDJ/rbI3D1IcmGJSiIU9DseuKV KQWw== X-Gm-Message-State: AOJu0Yx46eX1q5FCksEOclykIGId+erEW1/YEKiOrmuK8ykOb0v0/Vyc 7bP0J8iYXzE5xTrgMD+QMoSB1QJDUpwG0NFo032szHin2NqhLo2mV+74Iu9Qj2HnX7ISN5Wl1aa ufGSoC71DVRG5mOk6vWod22v0AwyNoyyIwixX26YcQes6ckTWuW8aJBzN60TIN+OtKlP1MQum X-Gm-Gg: ASbGncu4JUrD9Iu1ZezHI/0o0YFekvDKS7oqm6Uv6dT6e5dCnRu2raeJVGyA7QFiA7c Zn+F82xTmgANGgdAQX6Z+YyzzY1m38DSKUWVfPkjrwm5kDOw7tam/Mgm8LrLwWxFzrZX1kIwYA5 grmS1vV5ur0VJgQ4VG94Xr48nmodqEPQqP3uOqjqtNLHTAAXLMw9EPXdRlgscigP8M7oFhK3N8B iRaKeaR/p0msWTOTCn2j2+bbE9KJaU6/PmGfu6r6uC0dUlu/dK9kTiMp1GkdAjMK1v9Ew3IOUnp JZCdXIkItBPv76eo3Q6oaEix+3lWR3E3TQe/BZAQ2CsiXsTWWRNe8AW3BBt2UCzrXPR0uUdBWfz n/GByD+U8UefMeIfQdDzpLbox X-Received: by 2002:a05:6214:1941:b0:6e8:f166:b19e with SMTP id 6a1803df08f44-6f4cb9d675bmr56063716d6.17.1745610553742; Fri, 25 Apr 2025 12:49:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFIlmd7nFIFgnLBspjDQVkgY90tTtUd8k3ohF7W9+HxepEi1M8QeYnlT7judZ4HqN7C5lnMEA== X-Received: by 2002:a05:6214:1941:b0:6e8:f166:b19e with SMTP id 6a1803df08f44-6f4cb9d675bmr56063336d6.17.1745610553327; Fri, 25 Apr 2025 12:49:13 -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-54e7cb258b7sm725313e87.22.2025.04.25.12.49.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Apr 2025 12:49:12 -0700 (PDT) From: Dmitry Baryshkov Date: Fri, 25 Apr 2025 22:49:08 +0300 Subject: [PATCH v2 1/5] drm/msm/dpu: enable SmartDMA on SM8150 Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250425-dpu-rework-vig-masks-v2-1-c71900687d08@oss.qualcomm.com> References: <20250425-dpu-rework-vig-masks-v2-0-c71900687d08@oss.qualcomm.com> In-Reply-To: <20250425-dpu-rework-vig-masks-v2-0-c71900687d08@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Konrad Dybcio Cc: 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=3187; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=C2f4NUqFP0JePGsYgv6HQ3zhP0uNZ8tppCfOQ3zdVxY=; b=owGbwMvMwMXYbdNlx6SpcZXxtFoSQwb3c9NvmqV2SRvN49/qMkazLRa+zVF7ntcxJDJ/5WKzP xWO5053MhqzMDByMciKKbL4FLRMjdmUHPZhx9R6mEGsTCBTGLg4BWAitxM5GJpSzmcHRb/7GFMZ qjXzgy57tthxk5yaun0bOf7n+CqYTHrK1c1kfWLRkcbFyiv1tt9gW/2HYXmokWiEbOOSS/xdx+6 xBJ7mkHyWya+3a4rxytZyyUybc7OTL+7+L7OfzUjPYs3+3+9s7ET2vvqbaMeUVz7P+uQ177m2sp X8mW2hJh0fvHh/iIUV+VpeSFyjO13G7+CD18USfPpLnjP93mvHULZVNHLyXUmR/qJJ/hayJ93Wb N8U/OqEHf+uzZu8ddP1V8p3CxqfNWVSrtnLeLVySu4k/9r6Qw1yE9Tkru3t4pVNvuR4qd+u7Hr7 d/Os/99/xn6qEZeJmSuXbVNi1+r1RP5+2RGPImOb3K8A X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: NEikbHEG97ZxQHlhKheo8fIpabgARsJN X-Authority-Analysis: v=2.4 cv=OY6YDgTY c=1 sm=1 tr=0 ts=680be73a cx=c_pps a=wEM5vcRIz55oU/E2lInRtA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=KKAkSRfTAAAA:8 a=1PPYqbpFttJoYAmrjxEA:9 a=QEXdDO2ut3YA:10 a=OIgjcC2v60KrkQgK7BGD:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: NEikbHEG97ZxQHlhKheo8fIpabgARsJN X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI1MDE0MSBTYWx0ZWRfX6aWIgJjh5xxr lgAT9MhbVDR+p6p3q2eHeTVZkr8Us9VX9FAs4r5gewBKbEtRUpSjyKu9wv+tkhsXASnBAlnPqb2 3WMMLoiCmc9U5cOjeogQV2PaFHgnV/LqyqEMF+kKit8G4MFl/QyN5avyRnJ6Wfy12grNAIU0jm/ fcoK8KTsI9tbh7MpnKTKMTXYsTP80dZvji1puRZOPfVoez0EQcg348CO/fVTEOBfne/Qe/QIk0x psWPLnuWgl7EJdIYGr26bPhXA7Px74SjsKhF278HxTxRgjwF31bpPIevo8NYX4S5A8eIu1T0Omn TrXH201yvlTG4o8SNwp8+HdlyP8WU4JKml51KWZVy27Bqey09nziBGUZVaBepiTL0M1v2aY9hWN gnBU5HehDpCHla4Rrj0mA8JpiyzQFOI+VnFw+0DYS21DsW6ZGcXncWQi6Dks1n8pNxwaXIEi 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-04-25_06,2025-04-24_02,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 lowpriorityscore=0 suspectscore=0 mlxscore=0 clxscore=1015 malwarescore=0 mlxlogscore=896 phishscore=0 priorityscore=1501 spamscore=0 adultscore=0 bulkscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504250141 From: Dmitry Baryshkov Reworking of the catalog dropped the SmartDMA feature bit on the SM8150 platform. Renable SmartDMA support on this SoC. Fixes: 460c410f02e4 ("drm/msm/dpu: duplicate sdm845 catalog entries") Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h index 979527d98fbcb19c33ccb45b5ba4716031949985..8e23dbfeef35432348c86544e825aefa54d476aa 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h @@ -76,7 +76,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = { { .name = "sspp_0", .id = SSPP_VIG0, .base = 0x4000, .len = 0x1f0, - .features = VIG_SDM845_MASK, + .features = VIG_SDM845_MASK_SDMA, .sblk = &dpu_vig_sblk_qseed3_1_4, .xin_id = 0, .type = SSPP_TYPE_VIG, @@ -84,7 +84,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = { }, { .name = "sspp_1", .id = SSPP_VIG1, .base = 0x6000, .len = 0x1f0, - .features = VIG_SDM845_MASK, + .features = VIG_SDM845_MASK_SDMA, .sblk = &dpu_vig_sblk_qseed3_1_4, .xin_id = 4, .type = SSPP_TYPE_VIG, @@ -92,7 +92,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = { }, { .name = "sspp_2", .id = SSPP_VIG2, .base = 0x8000, .len = 0x1f0, - .features = VIG_SDM845_MASK, + .features = VIG_SDM845_MASK_SDMA, .sblk = &dpu_vig_sblk_qseed3_1_4, .xin_id = 8, .type = SSPP_TYPE_VIG, @@ -100,7 +100,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = { }, { .name = "sspp_3", .id = SSPP_VIG3, .base = 0xa000, .len = 0x1f0, - .features = VIG_SDM845_MASK, + .features = VIG_SDM845_MASK_SDMA, .sblk = &dpu_vig_sblk_qseed3_1_4, .xin_id = 12, .type = SSPP_TYPE_VIG, @@ -108,7 +108,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = { }, { .name = "sspp_8", .id = SSPP_DMA0, .base = 0x24000, .len = 0x1f0, - .features = DMA_SDM845_MASK, + .features = DMA_SDM845_MASK_SDMA, .sblk = &dpu_dma_sblk, .xin_id = 1, .type = SSPP_TYPE_DMA, @@ -116,7 +116,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = { }, { .name = "sspp_9", .id = SSPP_DMA1, .base = 0x26000, .len = 0x1f0, - .features = DMA_SDM845_MASK, + .features = DMA_SDM845_MASK_SDMA, .sblk = &dpu_dma_sblk, .xin_id = 5, .type = SSPP_TYPE_DMA, @@ -124,7 +124,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = { }, { .name = "sspp_10", .id = SSPP_DMA2, .base = 0x28000, .len = 0x1f0, - .features = DMA_CURSOR_SDM845_MASK, + .features = DMA_CURSOR_SDM845_MASK_SDMA, .sblk = &dpu_dma_sblk, .xin_id = 9, .type = SSPP_TYPE_DMA, @@ -132,7 +132,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = { }, { .name = "sspp_11", .id = SSPP_DMA3, .base = 0x2a000, .len = 0x1f0, - .features = DMA_CURSOR_SDM845_MASK, + .features = DMA_CURSOR_SDM845_MASK_SDMA, .sblk = &dpu_dma_sblk, .xin_id = 13, .type = SSPP_TYPE_DMA, From patchwork Fri Apr 25 19:49:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 884862 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.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 019DF221D9A for ; Fri, 25 Apr 2025 19:49:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745610559; cv=none; b=L1b/jhlZ1WYjCxbCVd2VY1vTuj6aEkrC/VNJnkFXWdK103n2pLqwtw3wJG3Pie0jCTfUb/RNNk8kbIXgm5scmC9xTQU8T0DVUkBSNr8l2N4xQGklLfqDaR172GO5HvbcdFJKpsMFFcsuhlzT8AKS/DfKIa8RmK/A7BwKf2KzpXo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745610559; c=relaxed/simple; bh=zi6XU+PXzgyyO7zfBxiQGFtMjk5GDx/6hmtJu1GnLRs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=cytiFgyRg5tsiGpjm7dYEK2IhHr92FEyVoxiMDMURN52irPTGxfAn1DhPcUc+BrEIQVdImUWUAT2r7a2/n2gya6gasyghwFIqGp38RFHYDZtqiJx6FRuEwqMO3Rrxb54SBVPP3UkaXsRuHrZG/qNvoHsiT8ebdg2m0Orsitbc3k= 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=X/IzE1Vg; arc=none smtp.client-ip=205.220.168.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="X/IzE1Vg" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53PGJtvF004029 for ; Fri, 25 Apr 2025 19:49:17 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= Op5Ucj3NsPaSHpQN3+W+ByQRkYYVKvbIsr+8S3UcS4U=; b=X/IzE1VgEx1CPVgX KlsmlWkRPhKb+bF4Mqo2rzaHWy+4ZTzJzSpGGj9sm2F4ESNqNTXBwBOavOJd6m8I qYlTdQIyvmBoYAyO9LM09CWzRN8k2MmhIXoyA5ukPSOdpRI90m0TaLDHk7RC/YVn BKWJ/4Ndg+ufu2lXe5LgAOhxWlo79ZEUB5GfszECAlmAUl/r8yRaGJidfxFElXyv Xs1tL+qGlnWd5lh+eGzMbFbZRKpMpHiSOOdo2l+mTIMvUjmjRLXowlVo95lNyVtL ZDyJOC8M7D3VqmxceSAEq4nLguqP3OC7/KyJvm7KNKRCMEa/56ps5/ql/WmN5jVM eKDRSg== Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 466jh2a797-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 25 Apr 2025 19:49:17 +0000 (GMT) Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-47699e92ab0so49843461cf.0 for ; Fri, 25 Apr 2025 12:49:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745610556; x=1746215356; 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=Op5Ucj3NsPaSHpQN3+W+ByQRkYYVKvbIsr+8S3UcS4U=; b=AA2eZ7jPAJru7UVsFTc/ysNvUtG2Am7+0usJZD2bHSRcddzYxw2PW89RoUyURKzang k3WhdDpRv45xJPRJGz/2Kndf6H8YaalNZu4YP9rAx1fHOQVECAMZJSju31irEuO3U4ds apCsN09nbZwYlgSUDSHZMqYSFlSDOwGo0W2CmTFIN9wC0nKu2iYQEtCuTMQZzEQJBYvG /l5qtXKjQ8fRnQmy/qIAuHSbAzJC6k3M/y5ECRgTJ+1iF76KgyAZj0mS9u0S4hO9bxRa m6uURiSkfIDQMOhyEkC/+CFb5ptiO7XpTl0fstzCssk510j5Il6JmTDF2Avvk4e2YMoX 6FBQ== X-Gm-Message-State: AOJu0YyK3E5kBAG7LokMI2bFwU2Ru2RlaH4lWJhRnBlt4Fq12ppaN1Bp izGpzx/nbDgFreiO1QR6W7c1q08Cx7lX+HQxfC6H0b7cPDZ8hxhEzxDglyNO1jNC5FdMUOvUcYj /iK7BulZc13Dr3Mp3KPqsl8MHhqzV7jD8bCzeuilPycoSBlS0sPNWFyobx00Q539K X-Gm-Gg: ASbGncs9oNGS7QLJK51EY/1/BZ/qgiTuk1wbVbMX6oON+vl9ts6bpIrfdNoaK0ivf99 Irmg7Wsu28AQ33o9VlNExfkVTQSGoR9dY7LV0TLtZMfGA4XgKyVGfo6T1VE1LYYH9kfYVLbE+XJ S6ulxFsnLAzhjx3nwVAsnq9yncvWXjJhm5q2jM/WVvPNoF5UFOEbLLvP83UOJE0m/oXaxsMcVzH 3I4obJ4EDsMUbTU6wQGDdfuSudPX56JgUkY5uiWt8APs+3X+22q14MFfncGKKMt6ak59fYlAbco LbZE4Yb2WSdnZSW5s6dBCEhMWFNVDEyq7zejOtgr5zOyROvjxOoIWxDsiMiVUvpf/kFoDnv3L5z cb+yIVIdg2wTk9cGqsdJGNTkp X-Received: by 2002:ac8:5f8c:0:b0:476:9483:feaf with SMTP id d75a77b69052e-4801ca7cd8bmr58651911cf.19.1745610556107; Fri, 25 Apr 2025 12:49:16 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHvsYm+y4nGXf58l7owYH/EptT90yacYmOjG5Q/lvtKP+/y6qqRd2lf6/BRdOEXF6bTAvHKow== X-Received: by 2002:ac8:5f8c:0:b0:476:9483:feaf with SMTP id d75a77b69052e-4801ca7cd8bmr58651561cf.19.1745610555757; Fri, 25 Apr 2025 12:49:15 -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-54e7cb258b7sm725313e87.22.2025.04.25.12.49.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Apr 2025 12:49:13 -0700 (PDT) From: Dmitry Baryshkov Date: Fri, 25 Apr 2025 22:49:09 +0300 Subject: [PATCH v2 2/5] drm/msm/dpu: enable SmartDMA on SC8180X Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250425-dpu-rework-vig-masks-v2-2-c71900687d08@oss.qualcomm.com> References: <20250425-dpu-rework-vig-masks-v2-0-c71900687d08@oss.qualcomm.com> In-Reply-To: <20250425-dpu-rework-vig-masks-v2-0-c71900687d08@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Konrad Dybcio Cc: 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=3199; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=fFGUiM7rgjkUGAW2oQNNZ8SSmLtzgOiuFiVQLK6bnQQ=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoC+c2OF+dpZ5x23AvPYZzM2MBCF3aqqk+qzvls wBX0P8XsxGJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaAvnNgAKCRCLPIo+Aiko 1YxaB/wM8mKWJRIVva/SbIne6SnB6a09rDJUu2XRLkcr6IYyW0u5+lvBVXrZxK2q9+UhWyT+r/M LfutguivISiLA9iHcQUS1g84PJVmPhYHUty+PaTu/c1P/glxccHD1jebQF02tRNUxSe/S/tiuvN TKtVBCxBW6jyifRgIZ0XuIBbiUYyUV/QFYMOBK6LiJmbgTxnyMmvpjWN+OmyIyda+PPlvI5mVrh SrVyMm7oM1aP7tbcYoda1Vkb+BcATg9UVthsb2atzf5/rQTQCQNUU1ktYFArBe/Gti4+9Xi/ZW/ d/YLQ29ohqgzdByB3l9CN6mYuvbgImjF6iDjfb3A2YpJl8/G X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Authority-Analysis: v=2.4 cv=EtLSrTcA c=1 sm=1 tr=0 ts=680be73d cx=c_pps a=EVbN6Ke/fEF3bsl7X48z0g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=KKAkSRfTAAAA:8 a=0qT3Y18QIILfcGn7-LoA:9 a=QEXdDO2ut3YA:10 a=a_PwQJl-kcHnX1M80qC6:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-GUID: t4Mm1qiQqKGsUkay2UK0S6rctC6nT8XX X-Proofpoint-ORIG-GUID: t4Mm1qiQqKGsUkay2UK0S6rctC6nT8XX X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI1MDE0MSBTYWx0ZWRfXzg7ou12fVT4a Wi3IpGuKzoTsMFrRe0Qg5aCJFfKo0v1O1LIuAtxrJTYX6ve5sfP/KJbClYn3ScyaqgMn85XCDnz XF7e0aKu5JHEFRI3LQZc8Av7TACGUXNhAY3ltouXCO8X6RBmFxHvXZtZS/EOdefSIye3Kf36pQp Md98ZV0yq8Wa+XtnnsmyqcbSRxS8Ve9/A0WZ0SgY16MnEgJ63oP/jR79hcaSfBMpOpiVeGoG6H2 KhFzQlVqSd5CJLjbM0uBCmN4f+MAYEaDNCjecU9GudUGshgpbwS1ydY8awD02a359C5S7TPbSuT Ae2t78MU5YBGT4pvfF2hzpOZu8S8hcFJvykcOfzvwSoLNLs50N9Gl7UYZAqyqkeidyt1vk3M9ey V1FUz4EDgvm4otUuYllmigme5HGUPCrNUnFH3+HzzRGTyJdz8Pk/uIf4LTYIgQ0g0PApTqat 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-04-25_06,2025-04-24_02,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 phishscore=0 suspectscore=0 mlxscore=0 clxscore=1015 spamscore=0 mlxlogscore=892 lowpriorityscore=0 malwarescore=0 priorityscore=1501 impostorscore=0 adultscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504250141 From: Dmitry Baryshkov Reworking of the catalog dropped the SmartDMA feature bit on the SC8180X platform. Renable SmartDMA support on this SoC. Fixes: 460c410f02e4 ("drm/msm/dpu: duplicate sdm845 catalog entries") Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h index d76b8992a6c18c21a54eb2a373c789720b876c8b..e736eb73a7e61544e0940f1ac683ac0e4c5c79d6 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h @@ -75,7 +75,7 @@ static const struct dpu_sspp_cfg sc8180x_sspp[] = { { .name = "sspp_0", .id = SSPP_VIG0, .base = 0x4000, .len = 0x1f0, - .features = VIG_SDM845_MASK, + .features = VIG_SDM845_MASK_SDMA, .sblk = &dpu_vig_sblk_qseed3_1_4, .xin_id = 0, .type = SSPP_TYPE_VIG, @@ -83,7 +83,7 @@ static const struct dpu_sspp_cfg sc8180x_sspp[] = { }, { .name = "sspp_1", .id = SSPP_VIG1, .base = 0x6000, .len = 0x1f0, - .features = VIG_SDM845_MASK, + .features = VIG_SDM845_MASK_SDMA, .sblk = &dpu_vig_sblk_qseed3_1_4, .xin_id = 4, .type = SSPP_TYPE_VIG, @@ -91,7 +91,7 @@ static const struct dpu_sspp_cfg sc8180x_sspp[] = { }, { .name = "sspp_2", .id = SSPP_VIG2, .base = 0x8000, .len = 0x1f0, - .features = VIG_SDM845_MASK, + .features = VIG_SDM845_MASK_SDMA, .sblk = &dpu_vig_sblk_qseed3_1_4, .xin_id = 8, .type = SSPP_TYPE_VIG, @@ -99,7 +99,7 @@ static const struct dpu_sspp_cfg sc8180x_sspp[] = { }, { .name = "sspp_3", .id = SSPP_VIG3, .base = 0xa000, .len = 0x1f0, - .features = VIG_SDM845_MASK, + .features = VIG_SDM845_MASK_SDMA, .sblk = &dpu_vig_sblk_qseed3_1_4, .xin_id = 12, .type = SSPP_TYPE_VIG, @@ -107,7 +107,7 @@ static const struct dpu_sspp_cfg sc8180x_sspp[] = { }, { .name = "sspp_8", .id = SSPP_DMA0, .base = 0x24000, .len = 0x1f0, - .features = DMA_SDM845_MASK, + .features = DMA_SDM845_MASK_SDMA, .sblk = &dpu_dma_sblk, .xin_id = 1, .type = SSPP_TYPE_DMA, @@ -115,7 +115,7 @@ static const struct dpu_sspp_cfg sc8180x_sspp[] = { }, { .name = "sspp_9", .id = SSPP_DMA1, .base = 0x26000, .len = 0x1f0, - .features = DMA_SDM845_MASK, + .features = DMA_SDM845_MASK_SDMA, .sblk = &dpu_dma_sblk, .xin_id = 5, .type = SSPP_TYPE_DMA, @@ -123,7 +123,7 @@ static const struct dpu_sspp_cfg sc8180x_sspp[] = { }, { .name = "sspp_10", .id = SSPP_DMA2, .base = 0x28000, .len = 0x1f0, - .features = DMA_CURSOR_SDM845_MASK, + .features = DMA_CURSOR_SDM845_MASK_SDMA, .sblk = &dpu_dma_sblk, .xin_id = 9, .type = SSPP_TYPE_DMA, @@ -131,7 +131,7 @@ static const struct dpu_sspp_cfg sc8180x_sspp[] = { }, { .name = "sspp_11", .id = SSPP_DMA3, .base = 0x2a000, .len = 0x1f0, - .features = DMA_CURSOR_SDM845_MASK, + .features = DMA_CURSOR_SDM845_MASK_SDMA, .sblk = &dpu_dma_sblk, .xin_id = 13, .type = SSPP_TYPE_DMA, From patchwork Fri Apr 25 19:49:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 884558 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 7ECC0221F28 for ; Fri, 25 Apr 2025 19:49:19 +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=1745610561; cv=none; b=TkFmiJP1oxAq/5M4b8YjOY7iwNqhjHTvZzu8WPQJvDSmDETWOOOePzyBP1IYVgzuZCb2nRuc2V4dschQkuSPPKd0uBcasfh/2W3AxifJlH/NxyXCJiDU92DJoK/boRi/cOHBwkaxajjmbCh73BTM3pelTwy0yKpSOsecuGbAFro= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745610561; c=relaxed/simple; bh=CUaIe3YjEScKzRmab1Pl5aHETuKQ1a9T+G7YnxZyaYY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gYc2LWtxHNLHN3YllCyrI/ey0YJOp2dz0LarIHipWzRBgbLvyb49clIgv90XrBuV/mTKQgI5hGzGm56JDaY8kB1t5AKOA34P/EQ6ODRqSXHV2GJMVNRWKAsFn5E7qSxOpQfvVC0rhIDiK7uRUrPETFMCW9QHe4/2NpwRwzPKhXk= 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=iNjV2Yg6; 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="iNjV2Yg6" 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 53PGJqhx031964 for ; Fri, 25 Apr 2025 19:49:18 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= yu1pJ4v7QyzpaLYH38MD+E0KLIvxpSKT0ukBB1qszW4=; b=iNjV2Yg65YPih9MY NHbRpmoFU78rmRnk+K+o9vaum4aFohzqowSEbaZccjKfyzN+5H9DMFNux1W7W3M9 j6+/3dtIcSh1Ucm0CvVxIUjcphFnQpkmFiTL+iF4p9VXk8T/eEL5rAHMWdnWEdm9 CC1M/akHf+P34ayA3xpHoKdXYiHWC1zY8gH7iRSskYo87dXBJATif+I+aWij8uUJ mENwPIBmB6jm7HisrVkBgb2Ot76KEoPLpCZ3HIZCO2fgvFyrBVwYk4a/plIVmCdy JdmOCRdY8wkDh8vwFUFV5ZswXS5z7IK+uqYi+yuF3NdvmLmLlpF8ECr4Nnww6YSb jsAimA== Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 466jgya4gk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 25 Apr 2025 19:49:18 +0000 (GMT) Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-6e8ffb630ffso41604506d6.1 for ; Fri, 25 Apr 2025 12:49:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745610557; x=1746215357; 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=yu1pJ4v7QyzpaLYH38MD+E0KLIvxpSKT0ukBB1qszW4=; b=UuAywOkSXNoWi4BJgESKwl6QASER7i8KwNdPfOiXdN+tqeReNndjvnW+KQ3u8N+aVC yK+xI/thG/gl2Q1bWBzK7xfcp2PIZgU28kLptvzEpx9hDPXe09M68TvhJ75QHuSNmReG BLa/B3BhvQXVpmGqbOlGdrYpHx2j8RZ77r744KaT13tPlsPoLK4P4qfQ/nbrZv3ScAjB Kx9U/EYwXhaxCX+t2CMWxqEEBy4HFlNcXtQk8/YKCJY0Up6eaTgWhgFJ3jXruFHWESnG 5FlVe9ZoC8KZtV2pEO4cFg/i2tGXgy/AR0v5IgzjUH4/3GyNEVWSZOA3QPpHwsePcCob FDnQ== X-Gm-Message-State: AOJu0YwOH6Xo2t7EZx6vRzVn6t46IAm4CZ7RlXgihPoAtXlLeyQbXyxQ ISEGj6IDPeycRwLVthoxof8cxGtVfEbILqv9cyVLtGVEtVjnLbXkpRo6sV2ePYw0oUUQJY4v2DX ePnac+GipSSRpPOSNN62eq1xH6fyF7hDUG0DC+W/iS2ym1dej9W9gdd4EUEao/xkb X-Gm-Gg: ASbGncsYD8AmseSTrPyiiJgjFt7h0NuupTIETNL9H+ZnR6wHr44tLchNclY9sMnF6lB cycAWpU4p1jRIWlB7UDw/S1BaVaIJfcedUSuHkgaRPjralemg6swe4riCulQMxHeCbXBSYJZzZO WzJBm+LSE+bxH+Wj0X+zWqA+28RShwewjUQwmN9MNLi4G+VVpPuYKhAVU5CgCMYqnEqjN+fHUww XhwnnpjkY+ZStPqyw7kOFmjHcO72Cn8/u7SW9VGnMqr5cZcXDZHmHud2+IXnM6Z4kWlkTI3mgUX kdBm2QEC+6DzWfH0F3gXj+kwphvP3jOFrKzzwc5fCQQHzxUg8Xe2H6pgJ2ZMifO7Gy3lTrRjzyy sAm2BKn6UWwDiJDsHI23PZ0bw X-Received: by 2002:a05:6214:242b:b0:6f2:a886:7c6d with SMTP id 6a1803df08f44-6f4cb9b917dmr61105486d6.3.1745610557409; Fri, 25 Apr 2025 12:49:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEWxy8OZVy+1G4435jkDv7x9KFSTI/TlWQyS1nZQqm5LJzAOkiG4ti14J6fup+ZqQ6Lmqkrsg== X-Received: by 2002:a05:6214:242b:b0:6f2:a886:7c6d with SMTP id 6a1803df08f44-6f4cb9b917dmr61105196d6.3.1745610557116; Fri, 25 Apr 2025 12:49:17 -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-54e7cb258b7sm725313e87.22.2025.04.25.12.49.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Apr 2025 12:49:16 -0700 (PDT) From: Dmitry Baryshkov Date: Fri, 25 Apr 2025 22:49:10 +0300 Subject: [PATCH v2 3/5] drm/msm/dpu: enable SmartDMA on SC8280XP Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250425-dpu-rework-vig-masks-v2-3-c71900687d08@oss.qualcomm.com> References: <20250425-dpu-rework-vig-masks-v2-0-c71900687d08@oss.qualcomm.com> In-Reply-To: <20250425-dpu-rework-vig-masks-v2-0-c71900687d08@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Konrad Dybcio Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3144; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=CUaIe3YjEScKzRmab1Pl5aHETuKQ1a9T+G7YnxZyaYY=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoC+c2fBKFWyeuvlxVupBYlHsabn1JoqhaF56EP A1a5Yl2OECJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaAvnNgAKCRCLPIo+Aiko 1VujB/0RH8hLC2/n5KPQjXGWQdbQPf/GoiGnrLDEdFtg/55BGzkZSIzNqJJMdmP+7vsHv9MPIcG YcyjarvTthBVQ2gwHC8m24VeVjCeGha5APWZv38Zq8g7jZZRW0IxctLvGgswDWh348JqBMuBmUi pHi0183XYOLlOK5LMrCk7RjngYk5XLViEtYyM8gy382OtyZ8/gn2L8/ThiJ1yJFI18mvBsqRT5P old7nzpGyj4oziK/5oe8fC+TM0PUDgvkrZ2M6wcRHK33oBvuIkwlAPIkvcJIoqL9qbP60RLvoSb 1yRl43nTtcbz9GZQhJghSKXMIh8csXpawBcumJtujOHTnnf4 X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI1MDE0MSBTYWx0ZWRfX7pOaG+miswzn no0n65e3G14LBoPu4nxmm4ulExi9xVtAWePF9fCWReNzwASv+8X7zGOGxCRd5Z5z2fePppYX4Vz kJ431r4EtCGZC4ZGN+z7hLSgF75e7CezcSK2xRy4DNeUm8Zg+1JirgQtftQ++BCIPp85hoU4Q2T GfKMocmQJq7CQb/G5axuChyBvwQcsn+K4oyg/EFqq0ZqdrPVVBVd1bvlw/wFCL+DDcVEuGsjFTq fhLJedk0GTBzYdpQysPeK4N4lq+rEkSNrhxaGUvSoMd6iDcwIqslxlySfDyTvDCxWD52TO6gV1C FPi5d0gXxi139yvivo4ACvzmo3WosFB6Z8NQC4CmcYtSgXOK0OecXq8iu3ewNkEWJpf8tIV0b2U /Gdnt4YjoT+ffjfRW61pPDf02I2UqXWx/P7OCM2dSnYkrwtXkE3Cbg/+r8RzIQw9f6Q/sWov X-Proofpoint-GUID: vVrghMGp0YlInTPuSHPERMBrSQ7uW0VE X-Proofpoint-ORIG-GUID: vVrghMGp0YlInTPuSHPERMBrSQ7uW0VE X-Authority-Analysis: v=2.4 cv=M5VNKzws c=1 sm=1 tr=0 ts=680be73e cx=c_pps a=UgVkIMxJMSkC9lv97toC5g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=EUspDBNiAAAA:8 a=fm35gGnZT3d3QFCnA_UA:9 a=QEXdDO2ut3YA:10 a=1HOtulTD9v-eNWfpl4qZ: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-04-25_06,2025-04-24_02,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 lowpriorityscore=0 adultscore=0 spamscore=0 priorityscore=1501 mlxscore=0 mlxlogscore=738 malwarescore=0 impostorscore=0 clxscore=1015 suspectscore=0 phishscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504250141 In order to support more versatile configuration of the display pipes on SC8280XP, enable SmartDMA for this platform. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h index fcee1c3665f88a9defca4fec38dd76d56c97297e..923afc202f5195fa15bcfc1e141fc44134c965e4 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h @@ -74,7 +74,7 @@ static const struct dpu_sspp_cfg sc8280xp_sspp[] = { { .name = "sspp_0", .id = SSPP_VIG0, .base = 0x4000, .len = 0x2ac, - .features = VIG_SDM845_MASK, + .features = VIG_SDM845_MASK_SDMA, .sblk = &dpu_vig_sblk_qseed3_3_0, .xin_id = 0, .type = SSPP_TYPE_VIG, @@ -82,7 +82,7 @@ static const struct dpu_sspp_cfg sc8280xp_sspp[] = { }, { .name = "sspp_1", .id = SSPP_VIG1, .base = 0x6000, .len = 0x2ac, - .features = VIG_SDM845_MASK, + .features = VIG_SDM845_MASK_SDMA, .sblk = &dpu_vig_sblk_qseed3_3_0, .xin_id = 4, .type = SSPP_TYPE_VIG, @@ -90,7 +90,7 @@ static const struct dpu_sspp_cfg sc8280xp_sspp[] = { }, { .name = "sspp_2", .id = SSPP_VIG2, .base = 0x8000, .len = 0x2ac, - .features = VIG_SDM845_MASK, + .features = VIG_SDM845_MASK_SDMA, .sblk = &dpu_vig_sblk_qseed3_3_0, .xin_id = 8, .type = SSPP_TYPE_VIG, @@ -98,7 +98,7 @@ static const struct dpu_sspp_cfg sc8280xp_sspp[] = { }, { .name = "sspp_3", .id = SSPP_VIG3, .base = 0xa000, .len = 0x2ac, - .features = VIG_SDM845_MASK, + .features = VIG_SDM845_MASK_SDMA, .sblk = &dpu_vig_sblk_qseed3_3_0, .xin_id = 12, .type = SSPP_TYPE_VIG, @@ -106,7 +106,7 @@ static const struct dpu_sspp_cfg sc8280xp_sspp[] = { }, { .name = "sspp_8", .id = SSPP_DMA0, .base = 0x24000, .len = 0x2ac, - .features = DMA_SDM845_MASK, + .features = DMA_SDM845_MASK_SDMA, .sblk = &dpu_dma_sblk, .xin_id = 1, .type = SSPP_TYPE_DMA, @@ -114,7 +114,7 @@ static const struct dpu_sspp_cfg sc8280xp_sspp[] = { }, { .name = "sspp_9", .id = SSPP_DMA1, .base = 0x26000, .len = 0x2ac, - .features = DMA_SDM845_MASK, + .features = DMA_SDM845_MASK_SDMA, .sblk = &dpu_dma_sblk, .xin_id = 5, .type = SSPP_TYPE_DMA, @@ -122,7 +122,7 @@ static const struct dpu_sspp_cfg sc8280xp_sspp[] = { }, { .name = "sspp_10", .id = SSPP_DMA2, .base = 0x28000, .len = 0x2ac, - .features = DMA_CURSOR_SDM845_MASK, + .features = DMA_CURSOR_SDM845_MASK_SDMA, .sblk = &dpu_dma_sblk, .xin_id = 9, .type = SSPP_TYPE_DMA, @@ -130,7 +130,7 @@ static const struct dpu_sspp_cfg sc8280xp_sspp[] = { }, { .name = "sspp_11", .id = SSPP_DMA3, .base = 0x2a000, .len = 0x2ac, - .features = DMA_CURSOR_SDM845_MASK, + .features = DMA_CURSOR_SDM845_MASK_SDMA, .sblk = &dpu_dma_sblk, .xin_id = 13, .type = SSPP_TYPE_DMA, From patchwork Fri Apr 25 19:49:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 884861 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 F0538225387 for ; Fri, 25 Apr 2025 19:49:20 +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=1745610562; cv=none; b=cMSupuhboNnnaSTzceQPuf8+iJy9MOy8VXxmrKmNcqyo+mv2+BZU9wjn5RNGARSQEdSV6W1IAIarAA2ZyI3l1utypbiJBQgCWRvrTOiNDQwx8Er26L+ZxnPefyHgA/g+aSZz71LRIM0kV5CR/LuOHxSFxhYqvVwtPKmqAhEx9YU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745610562; c=relaxed/simple; bh=FNmRnyT3eow0gzV4hp6sl5gj/DZ/zTj42D8dGvvjRGA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=IjjGPoIJ5eKpvcMAq4/sgyYBa1lJzuPI8fDxKkBSmsghsKeSvXmxV7lv2ngWTEOqUR1KPksZoT2PyeCkNAEKK7u8pwphzzuHosiGms6jkoYVL38oooU1OlDHqXENbvV2z32AnA3m/cW5YmtLkqDJmmVhSDHr9pfc6+6hgGO5zPU= 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=p6HDHb//; 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="p6HDHb//" Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53PGJwd2011506 for ; Fri, 25 Apr 2025 19:49:20 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= a9pjFcwbQ6d4uQNGXNPU6ossuRXldL+ieO315jgWQ6M=; b=p6HDHb//EDvbSBVq I/hqYpHGoi4XV16zcHF0dkOf8oBmrCR8aY4cuFu2lLzAxlTEwhR6JxKDmafxmyuU EhamlzLPBOxGa6/jVkUL3bTFUtL33R9CeeaEHF+jvw/uHLh2xkLoUEZiukONUNtx Vh4LOyPtY7mVIYaKCUZ2wEliV++DrgKRqcM10EJOAmdNvLtm20S57x4YtePIFAcq e9+/FzOhPMRuHZoSqvImQIgRo27qf7mMqTlDkoG5rrYes0X7AFv553+Ll/FqeGN5 2rCLWjoe4UZ15QDsFKMy20Q16cFjAlw2+f/iMwQE3916qHWTMSgCAGkTcWLPtPgZ WSS6RA== Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 466jh3t2vc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 25 Apr 2025 19:49:19 +0000 (GMT) Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-6e91d8a7165so46859646d6.0 for ; Fri, 25 Apr 2025 12:49:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745610559; x=1746215359; 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=a9pjFcwbQ6d4uQNGXNPU6ossuRXldL+ieO315jgWQ6M=; b=MB6+nus8VoD4yy6YAcV7F3WNXq8jtSgnAPYGEdNsatTwjumVt++Rkr/pKjnj67D4TJ glt/Z7Accc5Hb41UrWpfzvUVqpifGAHWYaQCIKLbHpmF60VPepGwCIR925ewjxkKKo/u WmGq96qYIysB80a+shdEaSj7VhXeA29YBj4f6iBFcIHLpLG+tJWetgagqbgzlnYeWR1d UKPLl9hlQOokKAL7R53uSbhju3HXu/skUNaqD7ZPxEj8NLqyCw5bzAPOz9DOs6xP21FO 2ohfE50fPq4e91aa9A2IIhE9yb5Fs6AcHjIYqpRBx0dQWNZcovyWtVAOrmF13OBql17Y XEAg== X-Gm-Message-State: AOJu0YzntxKUDWBNkt5hUKcEPgVq0jIajg4S+fz/2ou+Y2LUE7nxYpJ+ GmX6goyZOP6OzJ1AJswIWCnmKGVqSDVPIBgv/KhGS40uuNll9dszMXDLQRffHGFwHCbeyYZR8Fb iS5/gJD36XvzvcAbc7cDsn4rIuHwmLjAH1O5DRuCy7pa/9R18TYUnpwXIeWN5LXk0 X-Gm-Gg: ASbGncsUPr+ok5bUcWG+7PHd6orklaiqUAhGLXHW11uDksS3xiTHZhV/KzxZC34RbYi 06T7O1PfhdOBrw2eN9OJGq2GMb/ilIfAYcDA0F5BvkIw4DMPy7gjqVqkC4gIpsD6f3y9YzQ9h9P rXvmgMHmgTJF55UrAshPkwSBdej1j7KHRnnCgmaQAF8TF0WpbFHiYjGgge4+Y989Fapgdr89SUR G/y8ahjVQrRPzpR4Z3+J6q84ydMo+gR174h+IxsygAm7Jhv4BMP5jxcsCLX0g5TiEbzF82Tr+K5 co9jDbv1wxg+TlekQXn62+2OzEDZnf4YN8Z8gGgYdvYLW8gpIsFfjOsbLONrcoMxUAluTeuL7Hb DduhRk0fdpNQ3NKTRGApgqya3 X-Received: by 2002:a05:6214:29ca:b0:6f0:e2e1:50b4 with SMTP id 6a1803df08f44-6f4cba51be4mr69387586d6.35.1745610559099; Fri, 25 Apr 2025 12:49:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGqo8lIulG0dOvKsgER6OtZ+TgO9vrJCPId0DQSeGksp2OqiP+WfRkkD63nepXAm0dyxJWWzQ== X-Received: by 2002:a05:6214:29ca:b0:6f0:e2e1:50b4 with SMTP id 6a1803df08f44-6f4cba51be4mr69387276d6.35.1745610558751; Fri, 25 Apr 2025 12:49:18 -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-54e7cb258b7sm725313e87.22.2025.04.25.12.49.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Apr 2025 12:49:17 -0700 (PDT) From: Dmitry Baryshkov Date: Fri, 25 Apr 2025 22:49:11 +0300 Subject: [PATCH v2 4/5] drm/msm/dpu: enable SmartDMA on SM8550 Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250425-dpu-rework-vig-masks-v2-4-c71900687d08@oss.qualcomm.com> References: <20250425-dpu-rework-vig-masks-v2-0-c71900687d08@oss.qualcomm.com> In-Reply-To: <20250425-dpu-rework-vig-masks-v2-0-c71900687d08@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Konrad Dybcio Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3076; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=FNmRnyT3eow0gzV4hp6sl5gj/DZ/zTj42D8dGvvjRGA=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoC+c2Hv1ovnVDqdxrC5BedSPh5Ro8hHW5+EDoF 6IEpQ/48xqJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaAvnNgAKCRCLPIo+Aiko 1fJLB/9hTRaveuHQ+zTcJi8Ao6BwDCfle6A5QscWvAbkGLF/ddC9p3z0TCVyo6Y0IebU3Arkw5Y r+nBzqOPYjEsUzy4k17EESJhUKzSzv/cIStLZbD7NYtR8K/DJJ6DmMWql+aFY4mx6UWGtAYNHik rjojGqOrdI047199IGbvXrUBTwO8/jYq5+Nzk+f3rYcTD5S8mM7OojGoL7H1gDjBKY28/yZD7XH D7pf7G9/KyALtVxQ9uCNAiNlW5yJ7eJbR167DseFYlYuu+mzZFeYjiegdLRgqq8Xzd/s9GA0r1J u7EU7QPzjbch3uZocnb94uXstPIiWfhvs9h6hg6Aj1OCfETp X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-ORIG-GUID: taoT-ka_TEIoqQ7dE2JNDz3zBtFHd30X X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI1MDE0MSBTYWx0ZWRfX51eg9mq1LmPG LGELcRkzeQJMhYd3KEWY8dlAXtb2xj6ul9P06bGgXEu+Ma7OecijzgttTvuRGlCwEBITQP+ikeA xf2LHTZscCJeqom+4Ctz+dQ9ZZKI30+I0D70C4WLK2vG7vd5eB7CJVeGrfpvQ0B9QD4cO92IIqo JGCqry8wbbdKIEytb1IYh5zv/NFq/8ZB6VEXo29W9B/ko0ObhiJFSwOLPNSxqr7HdQ0H3fKlo1g UDVYlBgZyYKwtJhuHUJcuEvht1gY5un0mFsZctZiOK+BiHjuzmKGpqwfMTPyNe4xiXnAatpBiuH dzEzeSJdiIr82QxS+Z+ZyHtnmWUfmlh5pGsft5pxVIsJS62ITZbaH/cuxi9jqVi8qhjli39lEGb TPzr2CZON6zHk6vAaHaOLDvIA2TT7xG4/B3hYJhH96K/MOGinfY6ga6e2b4lHyo/q4CMmeqM X-Authority-Analysis: v=2.4 cv=ELgG00ZC c=1 sm=1 tr=0 ts=680be73f cx=c_pps a=UgVkIMxJMSkC9lv97toC5g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=EUspDBNiAAAA:8 a=kVj8X6nmCGut3nRlWRwA:9 a=QEXdDO2ut3YA:10 a=1HOtulTD9v-eNWfpl4qZ:22 X-Proofpoint-GUID: taoT-ka_TEIoqQ7dE2JNDz3zBtFHd30X 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-04-25_06,2025-04-24_02,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 adultscore=0 malwarescore=0 clxscore=1015 bulkscore=0 phishscore=0 spamscore=0 mlxscore=0 lowpriorityscore=0 priorityscore=1501 suspectscore=0 mlxlogscore=816 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504250141 In order to support more versatile configuration of the display pipes on SM8550, enable SmartDMA for this platform. Signed-off-by: Dmitry Baryshkov --- .../gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h index 24f988465bf6ba8e3d3d2691534f0981f222fa27..1a156d2b714ffa6c16b2ae331704c1274dc0bbfa 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h @@ -66,70 +66,70 @@ static const struct dpu_sspp_cfg sm8550_sspp[] = { { .name = "sspp_0", .id = SSPP_VIG0, .base = 0x4000, .len = 0x344, - .features = VIG_SDM845_MASK, + .features = VIG_SDM845_MASK_SDMA, .sblk = &dpu_vig_sblk_qseed3_3_2, .xin_id = 0, .type = SSPP_TYPE_VIG, }, { .name = "sspp_1", .id = SSPP_VIG1, .base = 0x6000, .len = 0x344, - .features = VIG_SDM845_MASK, + .features = VIG_SDM845_MASK_SDMA, .sblk = &dpu_vig_sblk_qseed3_3_2, .xin_id = 4, .type = SSPP_TYPE_VIG, }, { .name = "sspp_2", .id = SSPP_VIG2, .base = 0x8000, .len = 0x344, - .features = VIG_SDM845_MASK, + .features = VIG_SDM845_MASK_SDMA, .sblk = &dpu_vig_sblk_qseed3_3_2, .xin_id = 8, .type = SSPP_TYPE_VIG, }, { .name = "sspp_3", .id = SSPP_VIG3, .base = 0xa000, .len = 0x344, - .features = VIG_SDM845_MASK, + .features = VIG_SDM845_MASK_SDMA, .sblk = &dpu_vig_sblk_qseed3_3_2, .xin_id = 12, .type = SSPP_TYPE_VIG, }, { .name = "sspp_8", .id = SSPP_DMA0, .base = 0x24000, .len = 0x344, - .features = DMA_SDM845_MASK, + .features = DMA_SDM845_MASK_SDMA, .sblk = &dpu_dma_sblk, .xin_id = 1, .type = SSPP_TYPE_DMA, }, { .name = "sspp_9", .id = SSPP_DMA1, .base = 0x26000, .len = 0x344, - .features = DMA_SDM845_MASK, + .features = DMA_SDM845_MASK_SDMA, .sblk = &dpu_dma_sblk, .xin_id = 5, .type = SSPP_TYPE_DMA, }, { .name = "sspp_10", .id = SSPP_DMA2, .base = 0x28000, .len = 0x344, - .features = DMA_SDM845_MASK, + .features = DMA_SDM845_MASK_SDMA, .sblk = &dpu_dma_sblk, .xin_id = 9, .type = SSPP_TYPE_DMA, }, { .name = "sspp_11", .id = SSPP_DMA3, .base = 0x2a000, .len = 0x344, - .features = DMA_SDM845_MASK, + .features = DMA_SDM845_MASK_SDMA, .sblk = &dpu_dma_sblk, .xin_id = 13, .type = SSPP_TYPE_DMA, }, { .name = "sspp_12", .id = SSPP_DMA4, .base = 0x2c000, .len = 0x344, - .features = DMA_CURSOR_SDM845_MASK, + .features = DMA_CURSOR_SDM845_MASK_SDMA, .sblk = &dpu_dma_sblk, .xin_id = 14, .type = SSPP_TYPE_DMA, }, { .name = "sspp_13", .id = SSPP_DMA5, .base = 0x2e000, .len = 0x344, - .features = DMA_CURSOR_SDM845_MASK, + .features = DMA_CURSOR_SDM845_MASK_SDMA, .sblk = &dpu_dma_sblk, .xin_id = 15, .type = SSPP_TYPE_DMA, From patchwork Fri Apr 25 19:49:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 884557 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.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 71B43225A24 for ; Fri, 25 Apr 2025 19:49:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745610565; cv=none; b=DV+DEdRI+okc8gl9NH8Bpw/yQh4veM20sTsD19KyNI2YlK36dltsbQPTKmlUGAhPUUxZuVLi/TM7PWSB1wt93036PcvghGWcR0DIzI3r3JOqwjMaTzWiUMeIkN3pUQ2ileMYEq0DiLbe7DPs20yrxbIGXfriIGN/N+bGBVJHYVM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745610565; c=relaxed/simple; bh=1loLluJcFaY5xVnH/p98zVeeY8liQ4RALe2o40wjB4Q=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nt5BXbdvvhZQXft5CWppvJidVy3aNT8KLXKkZztuvJkQUBUM/5LhnhZMT+aX5EwM9uDIDzfle3WwPNVm/5UaObcTnglE1sYsuRuMcdgimvchhxtxY3AWzOtBJWW6ynpX7qgQXE5EY6DGQIzQXAH6nYGzBceu9jb1j/8Z5mx++N4= 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=KYZXhBcP; arc=none smtp.client-ip=205.220.168.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="KYZXhBcP" Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53PGJuIB001348 for ; Fri, 25 Apr 2025 19:49:22 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= 5a4Tu/1E9y/AMugtDgzJWORXKDUHZrIzgXNk4yTd8xA=; b=KYZXhBcPqgXRzCMH lTbOySjfrUBCxuiIu808dMdXl1Df4L6Tg/aNdpNJ39n0Ig0bnbdTFaG0qLrppN9a zQnAtGG0zn5qdu1LTpMxBFzyAjd7K8tZzf/n6LjXDVgOnqjyGMb8e65rlb7MBgCV 6r9e+ZtAxfni51DhEKPe5GGCrkMkfIG9x1k/EzVxIx1+0z4YkHo3JQjhcLyE8xLX 3pphdawxnWiNa5QRGryTX70cnnjka9tiORSk0QhA8PDugDHBa2QK5Pa0v38yzLqv /cpnRVbMmXjuA48gU6BaLi2JNPI0JOI26bx8KYf75edmoTA5XAUn+iVfNJZUJ+Sz BWWAKg== 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 466jh3j5sm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 25 Apr 2025 19:49:22 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-7c5c77aff78so741921085a.0 for ; Fri, 25 Apr 2025 12:49:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745610561; x=1746215361; 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=5a4Tu/1E9y/AMugtDgzJWORXKDUHZrIzgXNk4yTd8xA=; b=j+OhcY+JGec10bTfPiqXuHI17cJGlowSW/kEQhVAG/OaoHZqr6phP4nt2HhzDTxsm+ yVkY/XSyGnooBkEGow4pGKaw4Lc1WpJIrJOxgs5ZP/n9SZO8taJtKB1hRcIvSU0lxoHi e4EzQSf+xAIj3KPBFTZ8Ru3C9Wr2U3CweHsl7AQnzXXN+SrYd1O8W517EksMPV4WWqAA eqnhKh0XccKnBLp+lD6ZR+Tiv5YdoDnmQV3/myB0CtNHg52co8FExLRVYgp2CWdyNqih iBNxqh0yaHdCmf/9RMVjq9PVXIsYrPwdvolop4cLkX7YPW19rKl0UuNV89tlUuMQLozq f11A== X-Gm-Message-State: AOJu0YysdXr5HaKRnELnIrW4dC9HND2S39oYAYLHtz4y42RRVUvToSU+ Om9LH6mWaUY9ypiylgQOjJWMzDYmvOYFyrxrcj4IhNjgEGTiOVixRsTHbGECV11XQbBLaiIJ3Su UxZz0Se8aI/pMA2AEB77IEzs7M28hf7WoGGqJgtWX8F+fzcu65dp9r0SwaBYtX5uE X-Gm-Gg: ASbGncvjJ73VtOKf7eBxGaJxiPkGeygbMQ+rfM4R+H5lzUO5FzhrkSsIgL63lq94zGh s5mduI4cxUdNOPZfAtI1boBjoSM84oIGxmyawHPVfYnraeNABBQMcIlXyn1tccFs1ftGFgLJPaA Vn3ZrsK5c6m1TFD9WBaLqUuhx32MVzPrOshT7w6CGZFaCrg7NBaJu1SNkScospfsttBm0/xNwth t8rut0B2Un2ypMfCXI3kiLrt8P4Jcgb0hEMq8wLvk1pa6Y8LqKsrpBKGgR7SFSDcQsy31juViw0 Q0TpV3PAoGGg0Y8QRnDzhOSU0x46UzvtYH91ZcmgNO8xbhyuZakshRzartFUhNtiT6C+PMgoRpj Q6lHXTY55mxlTH66TF4AzFTQv X-Received: by 2002:a05:620a:25c8:b0:7c5:4c6d:7fa5 with SMTP id af79cd13be357-7c9668cd867mr122695085a.48.1745610560934; Fri, 25 Apr 2025 12:49:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEg49BORTw1YQtPiSWF9NWVVu6nzuLs4mUwjo+GPlaRuPFDmc9+JjXZEsEP3ZQTI6hbyUQGyQ== X-Received: by 2002:a05:620a:25c8:b0:7c5:4c6d:7fa5 with SMTP id af79cd13be357-7c9668cd867mr122691885a.48.1745610560546; Fri, 25 Apr 2025 12:49:20 -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-54e7cb258b7sm725313e87.22.2025.04.25.12.49.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Apr 2025 12:49:19 -0700 (PDT) From: Dmitry Baryshkov Date: Fri, 25 Apr 2025 22:49:12 +0300 Subject: [PATCH v2 5/5] drm/msm/dpu: rename non-SmartDMA feature masks to be more explicit Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250425-dpu-rework-vig-masks-v2-5-c71900687d08@oss.qualcomm.com> References: <20250425-dpu-rework-vig-masks-v2-0-c71900687d08@oss.qualcomm.com> In-Reply-To: <20250425-dpu-rework-vig-masks-v2-0-c71900687d08@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Konrad Dybcio Cc: 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=11698; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=XRKi7EgQ00ItUBDoE7NN0/mscfyycbJkF95BVyCbUY4=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoC+c23+YZAWFYcxsNyRRupsFgfhvnpHKZ3LWVF PcxzyPdchOJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaAvnNgAKCRCLPIo+Aiko 1QfEB/9AwqMgymHujrhYs7naYVouGOqaMUQlAZIE2NnknohMUA/eD44VNxQUWVVFtZ/rfFCj2Wr OEXaNeyAJi8ghLIuVufs29OfZyxo4kwi3dMN0QFnJcKI4EuIA+A14melFYLcNDb7N5d12zmm1oQ cx5HoX/ahnK8YyBTojD3A+CWVuzMBPQ3O00UpfbgjYhjkPeI+g1fNTnmnL3Tp104UJE7ZrszGEy EuxYBi5X+c5o4S/YNUTb4KwYkMLyyD1GRXGyBm+ZMxU1DDDuout79hwA4srYYPLKW4l2eqelYkT i62jutuYh2OR6INXGg7rcWtUX/s8EqLsp+t4AwNkBRhkuX4D X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI1MDE0MSBTYWx0ZWRfX/0TbKHW14dxG kznyb7S7lBzQt1erUqm7VPWu1Zd0hZWScEJ+sPBXArlhq/mWAViTatm/e05G0sXfK+EIfh5Cr7u PkJkZWqsfx5noPAHDzow1lqA05xXMuA8XpzN1WmvIx84+7hwzlBfn8QRShItUJhLPA/fIjSR5b8 U2Lx+MgqsqYo7Egb3vQkurjZpkp6ArMgo0UdRZ+wYUbQ7yFlxWPp1vZUZx50EEqVpgvn0Wg5MBk PTXl6IpWvQa6AykEpABNy6q0U7RF8Z3Dpv4Ecp9IfNBbBNgYCNv1QoNzidu6s2/Pcxv2l6gYH/R ngrw64P/se6Ft1A3xBi5S/FYEjcnAYPct8B8S8G7l1B0vHA6dfi7gjVGpS1eWNIbc0O5hYL9Qd/ PU6U02aRYyzUvZ/czLUry5h1Ed39XoNRp7EPSre1HIVp992Vt15ePnEvtlvQBnMt8Gr14Zu7 X-Authority-Analysis: v=2.4 cv=bs1MBFai c=1 sm=1 tr=0 ts=680be742 cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=KKAkSRfTAAAA:8 a=a0m6xc9GvvHJpfDRXh8A:9 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: 2ddcjGph_CX7O5Tv3S7rAr9yJHYt-023 X-Proofpoint-GUID: 2ddcjGph_CX7O5Tv3S7rAr9yJHYt-023 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-04-25_06,2025-04-24_02,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 priorityscore=1501 suspectscore=0 mlxlogscore=608 mlxscore=0 phishscore=0 lowpriorityscore=0 bulkscore=0 spamscore=0 impostorscore=0 malwarescore=0 clxscore=1015 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504250141 From: Dmitry Baryshkov It is easy to skip or ignore the fact that the default SSPP feature masks for SDM845+ don't include the SmartDMA bit (both during development and during the review stage). Rename SSPP feature masks to make it more explicit that using non-SmartDMA masks should not be an exception rather than the rule. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h | 10 +++++----- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h | 6 +++--- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h | 8 ++++---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h | 4 ++-- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h | 8 ++++---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h | 2 +- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h | 4 ++-- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 16 ++++++++-------- 8 files changed, 29 insertions(+), 29 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h index 83db11339b29dc6e11010bfc73f112f93cf6f7c6..9e3e0ab8f3ce9d63b00a5f5c590429a53bd36d63 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h @@ -72,7 +72,7 @@ static const struct dpu_sspp_cfg sm7150_sspp[] = { { .name = "sspp_0", .id = SSPP_VIG0, .base = 0x4000, .len = 0x1f0, - .features = VIG_SDM845_MASK, + .features = VIG_SDM845_MASK_NO_SDMA, .sblk = &dpu_vig_sblk_qseed3_2_4, .xin_id = 0, .type = SSPP_TYPE_VIG, @@ -80,7 +80,7 @@ static const struct dpu_sspp_cfg sm7150_sspp[] = { }, { .name = "sspp_1", .id = SSPP_VIG1, .base = 0x6000, .len = 0x1f0, - .features = VIG_SDM845_MASK, + .features = VIG_SDM845_MASK_NO_SDMA, .sblk = &dpu_vig_sblk_qseed3_2_4, .xin_id = 4, .type = SSPP_TYPE_VIG, @@ -88,7 +88,7 @@ static const struct dpu_sspp_cfg sm7150_sspp[] = { }, { .name = "sspp_2", .id = SSPP_DMA0, .base = 0x24000, .len = 0x1f0, - .features = DMA_SDM845_MASK, + .features = DMA_SDM845_MASK_NO_SDMA, .sblk = &dpu_dma_sblk, .xin_id = 1, .type = SSPP_TYPE_DMA, @@ -96,7 +96,7 @@ static const struct dpu_sspp_cfg sm7150_sspp[] = { }, { .name = "sspp_9", .id = SSPP_DMA1, .base = 0x26000, .len = 0x1f0, - .features = DMA_SDM845_MASK, + .features = DMA_SDM845_MASK_NO_SDMA, .sblk = &dpu_dma_sblk, .xin_id = 5, .type = SSPP_TYPE_DMA, @@ -104,7 +104,7 @@ static const struct dpu_sspp_cfg sm7150_sspp[] = { }, { .name = "sspp_10", .id = SSPP_DMA2, .base = 0x28000, .len = 0x1f0, - .features = DMA_CURSOR_SDM845_MASK, + .features = DMA_CURSOR_SDM845_MASK_NO_SDMA, .sblk = &dpu_dma_sblk, .xin_id = 9, .type = SSPP_TYPE_DMA, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h index d3d3a34d0b45de08a33436f46a197cc836cf2629..fcfb3774f7a18d8e01546a3ac72aa29f7b750443 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h @@ -69,7 +69,7 @@ static const struct dpu_sspp_cfg sm6125_sspp[] = { { .name = "sspp_0", .id = SSPP_VIG0, .base = 0x4000, .len = 0x1f0, - .features = VIG_SDM845_MASK, + .features = VIG_SDM845_MASK_NO_SDMA, .sblk = &dpu_vig_sblk_qseed3_2_4, .xin_id = 0, .type = SSPP_TYPE_VIG, @@ -77,7 +77,7 @@ static const struct dpu_sspp_cfg sm6125_sspp[] = { }, { .name = "sspp_8", .id = SSPP_DMA0, .base = 0x24000, .len = 0x1f0, - .features = DMA_SDM845_MASK, + .features = DMA_SDM845_MASK_NO_SDMA, .sblk = &dpu_dma_sblk, .xin_id = 1, .type = SSPP_TYPE_DMA, @@ -85,7 +85,7 @@ static const struct dpu_sspp_cfg sm6125_sspp[] = { }, { .name = "sspp_9", .id = SSPP_DMA1, .base = 0x26000, .len = 0x1f0, - .features = DMA_SDM845_MASK, + .features = DMA_SDM845_MASK_NO_SDMA, .sblk = &dpu_dma_sblk, .xin_id = 5, .type = SSPP_TYPE_DMA, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h index 040c94c0bb66ef5aaab2808f6f5ee04dd53e2540..842fcc5887fef15789fbc686fe2156b6b509b45c 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h @@ -51,7 +51,7 @@ static const struct dpu_sspp_cfg sc7180_sspp[] = { { .name = "sspp_0", .id = SSPP_VIG0, .base = 0x4000, .len = 0x1f8, - .features = VIG_SDM845_MASK, + .features = VIG_SDM845_MASK_NO_SDMA, .sblk = &dpu_vig_sblk_qseed3_3_0, .xin_id = 0, .type = SSPP_TYPE_VIG, @@ -59,7 +59,7 @@ static const struct dpu_sspp_cfg sc7180_sspp[] = { }, { .name = "sspp_8", .id = SSPP_DMA0, .base = 0x24000, .len = 0x1f8, - .features = DMA_SDM845_MASK, + .features = DMA_SDM845_MASK_NO_SDMA, .sblk = &dpu_dma_sblk, .xin_id = 1, .type = SSPP_TYPE_DMA, @@ -67,7 +67,7 @@ static const struct dpu_sspp_cfg sc7180_sspp[] = { }, { .name = "sspp_9", .id = SSPP_DMA1, .base = 0x26000, .len = 0x1f8, - .features = DMA_CURSOR_SDM845_MASK, + .features = DMA_CURSOR_SDM845_MASK_NO_SDMA, .sblk = &dpu_dma_sblk, .xin_id = 5, .type = SSPP_TYPE_DMA, @@ -75,7 +75,7 @@ static const struct dpu_sspp_cfg sc7180_sspp[] = { }, { .name = "sspp_10", .id = SSPP_DMA2, .base = 0x28000, .len = 0x1f8, - .features = DMA_CURSOR_SDM845_MASK, + .features = DMA_CURSOR_SDM845_MASK_NO_SDMA, .sblk = &dpu_dma_sblk, .xin_id = 9, .type = SSPP_TYPE_DMA, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h index 43f64a005f5a89e09ee9506a12cfff781530cb80..c5fd89dd7c89046bdbf1b1bf223aac2e3c4c0b26 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h @@ -38,7 +38,7 @@ static const struct dpu_sspp_cfg sm6115_sspp[] = { { .name = "sspp_0", .id = SSPP_VIG0, .base = 0x4000, .len = 0x1f8, - .features = VIG_SDM845_MASK, + .features = VIG_SDM845_MASK_NO_SDMA, .sblk = &dpu_vig_sblk_qseed3_3_0, .xin_id = 0, .type = SSPP_TYPE_VIG, @@ -46,7 +46,7 @@ static const struct dpu_sspp_cfg sm6115_sspp[] = { }, { .name = "sspp_8", .id = SSPP_DMA0, .base = 0x24000, .len = 0x1f8, - .features = DMA_SDM845_MASK, + .features = DMA_SDM845_MASK_NO_SDMA, .sblk = &dpu_dma_sblk, .xin_id = 1, .type = SSPP_TYPE_DMA, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h index 397278ba999b24722b116e73b008b2d0aec5fcb5..a234bb289d247d065b336564faea8dc35b00def9 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h @@ -59,7 +59,7 @@ static const struct dpu_sspp_cfg sm6350_sspp[] = { { .name = "sspp_0", .id = SSPP_VIG0, .base = 0x4000, .len = 0x1f8, - .features = VIG_SDM845_MASK, + .features = VIG_SDM845_MASK_NO_SDMA, .sblk = &dpu_vig_sblk_qseed3_3_0, .xin_id = 0, .type = SSPP_TYPE_VIG, @@ -67,7 +67,7 @@ static const struct dpu_sspp_cfg sm6350_sspp[] = { }, { .name = "sspp_8", .id = SSPP_DMA0, .base = 0x24000, .len = 0x1f8, - .features = DMA_SDM845_MASK, + .features = DMA_SDM845_MASK_NO_SDMA, .sblk = &dpu_dma_sblk, .xin_id = 1, .type = SSPP_TYPE_DMA, @@ -75,7 +75,7 @@ static const struct dpu_sspp_cfg sm6350_sspp[] = { }, { .name = "sspp_9", .id = SSPP_DMA1, .base = 0x26000, .len = 0x1f8, - .features = DMA_CURSOR_SDM845_MASK, + .features = DMA_CURSOR_SDM845_MASK_NO_SDMA, .sblk = &dpu_dma_sblk, .xin_id = 5, .type = SSPP_TYPE_DMA, @@ -83,7 +83,7 @@ static const struct dpu_sspp_cfg sm6350_sspp[] = { }, { .name = "sspp_10", .id = SSPP_DMA2, .base = 0x28000, .len = 0x1f8, - .features = DMA_CURSOR_SDM845_MASK, + .features = DMA_CURSOR_SDM845_MASK_NO_SDMA, .sblk = &dpu_dma_sblk, .xin_id = 9, .type = SSPP_TYPE_DMA, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h index 3cbb2fe8aba24c7b9db6bb61ff4c48f34db48bf4..53f3be28f6f61bb7e3f519b0efa4cb2f68d38810 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h @@ -46,7 +46,7 @@ static const struct dpu_sspp_cfg qcm2290_sspp[] = { }, { .name = "sspp_8", .id = SSPP_DMA0, .base = 0x24000, .len = 0x1f8, - .features = DMA_SDM845_MASK, + .features = DMA_SDM845_MASK_NO_SDMA, .sblk = &dpu_dma_sblk, .xin_id = 1, .type = SSPP_TYPE_DMA, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h index a06c8634d2d7779f7e867fb821f8d332652ba7e9..3a3bc8e429be0ba86185741b6b27d8a62489779f 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h @@ -39,7 +39,7 @@ static const struct dpu_sspp_cfg sm6375_sspp[] = { { .name = "sspp_0", .id = SSPP_VIG0, .base = 0x4000, .len = 0x1f8, - .features = VIG_SDM845_MASK, + .features = VIG_SDM845_MASK_NO_SDMA, .sblk = &dpu_vig_sblk_qseed3_3_0, .xin_id = 0, .type = SSPP_TYPE_VIG, @@ -47,7 +47,7 @@ static const struct dpu_sspp_cfg sm6375_sspp[] = { }, { .name = "sspp_8", .id = SSPP_DMA0, .base = 0x24000, .len = 0x1f8, - .features = DMA_SDM845_MASK, + .features = DMA_SDM845_MASK_NO_SDMA, .sblk = &dpu_dma_sblk, .xin_id = 1, .type = SSPP_TYPE_DMA, 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 64265ca4656a04d8c5a1d9582d7124c7eb897099..323b0db1f32b4057999f5f9ffcc557c68b0e807a 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -34,11 +34,11 @@ #define VIG_MSM8998_MASK \ (VIG_MASK | BIT(DPU_SSPP_SCALER_QSEED3_COMPATIBLE)) -#define VIG_SDM845_MASK \ +#define VIG_SDM845_MASK_NO_SDMA \ (VIG_MASK | BIT(DPU_SSPP_QOS_8LVL) | BIT(DPU_SSPP_SCALER_QSEED3_COMPATIBLE)) #define VIG_SDM845_MASK_SDMA \ - (VIG_SDM845_MASK | BIT(DPU_SSPP_SMART_DMA_V2)) + (VIG_SDM845_MASK_NO_SDMA | BIT(DPU_SSPP_SMART_DMA_V2)) #define VIG_QCM2290_MASK (VIG_BASE_MASK | BIT(DPU_SSPP_QOS_8LVL)) @@ -54,24 +54,24 @@ BIT(DPU_SSPP_CDP) | BIT(DPU_SSPP_EXCL_RECT)) #define VIG_SC7280_MASK \ - (VIG_SDM845_MASK | BIT(DPU_SSPP_INLINE_ROTATION)) + (VIG_SDM845_MASK_NO_SDMA | BIT(DPU_SSPP_INLINE_ROTATION)) #define VIG_SC7280_MASK_SDMA \ (VIG_SC7280_MASK | BIT(DPU_SSPP_SMART_DMA_V2)) -#define DMA_SDM845_MASK \ +#define DMA_SDM845_MASK_NO_SDMA \ (BIT(DPU_SSPP_QOS) | BIT(DPU_SSPP_QOS_8LVL) |\ BIT(DPU_SSPP_TS_PREFILL) | BIT(DPU_SSPP_TS_PREFILL_REC1) |\ BIT(DPU_SSPP_CDP) | BIT(DPU_SSPP_EXCL_RECT)) -#define DMA_CURSOR_SDM845_MASK \ - (DMA_SDM845_MASK | BIT(DPU_SSPP_CURSOR)) +#define DMA_CURSOR_SDM845_MASK_NO_SDMA \ + (DMA_SDM845_MASK_NO_SDMA | BIT(DPU_SSPP_CURSOR)) #define DMA_SDM845_MASK_SDMA \ - (DMA_SDM845_MASK | BIT(DPU_SSPP_SMART_DMA_V2)) + (DMA_SDM845_MASK_NO_SDMA | BIT(DPU_SSPP_SMART_DMA_V2)) #define DMA_CURSOR_SDM845_MASK_SDMA \ - (DMA_CURSOR_SDM845_MASK | BIT(DPU_SSPP_SMART_DMA_V2)) + (DMA_CURSOR_SDM845_MASK_NO_SDMA | BIT(DPU_SSPP_SMART_DMA_V2)) #define DMA_CURSOR_MSM8996_MASK \ (DMA_MSM8996_MASK | BIT(DPU_SSPP_CURSOR))