diff options
| author | Maarten Lankhorst | 2016-08-09 17:04:13 +0200 |
|---|---|---|
| committer | Maarten Lankhorst | 2016-08-23 11:57:07 +0200 |
| commit | 85cb48a1651ee7cbc49468776d3078418f7827c5 (patch) | |
| tree | d98dd8f2a9cdf94a089f19c65c1f2c1b02eccc55 /drivers/gpu/drm/i915/intel_ddi.c | |
| parent | drm/i915: Convert intel_dp_mst to use atomic state (diff) | |
| download | kernel-qcow2-linux-85cb48a1651ee7cbc49468776d3078418f7827c5.tar.gz kernel-qcow2-linux-85cb48a1651ee7cbc49468776d3078418f7827c5.tar.xz kernel-qcow2-linux-85cb48a1651ee7cbc49468776d3078418f7827c5.zip | |
drm/i915: Convert intel_dp to use atomic state
Slightly less straightforward. Some of the drrs calls are done from
workers or from intel_ddi.c, pass along crtc_state when we can,
or crtc->config when we can't.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1470755054-32699-15-git-send-email-maarten.lankhorst@linux.intel.com
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ddi.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_ddi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c index b23872839fe0..309ba7bc19ad 100644 --- a/drivers/gpu/drm/i915/intel_ddi.c +++ b/drivers/gpu/drm/i915/intel_ddi.c @@ -1745,7 +1745,7 @@ static void intel_enable_ddi(struct intel_encoder *intel_encoder, intel_edp_backlight_on(intel_dp); intel_psr_enable(intel_dp); - intel_edp_drrs_enable(intel_dp); + intel_edp_drrs_enable(intel_dp, pipe_config); } if (intel_crtc->config->has_audio) { @@ -1773,7 +1773,7 @@ static void intel_disable_ddi(struct intel_encoder *intel_encoder, if (type == INTEL_OUTPUT_EDP) { struct intel_dp *intel_dp = enc_to_intel_dp(encoder); - intel_edp_drrs_disable(intel_dp); + intel_edp_drrs_disable(intel_dp, old_crtc_state); intel_psr_disable(intel_dp); intel_edp_backlight_off(intel_dp); } |