Re: [Intel-gfx] [V3] drm/i915/display: Fix state mismatch in drm infoframe
> -Original Message-
> From: Intel-gfx On Behalf Of
> Shankar,
> Uma
> Sent: Thursday, June 24, 2021 2:19 PM
> To: Modem, Bhanuprakash ; intel-
> g...@lists.freedesktop.org
> Subject: Re: [Intel-gfx] [V3] drm/i915/display: Fix state mismatch in drm
> infoframe
>
>
>
> > -Original Message-
> > From: Modem, Bhanuprakash
> > Sent: Friday, April 23, 2021 7:46 PM
> > To: intel-gfx@lists.freedesktop.org
> > Cc: Modem, Bhanuprakash ; Shankar, Uma
> > ; Ville Syrjälä
> > Subject: [V3] drm/i915/display: Fix state mismatch in drm infoframe
> >
> > While reading the SDP infoframe, we are getting filtered with the
> > encoder type INTEL_OUTPUT_DDI which causes the infoframe mismatch.
> > This patch will drop
> > encoder->type check as we can mask individual infoframe type.
>
> It will be good to mention that issue happens with eDP. With that added,
>
> Reviewed-by: Uma Shankar
Change pushed to drm-intel-next.
Thanks for the patch.
Regards,
Uma Shankar
> > [1025.606556] i915 :00:02.0: [drm] *ERROR* mismatch in drm
> > infoframe [1025.607865] i915 :00:02.0: [drm] *ERROR* expected:
> > [1025.607879] i915 :00:02.0: HDMI infoframe: Dynamic Range and
> > Mastering, version 1, length 26 [1025.607889] i915 :00:02.0:
> > length: 26 [1025.607898] i915
> > :00:02.0: metadata type: 0 [1025.608292] i915 :00:02.0: eotf:
> > 2 [1025.608302] i915 :00:02.0: x[0]: 35400 [1025.608312] i915
> > :00:02.0:
> > y[0]: 14599 [1025.609115] i915 :00:02.0: x[1]: 8500 [1025.609947]
> > i915
> > :00:02.0: y[1]: 39850 [1025.609959] i915 :00:02.0: x[2]: 6550
> > [1025.609970] i915 :00:02.0: y[2]: 2300 [1025.609980] i915 :00:02.0:
> > white point x: 15634 [1025.609989] i915 :00:02.0: white point y:
> > 16450 [1025.610381] i915 :00:02.0:
> > max_display_mastering_luminance: 1000 [1025.610392] i915 :00:02.0:
> > min_display_mastering_luminance: 500 [1025.610401] i915 :00:02.0:
> > max_cll:
> 500 [1025.610816] i915 :00:02.0:
> > max_fall: 1000 [1025.612457] i915 :00:02.0: [drm] *ERROR* found:
> > [1025.614354] [ cut here ] [1025.616244] pipe
> > state doesn't match!
> > [1025.617640] WARNING: CPU: 6 PID: 2114 at
> > drivers/gpu/drm/i915/display/intel_display.c:9332
> > intel_atomic_commit_tail+0x14d4/0x17c0 [i915]
> >
> > V2:
> > * Drop encoder->type check
> >
> > V3:
> > * Remove internal reviews
> >
> > Cc: Uma Shankar
> > Cc: Ville Syrjälä
> > Signed-off-by: Bhanuprakash Modem
> > ---
> > drivers/gpu/drm/i915/display/intel_dp.c | 3 ---
> > 1 file changed, 3 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c
> > b/drivers/gpu/drm/i915/display/intel_dp.c
> > index 4ad12dde5938..280b0b5ee70e 100644
> > --- a/drivers/gpu/drm/i915/display/intel_dp.c
> > +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> > @@ -3014,9 +3014,6 @@ void intel_read_dp_sdp(struct intel_encoder *encoder,
> >struct intel_crtc_state *crtc_state,
> >unsigned int type)
> > {
> > - if (encoder->type != INTEL_OUTPUT_DDI)
> > - return;
> > -
> > switch (type) {
> > case DP_SDP_VSC:
> > intel_read_dp_vsc_sdp(encoder, crtc_state,
> > --
> > 2.20.1
>
> ___
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [V3] drm/i915/display: Fix state mismatch in drm infoframe
> -Original Message-
> From: Modem, Bhanuprakash
> Sent: Friday, April 23, 2021 7:46 PM
> To: intel-gfx@lists.freedesktop.org
> Cc: Modem, Bhanuprakash ; Shankar, Uma
> ; Ville Syrjälä
> Subject: [V3] drm/i915/display: Fix state mismatch in drm infoframe
>
> While reading the SDP infoframe, we are getting filtered with the encoder type
> INTEL_OUTPUT_DDI which causes the infoframe mismatch. This patch will drop
> encoder->type check as we can mask individual infoframe type.
It will be good to mention that issue happens with eDP. With that added,
Reviewed-by: Uma Shankar
> [1025.606556] i915 :00:02.0: [drm] *ERROR* mismatch in drm infoframe
> [1025.607865] i915 :00:02.0: [drm] *ERROR* expected:
> [1025.607879] i915 :00:02.0: HDMI infoframe: Dynamic Range and Mastering,
> version 1, length 26 [1025.607889] i915 :00:02.0: length: 26
> [1025.607898] i915
> :00:02.0: metadata type: 0 [1025.608292] i915 :00:02.0: eotf: 2
> [1025.608302] i915 :00:02.0: x[0]: 35400 [1025.608312] i915 :00:02.0:
> y[0]: 14599 [1025.609115] i915 :00:02.0: x[1]: 8500 [1025.609947] i915
> :00:02.0: y[1]: 39850 [1025.609959] i915 :00:02.0: x[2]: 6550
> [1025.609970] i915 :00:02.0: y[2]: 2300 [1025.609980] i915 :00:02.0:
> white point x: 15634 [1025.609989] i915 :00:02.0: white point y: 16450
> [1025.610381] i915 :00:02.0: max_display_mastering_luminance: 1000
> [1025.610392] i915 :00:02.0: min_display_mastering_luminance: 500
> [1025.610401] i915 :00:02.0: max_cll: 500 [1025.610816] i915 :00:02.0:
> max_fall: 1000 [1025.612457] i915 :00:02.0: [drm] *ERROR* found:
> [1025.614354] [ cut here ] [1025.616244] pipe state
> doesn't
> match!
> [1025.617640] WARNING: CPU: 6 PID: 2114 at
> drivers/gpu/drm/i915/display/intel_display.c:9332
> intel_atomic_commit_tail+0x14d4/0x17c0 [i915]
>
> V2:
> * Drop encoder->type check
>
> V3:
> * Remove internal reviews
>
> Cc: Uma Shankar
> Cc: Ville Syrjälä
> Signed-off-by: Bhanuprakash Modem
> ---
> drivers/gpu/drm/i915/display/intel_dp.c | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c
> b/drivers/gpu/drm/i915/display/intel_dp.c
> index 4ad12dde5938..280b0b5ee70e 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> @@ -3014,9 +3014,6 @@ void intel_read_dp_sdp(struct intel_encoder *encoder,
> struct intel_crtc_state *crtc_state,
> unsigned int type)
> {
> - if (encoder->type != INTEL_OUTPUT_DDI)
> - return;
> -
> switch (type) {
> case DP_SDP_VSC:
> intel_read_dp_vsc_sdp(encoder, crtc_state,
> --
> 2.20.1
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] [V3] drm/i915/display: Fix state mismatch in drm infoframe
While reading the SDP infoframe, we are getting filtered with
the encoder type INTEL_OUTPUT_DDI which causes the infoframe
mismatch. This patch will drop encoder->type check as we can
mask individual infoframe type.
[1025.606556] i915 :00:02.0: [drm] *ERROR* mismatch in drm infoframe
[1025.607865] i915 :00:02.0: [drm] *ERROR* expected:
[1025.607879] i915 :00:02.0: HDMI infoframe: Dynamic Range and Mastering,
version 1, length 26
[1025.607889] i915 :00:02.0: length: 26
[1025.607898] i915 :00:02.0: metadata type: 0
[1025.608292] i915 :00:02.0: eotf: 2
[1025.608302] i915 :00:02.0: x[0]: 35400
[1025.608312] i915 :00:02.0: y[0]: 14599
[1025.609115] i915 :00:02.0: x[1]: 8500
[1025.609947] i915 :00:02.0: y[1]: 39850
[1025.609959] i915 :00:02.0: x[2]: 6550
[1025.609970] i915 :00:02.0: y[2]: 2300
[1025.609980] i915 :00:02.0: white point x: 15634
[1025.609989] i915 :00:02.0: white point y: 16450
[1025.610381] i915 :00:02.0: max_display_mastering_luminance: 1000
[1025.610392] i915 :00:02.0: min_display_mastering_luminance: 500
[1025.610401] i915 :00:02.0: max_cll: 500
[1025.610816] i915 :00:02.0: max_fall: 1000
[1025.612457] i915 :00:02.0: [drm] *ERROR* found:
[1025.614354] [ cut here ]
[1025.616244] pipe state doesn't match!
[1025.617640] WARNING: CPU: 6 PID: 2114 at
drivers/gpu/drm/i915/display/intel_display.c:9332
intel_atomic_commit_tail+0x14d4/0x17c0 [i915]
V2:
* Drop encoder->type check
V3:
* Remove internal reviews
Cc: Uma Shankar
Cc: Ville Syrjälä
Signed-off-by: Bhanuprakash Modem
---
drivers/gpu/drm/i915/display/intel_dp.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_dp.c
b/drivers/gpu/drm/i915/display/intel_dp.c
index 4ad12dde5938..280b0b5ee70e 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -3014,9 +3014,6 @@ void intel_read_dp_sdp(struct intel_encoder *encoder,
struct intel_crtc_state *crtc_state,
unsigned int type)
{
- if (encoder->type != INTEL_OUTPUT_DDI)
- return;
-
switch (type) {
case DP_SDP_VSC:
intel_read_dp_vsc_sdp(encoder, crtc_state,
--
2.20.1
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
