mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH 0/3] drm/msm/dpu: catalog fixes for SDM845 / MSM8998
@ 2024-09-05  3:26 Dmitry Baryshkov
  2024-09-05  3:26 ` [PATCH 1/3] drm/msm/dpu: on SDM845 move DSPP_3 to LM_5 block Dmitry Baryshkov
                   ` (3 more replies)
  0 siblings, 4 replies; 8+ messages in thread
From: Dmitry Baryshkov @ 2024-09-05  3:26 UTC (permalink / raw)
  To: Rob Clark, Abhinav Kumar, Sean Paul, Marijn Suijten,
	David Airlie, Daniel Vetter, Sumit Semwal, Sravanthi Kollukuduru,
	Rajesh Yadav, Archit Taneja, Jami Kettunen,
	AngeloGioacchino Del Regno
  Cc: linux-arm-msm, dri-devel, freedreno, linux-kernel,
	Jeykumar Sankaran, Chandan Uddaraju

Drop two extra blocks that sneaked into SDM845 and MSM8998 catalog
declarations.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
Dmitry Baryshkov (3):
      drm/msm/dpu: on SDM845 move DSPP_3 to LM_5 block
      drm/msm/dpu: drop LM_3 / LM_4 on SDM845
      drm/msm/dpu: drop LM_3 / LM_4 on MSM8998

 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 12 ------------
 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h  | 14 +-------------
 2 files changed, 1 insertion(+), 25 deletions(-)
---
base-commit: 15302579373ed2c8ada629e9e7bcf9569393a48d
change-id: 20240904-dpu-fix-sdm845-catalog-287ca4b72048

Best regards,
-- 
Dmitry Baryshkov <dmitry.baryshkov@linaro.org>


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 1/3] drm/msm/dpu: on SDM845 move DSPP_3 to LM_5 block
  2024-09-05  3:26 [PATCH 0/3] drm/msm/dpu: catalog fixes for SDM845 / MSM8998 Dmitry Baryshkov
@ 2024-09-05  3:26 ` Dmitry Baryshkov
  2024-09-19 18:25   ` Abhinav Kumar
  2024-09-05  3:26 ` [PATCH 2/3] drm/msm/dpu: drop LM_3 / LM_4 on SDM845 Dmitry Baryshkov
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 8+ messages in thread
From: Dmitry Baryshkov @ 2024-09-05  3:26 UTC (permalink / raw)
  To: Rob Clark, Abhinav Kumar, Sean Paul, Marijn Suijten,
	David Airlie, Daniel Vetter, Sumit Semwal, Sravanthi Kollukuduru,
	Rajesh Yadav, Archit Taneja, Jami Kettunen,
	AngeloGioacchino Del Regno
  Cc: linux-arm-msm, dri-devel, freedreno, linux-kernel,
	Jeykumar Sankaran, Chandan Uddaraju

On the SDM845 platform the DSPP_3 is used by the LM_5. Correct
corresponding entries in the sdm845_lm array.

Fixes: c72375172194 ("drm/msm/dpu/catalog: define DSPP blocks found on sdm845")
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h
index 7a23389a5732..59eeea3dd2e9 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h
@@ -161,7 +161,6 @@ static const struct dpu_lm_cfg sdm845_lm[] = {
 		.features = MIXER_SDM845_MASK,
 		.sblk = &sdm845_lm_sblk,
 		.pingpong = PINGPONG_NONE,
-		.dspp = DSPP_3,
 	}, {
 		.name = "lm_4", .id = LM_4,
 		.base = 0x0, .len = 0x320,
@@ -175,6 +174,7 @@ static const struct dpu_lm_cfg sdm845_lm[] = {
 		.sblk = &sdm845_lm_sblk,
 		.lm_pair = LM_2,
 		.pingpong = PINGPONG_3,
+		.dspp = DSPP_3,
 	},
 };
 

-- 
2.39.2


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 2/3] drm/msm/dpu: drop LM_3 / LM_4 on SDM845
  2024-09-05  3:26 [PATCH 0/3] drm/msm/dpu: catalog fixes for SDM845 / MSM8998 Dmitry Baryshkov
  2024-09-05  3:26 ` [PATCH 1/3] drm/msm/dpu: on SDM845 move DSPP_3 to LM_5 block Dmitry Baryshkov
@ 2024-09-05  3:26 ` Dmitry Baryshkov
  2024-09-19 18:27   ` Abhinav Kumar
  2024-09-05  3:26 ` [PATCH 3/3] drm/msm/dpu: drop LM_3 / LM_4 on MSM8998 Dmitry Baryshkov
  2024-10-21 12:17 ` [PATCH 0/3] drm/msm/dpu: catalog fixes for SDM845 / MSM8998 Dmitry Baryshkov
  3 siblings, 1 reply; 8+ messages in thread
From: Dmitry Baryshkov @ 2024-09-05  3:26 UTC (permalink / raw)
  To: Rob Clark, Abhinav Kumar, Sean Paul, Marijn Suijten,
	David Airlie, Daniel Vetter, Sumit Semwal, Sravanthi Kollukuduru,
	Rajesh Yadav, Archit Taneja, Jami Kettunen,
	AngeloGioacchino Del Regno
  Cc: linux-arm-msm, dri-devel, freedreno, linux-kernel,
	Jeykumar Sankaran, Chandan Uddaraju

On the SDM845 platform ther are no LM_3 and LM_4 blocks. Drop them from
the SDM845 catalog.

Fixes: 25fdd5933e4c ("drm/msm: Add SDM845 DPU support")
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h
index 59eeea3dd2e9..72bd4f7e9e50 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h
@@ -155,18 +155,6 @@ static const struct dpu_lm_cfg sdm845_lm[] = {
 		.lm_pair = LM_5,
 		.pingpong = PINGPONG_2,
 		.dspp = DSPP_2,
-	}, {
-		.name = "lm_3", .id = LM_3,
-		.base = 0x0, .len = 0x320,
-		.features = MIXER_SDM845_MASK,
-		.sblk = &sdm845_lm_sblk,
-		.pingpong = PINGPONG_NONE,
-	}, {
-		.name = "lm_4", .id = LM_4,
-		.base = 0x0, .len = 0x320,
-		.features = MIXER_SDM845_MASK,
-		.sblk = &sdm845_lm_sblk,
-		.pingpong = PINGPONG_NONE,
 	}, {
 		.name = "lm_5", .id = LM_5,
 		.base = 0x49000, .len = 0x320,

-- 
2.39.2


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 3/3] drm/msm/dpu: drop LM_3 / LM_4 on MSM8998
  2024-09-05  3:26 [PATCH 0/3] drm/msm/dpu: catalog fixes for SDM845 / MSM8998 Dmitry Baryshkov
  2024-09-05  3:26 ` [PATCH 1/3] drm/msm/dpu: on SDM845 move DSPP_3 to LM_5 block Dmitry Baryshkov
  2024-09-05  3:26 ` [PATCH 2/3] drm/msm/dpu: drop LM_3 / LM_4 on SDM845 Dmitry Baryshkov
@ 2024-09-05  3:26 ` Dmitry Baryshkov
  2024-09-19 18:32   ` Abhinav Kumar
  2024-10-21 12:17 ` [PATCH 0/3] drm/msm/dpu: catalog fixes for SDM845 / MSM8998 Dmitry Baryshkov
  3 siblings, 1 reply; 8+ messages in thread
From: Dmitry Baryshkov @ 2024-09-05  3:26 UTC (permalink / raw)
  To: Rob Clark, Abhinav Kumar, Sean Paul, Marijn Suijten,
	David Airlie, Daniel Vetter, Sumit Semwal, Sravanthi Kollukuduru,
	Rajesh Yadav, Archit Taneja, Jami Kettunen,
	AngeloGioacchino Del Regno
  Cc: linux-arm-msm, dri-devel, freedreno, linux-kernel,
	Jeykumar Sankaran, Chandan Uddaraju

On the MSM8998 platform ther are no LM_3 and LM_4 blocks. Drop them from
the MSM8998 catalog.

Fixes: 94391a14fc27 ("drm/msm/dpu1: Add MSM8998 to hw catalog")
Reported-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 12 ------------
 1 file changed, 12 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 1d3e9666c741..64c94e919a69 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
@@ -156,18 +156,6 @@ static const struct dpu_lm_cfg msm8998_lm[] = {
 		.sblk = &msm8998_lm_sblk,
 		.lm_pair = LM_5,
 		.pingpong = PINGPONG_2,
-	}, {
-		.name = "lm_3", .id = LM_3,
-		.base = 0x47000, .len = 0x320,
-		.features = MIXER_MSM8998_MASK,
-		.sblk = &msm8998_lm_sblk,
-		.pingpong = PINGPONG_NONE,
-	}, {
-		.name = "lm_4", .id = LM_4,
-		.base = 0x48000, .len = 0x320,
-		.features = MIXER_MSM8998_MASK,
-		.sblk = &msm8998_lm_sblk,
-		.pingpong = PINGPONG_NONE,
 	}, {
 		.name = "lm_5", .id = LM_5,
 		.base = 0x49000, .len = 0x320,

-- 
2.39.2


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 1/3] drm/msm/dpu: on SDM845 move DSPP_3 to LM_5 block
  2024-09-05  3:26 ` [PATCH 1/3] drm/msm/dpu: on SDM845 move DSPP_3 to LM_5 block Dmitry Baryshkov
@ 2024-09-19 18:25   ` Abhinav Kumar
  0 siblings, 0 replies; 8+ messages in thread
From: Abhinav Kumar @ 2024-09-19 18:25 UTC (permalink / raw)
  To: Dmitry Baryshkov, Rob Clark, Sean Paul, Marijn Suijten,
	David Airlie, Daniel Vetter, Sumit Semwal, Sravanthi Kollukuduru,
	Rajesh Yadav, Archit Taneja, Jami Kettunen,
	AngeloGioacchino Del Regno
  Cc: linux-arm-msm, dri-devel, freedreno, linux-kernel,
	Jeykumar Sankaran, Chandan Uddaraju



On 9/4/2024 8:26 PM, Dmitry Baryshkov wrote:
> On the SDM845 platform the DSPP_3 is used by the LM_5. Correct
> corresponding entries in the sdm845_lm array.
> 
> Fixes: c72375172194 ("drm/msm/dpu/catalog: define DSPP blocks found on sdm845")
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
>   drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 

Matches the docs I have, hence

Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 2/3] drm/msm/dpu: drop LM_3 / LM_4 on SDM845
  2024-09-05  3:26 ` [PATCH 2/3] drm/msm/dpu: drop LM_3 / LM_4 on SDM845 Dmitry Baryshkov
@ 2024-09-19 18:27   ` Abhinav Kumar
  0 siblings, 0 replies; 8+ messages in thread
From: Abhinav Kumar @ 2024-09-19 18:27 UTC (permalink / raw)
  To: Dmitry Baryshkov, Rob Clark, Sean Paul, Marijn Suijten,
	David Airlie, Daniel Vetter, Sumit Semwal, Sravanthi Kollukuduru,
	Rajesh Yadav, Archit Taneja, Jami Kettunen,
	AngeloGioacchino Del Regno
  Cc: linux-arm-msm, dri-devel, freedreno, linux-kernel,
	Jeykumar Sankaran, Chandan Uddaraju



On 9/4/2024 8:26 PM, Dmitry Baryshkov wrote:
> On the SDM845 platform ther are no LM_3 and LM_4 blocks. Drop them from
> the SDM845 catalog.
> 
> Fixes: 25fdd5933e4c ("drm/msm: Add SDM845 DPU support")
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
>   drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h | 12 ------------
>   1 file changed, 12 deletions(-)
> 

LGTM,

Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 3/3] drm/msm/dpu: drop LM_3 / LM_4 on MSM8998
  2024-09-05  3:26 ` [PATCH 3/3] drm/msm/dpu: drop LM_3 / LM_4 on MSM8998 Dmitry Baryshkov
@ 2024-09-19 18:32   ` Abhinav Kumar
  0 siblings, 0 replies; 8+ messages in thread
From: Abhinav Kumar @ 2024-09-19 18:32 UTC (permalink / raw)
  To: Dmitry Baryshkov, Rob Clark, Sean Paul, Marijn Suijten,
	David Airlie, Daniel Vetter, Sumit Semwal, Sravanthi Kollukuduru,
	Rajesh Yadav, Archit Taneja, Jami Kettunen,
	AngeloGioacchino Del Regno
  Cc: linux-arm-msm, dri-devel, freedreno, linux-kernel,
	Jeykumar Sankaran, Chandan Uddaraju



On 9/4/2024 8:26 PM, Dmitry Baryshkov wrote:
> On the MSM8998 platform ther are no LM_3 and LM_4 blocks. Drop them from
> the MSM8998 catalog.
> 
> Fixes: 94391a14fc27 ("drm/msm/dpu1: Add MSM8998 to hw catalog")
> Reported-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
>   drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 12 ------------
>   1 file changed, 12 deletions(-)
> 

LGTM

Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 0/3] drm/msm/dpu: catalog fixes for SDM845 / MSM8998
  2024-09-05  3:26 [PATCH 0/3] drm/msm/dpu: catalog fixes for SDM845 / MSM8998 Dmitry Baryshkov
                   ` (2 preceding siblings ...)
  2024-09-05  3:26 ` [PATCH 3/3] drm/msm/dpu: drop LM_3 / LM_4 on MSM8998 Dmitry Baryshkov
@ 2024-10-21 12:17 ` Dmitry Baryshkov
  3 siblings, 0 replies; 8+ messages in thread
From: Dmitry Baryshkov @ 2024-10-21 12:17 UTC (permalink / raw)
  To: Rob Clark, Abhinav Kumar, Sean Paul, Marijn Suijten,
	David Airlie, Sumit Semwal, Sravanthi Kollukuduru, Rajesh Yadav,
	Archit Taneja, Jami Kettunen, AngeloGioacchino Del Regno,
	Simona Vetter, Dmitry Baryshkov
  Cc: linux-arm-msm, dri-devel, freedreno, linux-kernel,
	Jeykumar Sankaran, Chandan Uddaraju


On Thu, 05 Sep 2024 06:26:12 +0300, Dmitry Baryshkov wrote:
> Drop two extra blocks that sneaked into SDM845 and MSM8998 catalog
> declarations.
> 
> 

Applied, thanks!

[1/3] drm/msm/dpu: on SDM845 move DSPP_3 to LM_5 block
      https://gitlab.freedesktop.org/lumag/msm/-/commit/768a272d5357
[2/3] drm/msm/dpu: drop LM_3 / LM_4 on SDM845
      https://gitlab.freedesktop.org/lumag/msm/-/commit/d39271061d67
[3/3] drm/msm/dpu: drop LM_3 / LM_4 on MSM8998
      https://gitlab.freedesktop.org/lumag/msm/-/commit/c59afe50773d

Best regards,
-- 
Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2024-10-21 12:17 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-09-05  3:26 [PATCH 0/3] drm/msm/dpu: catalog fixes for SDM845 / MSM8998 Dmitry Baryshkov
2024-09-05  3:26 ` [PATCH 1/3] drm/msm/dpu: on SDM845 move DSPP_3 to LM_5 block Dmitry Baryshkov
2024-09-19 18:25   ` Abhinav Kumar
2024-09-05  3:26 ` [PATCH 2/3] drm/msm/dpu: drop LM_3 / LM_4 on SDM845 Dmitry Baryshkov
2024-09-19 18:27   ` Abhinav Kumar
2024-09-05  3:26 ` [PATCH 3/3] drm/msm/dpu: drop LM_3 / LM_4 on MSM8998 Dmitry Baryshkov
2024-09-19 18:32   ` Abhinav Kumar
2024-10-21 12:17 ` [PATCH 0/3] drm/msm/dpu: catalog fixes for SDM845 / MSM8998 Dmitry Baryshkov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®