Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7800fb69 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: Update comment that sets I915_MODE_FLAG_INHERITED 



The code was moved, but the comment not updated. It confused me.

Fixes: 7f4c6284 ("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: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20161219082423.27798-6-daniel.vetter@ffwll.ch
parent 5390974f

drivers/gpu/drm/i915/intel_display.c

+3 −11
Original line number Diff line number Diff line
@@ -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;