diff options
| author | Ville Syrjälä | 2015-09-10 17:59:10 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2015-09-23 10:32:47 +0200 |
| commit | 9eca6832f7254d49d25494da7d47c0f8a24f7862 (patch) | |
| tree | f5f2ba803ad14fe91c7a831305b9d2c848e7b975 /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: Move sprite/cursor plane disable to intel_sanitize_crtc() (diff) | |
| download | kernel-qcow2-linux-9eca6832f7254d49d25494da7d47c0f8a24f7862.tar.gz kernel-qcow2-linux-9eca6832f7254d49d25494da7d47c0f8a24f7862.tar.xz kernel-qcow2-linux-9eca6832f7254d49d25494da7d47c0f8a24f7862.zip | |
drm/i915: Move scanline_offset and timestamping constant setup to intel_modeset_readout_hw_state()
intel_modeset_readout_hw_state() seems like the more appropriate place
for populating the scanline_offset and timestamping constants than
intel_sanitize_crtc() since they are basically part of the state we
read out.
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Patrik Jakobsson <patrik.jakobsson@linux.intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Patrik Jakobsson <patrik.jakobsson@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 5064d8f4d00c..8db2b13499ba 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -14907,8 +14907,6 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc) if (crtc->active) { struct intel_plane *plane; - drm_calc_timestamping_constants(&crtc->base, &crtc->base.hwmode); - update_scanline_offset(crtc); drm_crtc_vblank_on(&crtc->base); /* Disable everything but the primary plane */ @@ -15204,6 +15202,9 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev) * recalculation. */ crtc->base.state->mode.private_flags = I915_MODE_FLAG_INHERITED; + + drm_calc_timestamping_constants(&crtc->base, &crtc->base.hwmode); + update_scanline_offset(crtc); } } } |