| Message ID | 20200326074928.10395-1-uma.shankar@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915/display: Fix mode private_flags comparison at atomic_check | expand |
Op 26-03-2020 om 08:49 schreef Uma Shankar: > 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/ > > Fixes: https://gitlab.freedesktop.org/drm/intel/issues/1363 Wrong use of fixes. :) Use dim fixes original-commit-id to reference the commit. And for this use the Closes: tag. Other than that looks good. :) So with headers fixed: Reviewed-By: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > 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> > 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> > --- > 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; > } >
> -----Original Message----- > From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > Sent: Thursday, March 26, 2020 4:18 PM > To: Shankar, Uma <uma.shankar@intel.com>; intel-gfx@lists.freedesktop.org > Cc: Ville Syrjä <ville.syrjala@linux.intel.com>; Kai Vehmanen > <kai.vehmanen@linux.intel.com>; Souza, Jose <jose.souza@intel.com>; Khor, Swee > Aun <swee.aun.khor@intel.com> > Subject: Re: [PATCH] drm/i915/display: Fix mode private_flags comparison at > atomic_check > > Op 26-03-2020 om 08:49 schreef Uma Shankar: > > 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/ > > > > Fixes: https://gitlab.freedesktop.org/drm/intel/issues/1363 > > Wrong use of fixes. :) > > Use dim fixes original-commit-id to reference the commit. And for this use the > Closes: tag. > > Other than that looks good. :) > > So with headers fixed: Thanks for the feedback Maarten. Floated v2 with this updated. Regards, Uma Shankar > Reviewed-By: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > > > 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> > > 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> > > --- > > 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; > > } > > >
On Thu, Mar 26, 2020 at 01:19:28PM +0530, Uma Shankar wrote: > 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/ > > Fixes: https://gitlab.freedesktop.org/drm/intel/issues/1363 > > 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> > Suggested-by: Ville Syrjä <ville.syrjala@linux.intel.com> No one by that name here. > Signed-off-by: Uma Shankar <uma.shankar@intel.com> > Signed-off-by: SweeAun Khor <swee.aun.khor@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
> -----Original Message----- > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > Sent: Thursday, March 26, 2020 9:47 PM > To: Shankar, Uma <uma.shankar@intel.com> > Cc: intel-gfx@lists.freedesktop.org; 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: Re: [PATCH] drm/i915/display: Fix mode private_flags comparison at > atomic_check > > On Thu, Mar 26, 2020 at 01:19:28PM +0530, Uma Shankar wrote: > > 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/ > > > > Fixes: https://gitlab.freedesktop.org/drm/intel/issues/1363 > > > > 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> > > Suggested-by: Ville Syrjä <ville.syrjala@linux.intel.com> > > No one by that name here. Copied this from an existing reference, not sure how some characters got messed up ☹ > > Signed-off-by: Uma Shankar <uma.shankar@intel.com> > > Signed-off-by: SweeAun Khor <swee.aun.khor@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 > > -- > Ville Syrjälä > Intel
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; }