drm/i915: Update comment that sets I915_MODE_FLAG_INHERITED
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 19 Dec 2016 08:24:23 +0000 (09:24 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 4 Jan 2017 09:57:23 +0000 (10:57 +0100)
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>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20161219082423.27798-6-daniel.vetter@ffwll.ch
drivers/gpu/drm/i915/intel_display.c

index 287b35a..7c670d3 100644 (file)
@@ -16962,17 +16962,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;