| Message ID | 20200326125111.11081-1-uma.shankar@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v3] drm/i915/display: Fix mode private_flags comparison at atomic_check | expand |
> -----Original Message----- > From: Shankar, Uma <uma.shankar@intel.com> > Sent: Thursday, March 26, 2020 6:21 PM > To: intel-gfx@lists.freedesktop.org > Cc: Shankar, Uma <uma.shankar@intel.com>; Ville Syrjä > <ville.syrjala@linux.intel.com>; Maarten Lankhorst > <maarten.lankhorst@linux.intel.com>; Kai Vehmanen > <kai.vehmanen@linux.intel.com>; Souza; Souza, Jose <jose.souza@intel.com>; > Khor, Swee Aun <swee.aun.khor@intel.com> > Subject: [v3] drm/i915/display: Fix mode private_flags comparison at atomic_check > > This patch fixes the private_flags of mode to be checked and compared against > uapi.mode and not from hw.mode. This helps properly trigger modeset at boot if > desired by driver. > > It helps resolve audio_codec initialization issues if display is connected at boot. > Initial discussion on this issue has happened on below thread: > https://patchwork.freedesktop.org/series/74828/ > > v2: No functional change. Fixed the Closes tag and added Maarten's RB. > > v3: Added Fixes tag. Pushed the change to dinq. Thanks again Ville and Maarten for all your valuable feedback, suggestions and reviews. Regards, Uma Shankar > Cc: Ville Syrjä <ville.syrjala@linux.intel.com> > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > Cc: Kai Vehmanen <kai.vehmanen@linux.intel.com> > Cc: Souza, Jose <jose.souza@intel.com> > Fixes: 58d124ea2739 ("drm/i915: Complete crtc hw/uapi split, v6.") > Closes: https://gitlab.freedesktop.org/drm/intel/issues/1363 > Suggested-by: Ville Syrjä <ville.syrjala@linux.intel.com> > Signed-off-by: Uma Shankar <uma.shankar@intel.com> > Signed-off-by: SweeAun Khor <swee.aun.khor@intel.com> > Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > --- > drivers/gpu/drm/i915/display/intel_display.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c > b/drivers/gpu/drm/i915/display/intel_display.c > index fe55c7c713f1..e630429af2c0 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -14747,8 +14747,8 @@ static int intel_atomic_check(struct drm_device *dev, > /* Catch I915_MODE_FLAG_INHERITED */ > for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state, > new_crtc_state, i) { > - if (new_crtc_state->hw.mode.private_flags != > - old_crtc_state->hw.mode.private_flags) > + if (new_crtc_state->uapi.mode.private_flags != > + old_crtc_state->uapi.mode.private_flags) > new_crtc_state->uapi.mode_changed = true; > } > > -- > 2.22.0
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index fe55c7c713f1..e630429af2c0 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -14747,8 +14747,8 @@ static int intel_atomic_check(struct drm_device *dev, /* Catch I915_MODE_FLAG_INHERITED */ for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) { - if (new_crtc_state->hw.mode.private_flags != - old_crtc_state->hw.mode.private_flags) + if (new_crtc_state->uapi.mode.private_flags != + old_crtc_state->uapi.mode.private_flags) new_crtc_state->uapi.mode_changed = true; }
This patch fixes the private_flags of mode to be checked and compared against uapi.mode and not from hw.mode. This helps properly trigger modeset at boot if desired by driver. It helps resolve audio_codec initialization issues if display is connected at boot. Initial discussion on this issue has happened on below thread: https://patchwork.freedesktop.org/series/74828/ v2: No functional change. Fixed the Closes tag and added Maarten's RB. v3: Added Fixes tag. Cc: Ville Syrjä <ville.syrjala@linux.intel.com> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Kai Vehmanen <kai.vehmanen@linux.intel.com> Cc: Souza, Jose <jose.souza@intel.com> Fixes: 58d124ea2739 ("drm/i915: Complete crtc hw/uapi split, v6.") Closes: https://gitlab.freedesktop.org/drm/intel/issues/1363 Suggested-by: Ville Syrjä <ville.syrjala@linux.intel.com> Signed-off-by: Uma Shankar <uma.shankar@intel.com> Signed-off-by: SweeAun Khor <swee.aun.khor@intel.com> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> --- drivers/gpu/drm/i915/display/intel_display.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)