diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-12-19 03:24:23 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-01-04 04:57:23 -0500 |
commit | 7800fb69ddf3a13d2055009c87eacf7f46f907c8 (patch) | |
tree | 319716c75f42f3b7e18a7c5412f6a578201028ad | |
parent | 5390974f981907cd02d1cb48145b03471279877a (diff) |
drm/i915: Update comment that sets 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>
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
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 287b35a39e18..7c670d3ba465 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
@@ -16962,17 +16962,9 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev) | |||
16962 | * the atomic core happy. It wants a valid mode if the | 16962 | * the atomic core happy. It wants a valid mode if the |
16963 | * crtc's enabled, so we do the above call. | 16963 | * crtc's enabled, so we do the above call. |
16964 | * | 16964 | * |
16965 | * At this point some state updated by the connectors | 16965 | * But we don't set all the derived state fully, hence |
16966 | * in their ->detect() callback has not run yet, so | 16966 | * set a flag to indicate that a full recalculation is |
16967 | * no recalculation can be done yet. | 16967 | * needed on the next commit. |
16968 | * | ||
16969 | * Even if we could do a recalculation and modeset | ||
16970 | * right now it would cause a double modeset if | ||
16971 | * fbdev or userspace chooses a different initial mode. | ||
16972 | * | ||
16973 | * If that happens, someone indicated they wanted a | ||
16974 | * mode change, which means it's safe to do a full | ||
16975 | * recalculation. | ||
16976 | */ | 16968 | */ |
16977 | crtc->base.state->mode.private_flags = I915_MODE_FLAG_INHERITED; | 16969 | crtc->base.state->mode.private_flags = I915_MODE_FLAG_INHERITED; |
16978 | 16970 | ||