summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>2015-08-27 16:44:02 +0300
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-09-14 10:51:03 +0300
commit44522d852f1979ec0e6807eb4dc58bd7ecc8af08 (patch)
tree464d73db251f12dec69b62ab08307341acc37999
parentfd1ee4cc9326c97b52154ee2ef8cdd23ac6aae1c (diff)
downloadlinux-44522d852f1979ec0e6807eb4dc58bd7ecc8af08.tar.xz
drm/i915: Set csc coefficients in update_pipe_size.
This might not have been set during boot, and when we preserve the initial mode this can result in a black screen. Cc: Daniel Stone <daniels@collabora.com> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/intel_display.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 62573d5595fa..19049198364a 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3274,6 +3274,9 @@ static void intel_update_pipe_size(struct intel_crtc *crtc)
if (!i915.fastboot)
return;
+ if (HAS_DDI(dev))
+ intel_set_pipe_csc(&crtc->base);
+
/*
* Update pipe size and adjust fitter if needed: the reason for this is
* that in compute_mode_changes we check the native mode (not the pfit