summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_drv.h
diff options
context:
space:
mode:
authorMaarten Lankhorst2016-02-17 09:18:35 +0100
committerMaarten Lankhorst2016-02-18 10:41:42 +0100
commitedde361711ef8f396e401b25d970e329f68bec0b (patch)
tree648e0711db93d88320bfc070ef74597e02b5f157 /drivers/gpu/drm/i915/intel_drv.h
parentdrm/i915: Enable PSR by default on Haswell and Broadwell. (diff)
downloadkernel-qcow2-linux-edde361711ef8f396e401b25d970e329f68bec0b.tar.gz
kernel-qcow2-linux-edde361711ef8f396e401b25d970e329f68bec0b.tar.xz
kernel-qcow2-linux-edde361711ef8f396e401b25d970e329f68bec0b.zip
drm/i915: Use atomic state to obtain load detection crtc, v3.
Instead of restoring dpms and a flag for whether a temp fb is allocated duplicate an atomic state before the new state is committed, and commit it the old state in intel_release_load_detect_pipe. Changes since v1: - Use a real atomic state. (Ville) Changes since v2: - Do not preserve shared_dpll any more, no need to do so. (Ville) Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1455697119-31416-2-git-send-email-maarten.lankhorst@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
-rw-r--r--drivers/gpu/drm/i915/intel_drv.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index f95f8b22939f..285b0570be9c 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -910,9 +910,7 @@ struct intel_unpin_work {
};
struct intel_load_detect_pipe {
- struct drm_framebuffer *release_fb;
- bool load_detect_temp;
- int dpms_mode;
+ struct drm_atomic_state *restore_state;
};
static inline struct intel_encoder *