Commit 9c54c0dd authored by Jesse Barnes's avatar Jesse Barnes Committed by Keith Packard

drm/i915: load the LUT before pipe enable on ILK+

Per the specs and to address
https://bugs.freedesktop.org/show_bug.cgi?id=36888.
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Cc: stable@kernel.org
Signed-off-by: default avatarKeith Packard <keithp@keithp.com>
parent f3234706
...@@ -2699,14 +2699,18 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc) ...@@ -2699,14 +2699,18 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc)
I915_WRITE(PF_WIN_SZ(pipe), dev_priv->pch_pf_size); I915_WRITE(PF_WIN_SZ(pipe), dev_priv->pch_pf_size);
} }
/*
* On ILK+ LUT must be loaded before the pipe is running but with
* clocks enabled
*/
intel_crtc_load_lut(crtc);
intel_enable_pipe(dev_priv, pipe, is_pch_port); intel_enable_pipe(dev_priv, pipe, is_pch_port);
intel_enable_plane(dev_priv, plane, pipe); intel_enable_plane(dev_priv, plane, pipe);
if (is_pch_port) if (is_pch_port)
ironlake_pch_enable(crtc); ironlake_pch_enable(crtc);
intel_crtc_load_lut(crtc);
mutex_lock(&dev->struct_mutex); mutex_lock(&dev->struct_mutex);
intel_update_fbc(dev); intel_update_fbc(dev);
mutex_unlock(&dev->struct_mutex); mutex_unlock(&dev->struct_mutex);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment