summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_drv.h
diff options
context:
space:
mode:
authorMaarten Lankhorst2015-06-15 12:33:56 +0200
committerDaniel Vetter2015-06-22 14:28:37 +0200
commit27c329ed16ddf5540151dfa9d22c584b819e0718 (patch)
tree13aae91cb338366c5f6d6dd130d9880cc7fae933 /drivers/gpu/drm/i915/intel_drv.h
parentdrm/i915: Remove transitional references from intel_plane_atomic_check. (diff)
downloadkernel-qcow2-linux-27c329ed16ddf5540151dfa9d22c584b819e0718.tar.gz
kernel-qcow2-linux-27c329ed16ddf5540151dfa9d22c584b819e0718.tar.xz
kernel-qcow2-linux-27c329ed16ddf5540151dfa9d22c584b819e0718.zip
drm/i915: Make cdclk part of the atomic state.
The skylake scalers depend on the cdclk freq, but that frequency can change during a modeset. So when a modeset happens calculate the new cdclk in the atomic state. With the transitional helpers gone the cached value can be used in the scaler, and committed after all crtc's are disabled. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90874 Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Matt Roper <matthew.d.roper@intel.com> Tested-by(IVB): Matt Roper <matthew.d.roper@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
-rw-r--r--drivers/gpu/drm/i915/intel_drv.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index d48b98014080..853bfd98ef72 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -244,6 +244,7 @@ typedef struct dpll {
struct intel_atomic_state {
struct drm_atomic_state base;
+ unsigned int cdclk;
bool dpll_set;
struct intel_shared_dpll_config shared_dpll[I915_NUM_PLLS];
};