* [PATCH] drm/msm/dpu: fix/enable 6bpc dither with split-lm
@ 2020-07-15 22:19 Rob Clark
2020-07-19 19:55 ` Steev Klimaszewski
2020-07-20 12:53 ` [Freedreno] " kalyan_t
0 siblings, 2 replies; 5+ messages in thread
From: Rob Clark @ 2020-07-15 22:19 UTC (permalink / raw)
To: dri-devel
Cc: Rob Clark, open list:DRM DRIVER FOR MSM ADRENO GPU, Sam Ravnborg,
David Airlie, Steev Klimaszewski,
open list:DRM DRIVER FOR MSM ADRENO GPU, Doug Anderson,
Stephen Boyd, Zheng Bin, Kalyan Thota, Drew Davenport, Sean Paul,
open list
From: Rob Clark <robdclark@chromium.org>
If split-lm is used (for ex, on sdm845), we can have multiple ping-
pongs, but only a single phys encoder. We need to configure dithering
on each of them.
Signed-off-by: Rob Clark <robdclark@chromium.org>
---
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 22 ++++++++++---------
.../gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 3 +--
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
index 46df0ff75b85..9b98b63c77fb 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
@@ -212,14 +212,14 @@ static u32 dither_matrix[DITHER_MATRIX_SZ] = {
15, 7, 13, 5, 3, 11, 1, 9, 12, 4, 14, 6, 0, 8, 2, 10
};
-static void _dpu_encoder_setup_dither(struct dpu_encoder_phys *phys)
+static void _dpu_encoder_setup_dither(struct dpu_hw_pingpong *hw_pp, unsigned bpc)
{
struct dpu_hw_dither_cfg dither_cfg = { 0 };
- if (!phys->hw_pp || !phys->hw_pp->ops.setup_dither)
+ if (!hw_pp->ops.setup_dither)
return;
- switch (phys->connector->display_info.bpc) {
+ switch (bpc) {
case 6:
dither_cfg.c0_bitdepth = 6;
dither_cfg.c1_bitdepth = 6;
@@ -228,14 +228,14 @@ static void _dpu_encoder_setup_dither(struct dpu_encoder_phys *phys)
dither_cfg.temporal_en = 0;
break;
default:
- phys->hw_pp->ops.setup_dither(phys->hw_pp, NULL);
+ hw_pp->ops.setup_dither(hw_pp, NULL);
return;
}
memcpy(&dither_cfg.matrix, dither_matrix,
sizeof(u32) * DITHER_MATRIX_SZ);
- phys->hw_pp->ops.setup_dither(phys->hw_pp, &dither_cfg);
+ hw_pp->ops.setup_dither(hw_pp, &dither_cfg);
}
void dpu_encoder_helper_report_irq_timeout(struct dpu_encoder_phys *phys_enc,
@@ -1132,11 +1132,13 @@ static void _dpu_encoder_virt_enable_helper(struct drm_encoder *drm_enc)
_dpu_encoder_update_vsync_source(dpu_enc, &dpu_enc->disp_info);
- if (dpu_enc->disp_info.intf_type == DRM_MODE_ENCODER_DSI) {
- for (i = 0; i < dpu_enc->num_phys_encs; i++) {
- struct dpu_encoder_phys *phys = dpu_enc->phys_encs[i];
-
- _dpu_encoder_setup_dither(phys);
+ if (dpu_enc->disp_info.intf_type == DRM_MODE_ENCODER_DSI &&
+ !WARN_ON(dpu_enc->num_phys_encs == 0)) {
+ unsigned bpc = dpu_enc->phys_encs[0]->connector->display_info.bpc;
+ for (i = 0; i < MAX_CHANNELS_PER_ENC; i++) {
+ if (!dpu_enc->hw_pp[i])
+ continue;
+ _dpu_encoder_setup_dither(dpu_enc->hw_pp[i], bpc);
}
}
}
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c
index 7411ab6bf6af..bea4ab5c58c5 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c
@@ -231,8 +231,7 @@ static void _setup_pingpong_ops(struct dpu_hw_pingpong *c,
c->ops.poll_timeout_wr_ptr = dpu_hw_pp_poll_timeout_wr_ptr;
c->ops.get_line_count = dpu_hw_pp_get_line_count;
- if (test_bit(DPU_PINGPONG_DITHER, &features) &&
- IS_SC7180_TARGET(c->hw.hwversion))
+ if (test_bit(DPU_PINGPONG_DITHER, &features))
c->ops.setup_dither = dpu_hw_pp_setup_dither;
};
--
2.26.2
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] drm/msm/dpu: fix/enable 6bpc dither with split-lm
2020-07-15 22:19 [PATCH] drm/msm/dpu: fix/enable 6bpc dither with split-lm Rob Clark
@ 2020-07-19 19:55 ` Steev Klimaszewski
2020-07-20 12:53 ` [Freedreno] " kalyan_t
1 sibling, 0 replies; 5+ messages in thread
From: Steev Klimaszewski @ 2020-07-19 19:55 UTC (permalink / raw)
To: Rob Clark, dri-devel
Cc: Rob Clark, open list:DRM DRIVER FOR MSM ADRENO GPU, Sam Ravnborg,
David Airlie, Steev Klimaszewski,
open list:DRM DRIVER FOR MSM ADRENO GPU, Doug Anderson,
Stephen Boyd, Zheng Bin, Kalyan Thota, Drew Davenport, Sean Paul,
open list
Hi,
On 7/15/20 5:19 PM, Rob Clark wrote:
> From: Rob Clark <robdclark@chromium.org>
>
> If split-lm is used (for ex, on sdm845), we can have multiple ping-
> pongs, but only a single phys encoder. We need to configure dithering
> on each of them.
>
> Signed-off-by: Rob Clark <robdclark@chromium.org>
> ---
> drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 22 ++++++++++---------
> .../gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 3 +--
> 2 files changed, 13 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> index 46df0ff75b85..9b98b63c77fb 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> @@ -212,14 +212,14 @@ static u32 dither_matrix[DITHER_MATRIX_SZ] = {
> 15, 7, 13, 5, 3, 11, 1, 9, 12, 4, 14, 6, 0, 8, 2, 10
> };
>
> -static void _dpu_encoder_setup_dither(struct dpu_encoder_phys *phys)
> +static void _dpu_encoder_setup_dither(struct dpu_hw_pingpong *hw_pp, unsigned bpc)
> {
> struct dpu_hw_dither_cfg dither_cfg = { 0 };
>
> - if (!phys->hw_pp || !phys->hw_pp->ops.setup_dither)
> + if (!hw_pp->ops.setup_dither)
> return;
>
> - switch (phys->connector->display_info.bpc) {
> + switch (bpc) {
> case 6:
> dither_cfg.c0_bitdepth = 6;
> dither_cfg.c1_bitdepth = 6;
> @@ -228,14 +228,14 @@ static void _dpu_encoder_setup_dither(struct dpu_encoder_phys *phys)
> dither_cfg.temporal_en = 0;
> break;
> default:
> - phys->hw_pp->ops.setup_dither(phys->hw_pp, NULL);
> + hw_pp->ops.setup_dither(hw_pp, NULL);
> return;
> }
>
> memcpy(&dither_cfg.matrix, dither_matrix,
> sizeof(u32) * DITHER_MATRIX_SZ);
>
> - phys->hw_pp->ops.setup_dither(phys->hw_pp, &dither_cfg);
> + hw_pp->ops.setup_dither(hw_pp, &dither_cfg);
> }
>
> void dpu_encoder_helper_report_irq_timeout(struct dpu_encoder_phys *phys_enc,
> @@ -1132,11 +1132,13 @@ static void _dpu_encoder_virt_enable_helper(struct drm_encoder *drm_enc)
>
> _dpu_encoder_update_vsync_source(dpu_enc, &dpu_enc->disp_info);
>
> - if (dpu_enc->disp_info.intf_type == DRM_MODE_ENCODER_DSI) {
> - for (i = 0; i < dpu_enc->num_phys_encs; i++) {
> - struct dpu_encoder_phys *phys = dpu_enc->phys_encs[i];
> -
> - _dpu_encoder_setup_dither(phys);
> + if (dpu_enc->disp_info.intf_type == DRM_MODE_ENCODER_DSI &&
> + !WARN_ON(dpu_enc->num_phys_encs == 0)) {
> + unsigned bpc = dpu_enc->phys_encs[0]->connector->display_info.bpc;
> + for (i = 0; i < MAX_CHANNELS_PER_ENC; i++) {
> + if (!dpu_enc->hw_pp[i])
> + continue;
> + _dpu_encoder_setup_dither(dpu_enc->hw_pp[i], bpc);
> }
> }
> }
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c
> index 7411ab6bf6af..bea4ab5c58c5 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c
> @@ -231,8 +231,7 @@ static void _setup_pingpong_ops(struct dpu_hw_pingpong *c,
> c->ops.poll_timeout_wr_ptr = dpu_hw_pp_poll_timeout_wr_ptr;
> c->ops.get_line_count = dpu_hw_pp_get_line_count;
>
> - if (test_bit(DPU_PINGPONG_DITHER, &features) &&
> - IS_SC7180_TARGET(c->hw.hwversion))
> + if (test_bit(DPU_PINGPONG_DITHER, &features))
> c->ops.setup_dither = dpu_hw_pp_setup_dither;
> };
Sorry for taking so long to get around to testing this. I was able to
today, and it does reduce the banding to be less noticeable.
Tested-by: Steev Klimaszewski <steev@kali.org>
Thanks!
-- steev
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [Freedreno] [PATCH] drm/msm/dpu: fix/enable 6bpc dither with split-lm
2020-07-15 22:19 [PATCH] drm/msm/dpu: fix/enable 6bpc dither with split-lm Rob Clark
2020-07-19 19:55 ` Steev Klimaszewski
@ 2020-07-20 12:53 ` kalyan_t
2020-07-20 15:23 ` Rob Clark
1 sibling, 1 reply; 5+ messages in thread
From: kalyan_t @ 2020-07-20 12:53 UTC (permalink / raw)
To: Rob Clark
Cc: Rob Clark, David Airlie, open list:DRM DRIVER FOR MSM ADRENO GPU,
open list:DRM DRIVER FOR MSM ADRENO GPU, Doug Anderson,
dri-devel, Stephen Boyd, Zheng Bin, Sean Paul,
Steev Klimaszewski, Drew Davenport, Sam Ravnborg, open list
On 2020-07-16 03:49, Rob Clark wrote:
> From: Rob Clark <robdclark@chromium.org>
>
> If split-lm is used (for ex, on sdm845), we can have multiple ping-
> pongs, but only a single phys encoder. We need to configure dithering
> on each of them.
>
> Signed-off-by: Rob Clark <robdclark@chromium.org>
> ---
> drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 22 ++++++++++---------
> .../gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 3 +--
> 2 files changed, 13 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> index 46df0ff75b85..9b98b63c77fb 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> @@ -212,14 +212,14 @@ static u32 dither_matrix[DITHER_MATRIX_SZ] = {
> 15, 7, 13, 5, 3, 11, 1, 9, 12, 4, 14, 6, 0, 8, 2, 10
> };
>
> -static void _dpu_encoder_setup_dither(struct dpu_encoder_phys *phys)
> +static void _dpu_encoder_setup_dither(struct dpu_hw_pingpong *hw_pp,
> unsigned bpc)
> {
> struct dpu_hw_dither_cfg dither_cfg = { 0 };
>
> - if (!phys->hw_pp || !phys->hw_pp->ops.setup_dither)
> + if (!hw_pp->ops.setup_dither)
> return;
>
> - switch (phys->connector->display_info.bpc) {
> + switch (bpc) {
> case 6:
> dither_cfg.c0_bitdepth = 6;
> dither_cfg.c1_bitdepth = 6;
> @@ -228,14 +228,14 @@ static void _dpu_encoder_setup_dither(struct
> dpu_encoder_phys *phys)
> dither_cfg.temporal_en = 0;
> break;
> default:
> - phys->hw_pp->ops.setup_dither(phys->hw_pp, NULL);
> + hw_pp->ops.setup_dither(hw_pp, NULL);
> return;
> }
>
> memcpy(&dither_cfg.matrix, dither_matrix,
> sizeof(u32) * DITHER_MATRIX_SZ);
>
> - phys->hw_pp->ops.setup_dither(phys->hw_pp, &dither_cfg);
> + hw_pp->ops.setup_dither(hw_pp, &dither_cfg);
> }
>
> void dpu_encoder_helper_report_irq_timeout(struct dpu_encoder_phys
> *phys_enc,
> @@ -1132,11 +1132,13 @@ static void
> _dpu_encoder_virt_enable_helper(struct drm_encoder *drm_enc)
>
> _dpu_encoder_update_vsync_source(dpu_enc, &dpu_enc->disp_info);
>
> - if (dpu_enc->disp_info.intf_type == DRM_MODE_ENCODER_DSI) {
> - for (i = 0; i < dpu_enc->num_phys_encs; i++) {
> - struct dpu_encoder_phys *phys = dpu_enc->phys_encs[i];
> -
> - _dpu_encoder_setup_dither(phys);
> + if (dpu_enc->disp_info.intf_type == DRM_MODE_ENCODER_DSI &&
> + !WARN_ON(dpu_enc->num_phys_encs == 0)) {
> + unsigned bpc = dpu_enc->phys_encs[0]->connector->display_info.bpc;
> + for (i = 0; i < MAX_CHANNELS_PER_ENC; i++) {
> + if (!dpu_enc->hw_pp[i])
> + continue;
> + _dpu_encoder_setup_dither(dpu_enc->hw_pp[i], bpc);
> }
> }
> }
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c
> b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c
> index 7411ab6bf6af..bea4ab5c58c5 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c
> @@ -231,8 +231,7 @@ static void _setup_pingpong_ops(struct
> dpu_hw_pingpong *c,
> c->ops.poll_timeout_wr_ptr = dpu_hw_pp_poll_timeout_wr_ptr;
> c->ops.get_line_count = dpu_hw_pp_get_line_count;
>
> - if (test_bit(DPU_PINGPONG_DITHER, &features) &&
> - IS_SC7180_TARGET(c->hw.hwversion))
> + if (test_bit(DPU_PINGPONG_DITHER, &features))
> c->ops.setup_dither = dpu_hw_pp_setup_dither;
> };
Change looks good to me
- Kalyan
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [Freedreno] [PATCH] drm/msm/dpu: fix/enable 6bpc dither with split-lm
2020-07-20 12:53 ` [Freedreno] " kalyan_t
@ 2020-07-20 15:23 ` Rob Clark
2020-07-21 12:57 ` kalyan_t
0 siblings, 1 reply; 5+ messages in thread
From: Rob Clark @ 2020-07-20 15:23 UTC (permalink / raw)
To: Kalyan Thota
Cc: Rob Clark, David Airlie, open list:DRM DRIVER FOR MSM ADRENO GPU,
open list:DRM DRIVER FOR MSM ADRENO GPU, Doug Anderson,
dri-devel, Stephen Boyd, Zheng Bin, Sean Paul,
Steev Klimaszewski, Drew Davenport, Sam Ravnborg, open list
On Mon, Jul 20, 2020 at 5:53 AM <kalyan_t@codeaurora.org> wrote:
>
> On 2020-07-16 03:49, Rob Clark wrote:
> > From: Rob Clark <robdclark@chromium.org>
> >
> > If split-lm is used (for ex, on sdm845), we can have multiple ping-
> > pongs, but only a single phys encoder. We need to configure dithering
> > on each of them.
> >
> > Signed-off-by: Rob Clark <robdclark@chromium.org>
> > ---
> > drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 22 ++++++++++---------
> > .../gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 3 +--
> > 2 files changed, 13 insertions(+), 12 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> > b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> > index 46df0ff75b85..9b98b63c77fb 100644
> > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> > @@ -212,14 +212,14 @@ static u32 dither_matrix[DITHER_MATRIX_SZ] = {
> > 15, 7, 13, 5, 3, 11, 1, 9, 12, 4, 14, 6, 0, 8, 2, 10
> > };
> >
> > -static void _dpu_encoder_setup_dither(struct dpu_encoder_phys *phys)
> > +static void _dpu_encoder_setup_dither(struct dpu_hw_pingpong *hw_pp,
> > unsigned bpc)
> > {
> > struct dpu_hw_dither_cfg dither_cfg = { 0 };
> >
> > - if (!phys->hw_pp || !phys->hw_pp->ops.setup_dither)
> > + if (!hw_pp->ops.setup_dither)
> > return;
> >
> > - switch (phys->connector->display_info.bpc) {
> > + switch (bpc) {
> > case 6:
> > dither_cfg.c0_bitdepth = 6;
> > dither_cfg.c1_bitdepth = 6;
> > @@ -228,14 +228,14 @@ static void _dpu_encoder_setup_dither(struct
> > dpu_encoder_phys *phys)
> > dither_cfg.temporal_en = 0;
> > break;
> > default:
> > - phys->hw_pp->ops.setup_dither(phys->hw_pp, NULL);
> > + hw_pp->ops.setup_dither(hw_pp, NULL);
> > return;
> > }
> >
> > memcpy(&dither_cfg.matrix, dither_matrix,
> > sizeof(u32) * DITHER_MATRIX_SZ);
> >
> > - phys->hw_pp->ops.setup_dither(phys->hw_pp, &dither_cfg);
> > + hw_pp->ops.setup_dither(hw_pp, &dither_cfg);
> > }
> >
> > void dpu_encoder_helper_report_irq_timeout(struct dpu_encoder_phys
> > *phys_enc,
> > @@ -1132,11 +1132,13 @@ static void
> > _dpu_encoder_virt_enable_helper(struct drm_encoder *drm_enc)
> >
> > _dpu_encoder_update_vsync_source(dpu_enc, &dpu_enc->disp_info);
> >
> > - if (dpu_enc->disp_info.intf_type == DRM_MODE_ENCODER_DSI) {
> > - for (i = 0; i < dpu_enc->num_phys_encs; i++) {
> > - struct dpu_encoder_phys *phys = dpu_enc->phys_encs[i];
> > -
> > - _dpu_encoder_setup_dither(phys);
> > + if (dpu_enc->disp_info.intf_type == DRM_MODE_ENCODER_DSI &&
> > + !WARN_ON(dpu_enc->num_phys_encs == 0)) {
> > + unsigned bpc = dpu_enc->phys_encs[0]->connector->display_info.bpc;
> > + for (i = 0; i < MAX_CHANNELS_PER_ENC; i++) {
> > + if (!dpu_enc->hw_pp[i])
> > + continue;
> > + _dpu_encoder_setup_dither(dpu_enc->hw_pp[i], bpc);
> > }
> > }
> > }
> > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c
> > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c
> > index 7411ab6bf6af..bea4ab5c58c5 100644
> > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c
> > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c
> > @@ -231,8 +231,7 @@ static void _setup_pingpong_ops(struct
> > dpu_hw_pingpong *c,
> > c->ops.poll_timeout_wr_ptr = dpu_hw_pp_poll_timeout_wr_ptr;
> > c->ops.get_line_count = dpu_hw_pp_get_line_count;
> >
> > - if (test_bit(DPU_PINGPONG_DITHER, &features) &&
> > - IS_SC7180_TARGET(c->hw.hwversion))
> > + if (test_bit(DPU_PINGPONG_DITHER, &features))
> > c->ops.setup_dither = dpu_hw_pp_setup_dither;
> > };
>
> Change looks good to me
Does that count as a Reviewed-by?
BR,
-R
>
> - Kalyan
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [Freedreno] [PATCH] drm/msm/dpu: fix/enable 6bpc dither with split-lm
2020-07-20 15:23 ` Rob Clark
@ 2020-07-21 12:57 ` kalyan_t
0 siblings, 0 replies; 5+ messages in thread
From: kalyan_t @ 2020-07-21 12:57 UTC (permalink / raw)
To: Rob Clark
Cc: Rob Clark, Sam Ravnborg, David Airlie,
open list:DRM DRIVER FOR MSM ADRENO GPU, Doug Anderson,
dri-devel, Stephen Boyd, Zheng Bin, Sean Paul,
Steev Klimaszewski, Drew Davenport,
open list:DRM DRIVER FOR MSM ADRENO GPU, open list
On 2020-07-20 20:53, Rob Clark wrote:
> On Mon, Jul 20, 2020 at 5:53 AM <kalyan_t@codeaurora.org> wrote:
>>
>> On 2020-07-16 03:49, Rob Clark wrote:
>> > From: Rob Clark <robdclark@chromium.org>
>> >
>> > If split-lm is used (for ex, on sdm845), we can have multiple ping-
>> > pongs, but only a single phys encoder. We need to configure dithering
>> > on each of them.
>> >
>> > Signed-off-by: Rob Clark <robdclark@chromium.org>
Reviewed-by: Kalyan Thota <kalyan_t@codeaurora.org>
>> > ---
>> > drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 22 ++++++++++---------
>> > .../gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 3 +--
>> > 2 files changed, 13 insertions(+), 12 deletions(-)
>> >
>> > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
>> > b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
>> > index 46df0ff75b85..9b98b63c77fb 100644
>> > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
>> > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
>> > @@ -212,14 +212,14 @@ static u32 dither_matrix[DITHER_MATRIX_SZ] = {
>> > 15, 7, 13, 5, 3, 11, 1, 9, 12, 4, 14, 6, 0, 8, 2, 10
>> > };
>> >
>> > -static void _dpu_encoder_setup_dither(struct dpu_encoder_phys *phys)
>> > +static void _dpu_encoder_setup_dither(struct dpu_hw_pingpong *hw_pp,
>> > unsigned bpc)
>> > {
>> > struct dpu_hw_dither_cfg dither_cfg = { 0 };
>> >
>> > - if (!phys->hw_pp || !phys->hw_pp->ops.setup_dither)
>> > + if (!hw_pp->ops.setup_dither)
>> > return;
>> >
>> > - switch (phys->connector->display_info.bpc) {
>> > + switch (bpc) {
>> > case 6:
>> > dither_cfg.c0_bitdepth = 6;
>> > dither_cfg.c1_bitdepth = 6;
>> > @@ -228,14 +228,14 @@ static void _dpu_encoder_setup_dither(struct
>> > dpu_encoder_phys *phys)
>> > dither_cfg.temporal_en = 0;
>> > break;
>> > default:
>> > - phys->hw_pp->ops.setup_dither(phys->hw_pp, NULL);
>> > + hw_pp->ops.setup_dither(hw_pp, NULL);
>> > return;
>> > }
>> >
>> > memcpy(&dither_cfg.matrix, dither_matrix,
>> > sizeof(u32) * DITHER_MATRIX_SZ);
>> >
>> > - phys->hw_pp->ops.setup_dither(phys->hw_pp, &dither_cfg);
>> > + hw_pp->ops.setup_dither(hw_pp, &dither_cfg);
>> > }
>> >
>> > void dpu_encoder_helper_report_irq_timeout(struct dpu_encoder_phys
>> > *phys_enc,
>> > @@ -1132,11 +1132,13 @@ static void
>> > _dpu_encoder_virt_enable_helper(struct drm_encoder *drm_enc)
>> >
>> > _dpu_encoder_update_vsync_source(dpu_enc, &dpu_enc->disp_info);
>> >
>> > - if (dpu_enc->disp_info.intf_type == DRM_MODE_ENCODER_DSI) {
>> > - for (i = 0; i < dpu_enc->num_phys_encs; i++) {
>> > - struct dpu_encoder_phys *phys = dpu_enc->phys_encs[i];
>> > -
>> > - _dpu_encoder_setup_dither(phys);
>> > + if (dpu_enc->disp_info.intf_type == DRM_MODE_ENCODER_DSI &&
>> > + !WARN_ON(dpu_enc->num_phys_encs == 0)) {
>> > + unsigned bpc = dpu_enc->phys_encs[0]->connector->display_info.bpc;
>> > + for (i = 0; i < MAX_CHANNELS_PER_ENC; i++) {
>> > + if (!dpu_enc->hw_pp[i])
>> > + continue;
>> > + _dpu_encoder_setup_dither(dpu_enc->hw_pp[i], bpc);
>> > }
>> > }
>> > }
>> > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c
>> > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c
>> > index 7411ab6bf6af..bea4ab5c58c5 100644
>> > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c
>> > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c
>> > @@ -231,8 +231,7 @@ static void _setup_pingpong_ops(struct
>> > dpu_hw_pingpong *c,
>> > c->ops.poll_timeout_wr_ptr = dpu_hw_pp_poll_timeout_wr_ptr;
>> > c->ops.get_line_count = dpu_hw_pp_get_line_count;
>> >
>> > - if (test_bit(DPU_PINGPONG_DITHER, &features) &&
>> > - IS_SC7180_TARGET(c->hw.hwversion))
>> > + if (test_bit(DPU_PINGPONG_DITHER, &features))
>> > c->ops.setup_dither = dpu_hw_pp_setup_dither;
>> > };
>>
>> Change looks good to me
>
> Does that count as a Reviewed-by?
>
Sure i have added the tag.
> BR,
> -R
>
>>
>> - Kalyan
> _______________________________________________
> Freedreno mailing list
> Freedreno@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/freedreno
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-07-21 13:11 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-15 22:19 [PATCH] drm/msm/dpu: fix/enable 6bpc dither with split-lm Rob Clark
2020-07-19 19:55 ` Steev Klimaszewski
2020-07-20 12:53 ` [Freedreno] " kalyan_t
2020-07-20 15:23 ` Rob Clark
2020-07-21 12:57 ` kalyan_t
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).