From nobody Wed Dec 17 21:29:43 2025 Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EAC9B2594AE for ; Fri, 20 Dec 2024 01:28:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734658119; cv=none; b=cYKbdnpd1zh+A/Ux/FHTtWk94ggGEdSlNtLB/CCXtYLJ0j6W9V5U8JStN75etp2oUeQgipJoNUPrcsdr5jYIO7J+bYhi7tRhhfZ2J87pVNpgzRfdq2MrrZYt401LdfAzBpXgvvTm6PxSdK8QQDGyNxEs/eMKmf0CUWienVRyT3A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734658119; c=relaxed/simple; bh=8xOZo6SIWZxsw847lHaBi8XDboA4fhIU/Ie9tsdlCGA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KmGzPiVycGTEucmzDM3IEl3++gp9LlufIq2hLk5iTumgKdkP0/oSCL6sgb7NAFhsP5IQK1dRoQbkluOgyzqmpvWtYuwOnzOvOsU1Hm++tAbokMC0Tf07EaugS7NAzm6wW0A3bqfnfbcm24v041vXnwmelFf3a2a18rmQOyfxlow= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=cWa2njMI; arc=none smtp.client-ip=209.85.167.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="cWa2njMI" Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-5401fb9fa03so1413678e87.1 for ; Thu, 19 Dec 2024 17:28:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1734658115; x=1735262915; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=7bHjE0IB/vPqzg640QI5Oh3Go2fZYjsbzOVZvfoGOak=; b=cWa2njMI4AwzqIxC3vnJlCZlK7QeWDuIsYlgwi0pe9+Dq18XBxt69o6fYGSWXNtlC8 quVvOrhUQfofflXPLffGI+eabKfxviux6irTMcCutheO5NggcBuOnRvX36yp47cbB6VX GJYjm7NFHNPqvmFtYxc/aiqYwaIRvuQRiYLtCLRMSyB5e0JXb6f3Z3U6z+sqAbV0+sfO AAkxKO6gF36A0FTGzZumExz2l9Nm33SyWzoP/kHADvCzRfC2aMlgxxXjsnxzEezaY+aH TV5Zc+7suhxdIT0wB/905QAASEJgswzZwfwV1uf3J5TRciVhgfAn9jD6EkiKlDmMONgp jyxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734658115; x=1735262915; 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=7bHjE0IB/vPqzg640QI5Oh3Go2fZYjsbzOVZvfoGOak=; b=TnjBy9bB5yGTXv5Kpx6eQwSsDuoPYvLiahP/S+RbRlJ1ODgJW/8mBOwNqObiySaYSQ dwSqAbRPZaqB4R+6MKeSRwFGy9FsirAa1JNEJGTWBRaS1tkvLAOK94kxHo1ZIKr+1tnX 5DzL/RO11FhB8xHEiANuVMkPA/d+Nif5qwSPXcR7CYywpH/G/hfq+95hXA3tdUkJKAIl lL80TS4Q4W141uvQHQq1Xg+sWoiLSw+CDWColIaQj/IbcfuCtL3Q0fQg0eG854u8m+ws /5O3jJWmJIFB2NWlWtrJuAbLERPm4cRv02w+SlJDWt1c1FM/W46tcj6ViD4SQBIGC3+o jPUQ== X-Forwarded-Encrypted: i=1; AJvYcCX3zI+XtRbj2YkaUObbajGafee6O7dnZjbRbMntsLLL1c16CpCq/vVpo840HqBrgWZ8eM/B3ddYbpjUtbU=@vger.kernel.org X-Gm-Message-State: AOJu0YzG2UTLwGM/+oCXuQBQNNXzi+3CfaWxZvkFHODXj3TCYMRQL+cP azqhnJzYzxyuTfxq6AWCuImoQnVXpV1DJANo14xc+Z/pdEddE1CT0yUpz3DndOs= X-Gm-Gg: ASbGnctZLDi1Wwzjgv4eb52TO8zlHfR772WQShNeKtqQ5x0vz91ibcmDBrGG/+mPZtL RGGzbmISldPA4FMFczeh3Qi2Qwlm8ny+Jm40U2uvUT90Xpz/QBY77MBjRGLWyefGdEaWpmfeMP4 9Fnyq/wzVdhfiikxtPXD1u7idyEah9qPeTGvzxcgVBv5CfaGpKEtBgq4yDSCaRnzkGTy4hfTKhY dSFGMU/gXv27iaiemIsCQ8xXI6oYcI8ku2ebs6MDzIJhaIpIDWedYbrwHeAaB0s X-Google-Smtp-Source: AGHT+IFkoQ1wDgLQWAyIiR/AcniX2onayOceXrfk5sMzc7gbQE21NuoTAbl5Sm7gK6XKGLR3lUJqKg== X-Received: by 2002:a05:6512:401b:b0:540:2247:ac4e with SMTP id 2adb3069b0e04-542212e1035mr1554510e87.7.1734658114788; Thu, 19 Dec 2024 17:28:34 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-54227a89c2csm170540e87.71.2024.12.19.17.28.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2024 17:28:34 -0800 (PST) From: Dmitry Baryshkov Date: Fri, 20 Dec 2024 03:28:29 +0200 Subject: [PATCH v2 1/8] drm/msm/dpu: provide DSPP and correct LM config for SDM670 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20241220-dpu-fix-catalog-v2-1-38fa961ea992@linaro.org> References: <20241220-dpu-fix-catalog-v2-0-38fa961ea992@linaro.org> In-Reply-To: <20241220-dpu-fix-catalog-v2-0-38fa961ea992@linaro.org> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Robert Foss , Neil Armstrong , Abel Vesa , Richard Acayan Cc: Rob Clark , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Johan Hovold X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2719; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=8xOZo6SIWZxsw847lHaBi8XDboA4fhIU/Ie9tsdlCGA=; b=owGbwMvMwMXYbdNlx6SpcZXxtFoSQ3rKCbumdReXcE032tvX8uVtkUq/Z2LV+d0SUiebi6Ndt m7iKJbqZDRmYWDkYpAVU2TxKWiZGrMpOezDjqn1MINYmUCmMHBxCsBEPudxMKycxy78X35p3YJn SvLzV++eevbUwSP9647Uss0yfqXNsmPyhwdafeG2B+yaGHyYRSSMjRXLrqi/1wqU/i1ZqS3AHh5 kH76Nm1P6Z+z/eI64ZQ+u997bPGt2rtkE7pd2oofu5GcHOVt8sVA9JsXrviqvzqp0fwCnTsrzxX PzU6oW3LVJF9nUHGIRb9VTLpUVJKAdbn/J63rnt/iSE2Uxa6Tr94SeOnJJZm5SvZ1RltjEQ61Pe N7PSz35y6DthOZ23Xm/T/yKiFlYkK0494n26+SZivk/6t+xsAmyW8RN9T+hWZ5vd/7bi4mTXG6I 9Wnoqd8wm250y0tXSW/NF6e9mX/TPlhJiVW8dpTV4PIEAA== X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A On SDM670 the DPU has two DSPP blocks compared to 4 DSPP blocks on SDM845. Currently SDM670 just reuses LMs and DSPPs from SDM845. Define platform-specific configuration for those blocks. Fixes: e140b7e496b7 ("drm/msm/dpu: Add hw revision 4.1 (SDM670)") Reviewed-by: Abhinav Kumar Signed-off-by: Dmitry Baryshkov --- .../gpu/drm/msm/disp/dpu1/catalog/dpu_4_1_sdm670.h | 54 ++++++++++++++++++= +++- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_1_sdm670.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_4_1_sdm670.h index cbbdaebe357ec4a82a3c3d950aa13792a1fb2d6e..daef07924886a529ee30349ae80= 375a324bbc245 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_1_sdm670.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_1_sdm670.h @@ -65,6 +65,54 @@ static const struct dpu_sspp_cfg sdm670_sspp[] =3D { }, }; =20 +static const struct dpu_lm_cfg sdm670_lm[] =3D { + { + .name =3D "lm_0", .id =3D LM_0, + .base =3D 0x44000, .len =3D 0x320, + .features =3D MIXER_SDM845_MASK, + .sblk =3D &sdm845_lm_sblk, + .lm_pair =3D LM_1, + .pingpong =3D PINGPONG_0, + .dspp =3D DSPP_0, + }, { + .name =3D "lm_1", .id =3D LM_1, + .base =3D 0x45000, .len =3D 0x320, + .features =3D MIXER_SDM845_MASK, + .sblk =3D &sdm845_lm_sblk, + .lm_pair =3D LM_0, + .pingpong =3D PINGPONG_1, + .dspp =3D DSPP_1, + }, { + .name =3D "lm_2", .id =3D LM_2, + .base =3D 0x46000, .len =3D 0x320, + .features =3D MIXER_SDM845_MASK, + .sblk =3D &sdm845_lm_sblk, + .lm_pair =3D LM_5, + .pingpong =3D PINGPONG_2, + }, { + .name =3D "lm_5", .id =3D LM_5, + .base =3D 0x49000, .len =3D 0x320, + .features =3D MIXER_SDM845_MASK, + .sblk =3D &sdm845_lm_sblk, + .lm_pair =3D LM_2, + .pingpong =3D PINGPONG_3, + }, +}; + +static const struct dpu_dspp_cfg sdm670_dspp[] =3D { + { + .name =3D "dspp_0", .id =3D DSPP_0, + .base =3D 0x54000, .len =3D 0x1800, + .features =3D DSPP_SC7180_MASK, + .sblk =3D &sdm845_dspp_sblk, + }, { + .name =3D "dspp_1", .id =3D DSPP_1, + .base =3D 0x56000, .len =3D 0x1800, + .features =3D DSPP_SC7180_MASK, + .sblk =3D &sdm845_dspp_sblk, + }, +}; + static const struct dpu_dsc_cfg sdm670_dsc[] =3D { { .name =3D "dsc_0", .id =3D DSC_0, @@ -88,8 +136,10 @@ const struct dpu_mdss_cfg dpu_sdm670_cfg =3D { .ctl =3D sdm845_ctl, .sspp_count =3D ARRAY_SIZE(sdm670_sspp), .sspp =3D sdm670_sspp, - .mixer_count =3D ARRAY_SIZE(sdm845_lm), - .mixer =3D sdm845_lm, + .mixer_count =3D ARRAY_SIZE(sdm670_lm), + .mixer =3D sdm670_lm, + .dspp_count =3D ARRAY_SIZE(sdm670_dspp), + .dspp =3D sdm670_dspp, .pingpong_count =3D ARRAY_SIZE(sdm845_pp), .pingpong =3D sdm845_pp, .dsc_count =3D ARRAY_SIZE(sdm670_dsc), --=20 2.39.5