| Message ID | 20161219082423.27798-6-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Op 19-12-16 om 09:24 schreef Daniel Vetter: > The code was moved, but the comment not updated. It confused me. > > Fixes: 7f4c62840cc4 ("drm/i915: Assign hwmode after encoder state readout") > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > Cc: Patrik Jakobsson <patrik.jakobsson@linux.intel.com> > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > --- > drivers/gpu/drm/i915/intel_display.c | 14 +++----------- > 1 file changed, 3 insertions(+), 11 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index e029dba96bca..c7d775f01b23 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -17028,17 +17028,9 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev) > * the atomic core happy. It wants a valid mode if the > * crtc's enabled, so we do the above call. > * > - * At this point some state updated by the connectors > - * in their ->detect() callback has not run yet, so > - * no recalculation can be done yet. > - * > - * Even if we could do a recalculation and modeset > - * right now it would cause a double modeset if > - * fbdev or userspace chooses a different initial mode. > - * > - * If that happens, someone indicated they wanted a > - * mode change, which means it's safe to do a full > - * recalculation. > + * But we don't set all the derived state fully, hence > + * set a flag to indicate that a full recalculation is > + * needed on the next commit. > */ > crtc->base.state->mode.private_flags = I915_MODE_FLAG_INHERITED; > Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
On Tue, Dec 20, 2016 at 02:38:55PM +0100, Maarten Lankhorst wrote: > Op 19-12-16 om 09:24 schreef Daniel Vetter: > > The code was moved, but the comment not updated. It confused me. > > > > Fixes: 7f4c62840cc4 ("drm/i915: Assign hwmode after encoder state readout") > > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > > Cc: Patrik Jakobsson <patrik.jakobsson@linux.intel.com> > > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > > --- > > drivers/gpu/drm/i915/intel_display.c | 14 +++----------- > > 1 file changed, 3 insertions(+), 11 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > > index e029dba96bca..c7d775f01b23 100644 > > --- a/drivers/gpu/drm/i915/intel_display.c > > +++ b/drivers/gpu/drm/i915/intel_display.c > > @@ -17028,17 +17028,9 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev) > > * the atomic core happy. It wants a valid mode if the > > * crtc's enabled, so we do the above call. > > * > > - * At this point some state updated by the connectors > > - * in their ->detect() callback has not run yet, so > > - * no recalculation can be done yet. > > - * > > - * Even if we could do a recalculation and modeset > > - * right now it would cause a double modeset if > > - * fbdev or userspace chooses a different initial mode. > > - * > > - * If that happens, someone indicated they wanted a > > - * mode change, which means it's safe to do a full > > - * recalculation. > > + * But we don't set all the derived state fully, hence > > + * set a flag to indicate that a full recalculation is > > + * needed on the next commit. > > */ > > crtc->base.state->mode.private_flags = I915_MODE_FLAG_INHERITED; > > > > Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Applied this one to dinq. Ping about patches 3-5 where there's still questions from you open, but I think I answered them all. -Daniel
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index e029dba96bca..c7d775f01b23 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -17028,17 +17028,9 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev) * the atomic core happy. It wants a valid mode if the * crtc's enabled, so we do the above call. * - * At this point some state updated by the connectors - * in their ->detect() callback has not run yet, so - * no recalculation can be done yet. - * - * Even if we could do a recalculation and modeset - * right now it would cause a double modeset if - * fbdev or userspace chooses a different initial mode. - * - * If that happens, someone indicated they wanted a - * mode change, which means it's safe to do a full - * recalculation. + * But we don't set all the derived state fully, hence + * set a flag to indicate that a full recalculation is + * needed on the next commit. */ crtc->base.state->mode.private_flags = I915_MODE_FLAG_INHERITED;
The code was moved, but the comment not updated. It confused me. Fixes: 7f4c62840cc4 ("drm/i915: Assign hwmode after encoder state readout") Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Patrik Jakobsson <patrik.jakobsson@linux.intel.com> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> --- drivers/gpu/drm/i915/intel_display.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-)