drm/i915: put the right cpu_transcoder into pipe_config for hw state readout
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 29 Apr 2013 16:29:19 +0000 (18:29 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 29 Apr 2013 19:13:20 +0000 (21:13 +0200)
This hack is getting a bit messy, but this plugs the leak for now
until we have the cpu_transcoder properly pipe_config'ed.

Cc: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_display.c

index dacfc6c905505f4876faadd8760c1a3686315353..90bed0ab0fe23b771aa92d9349ea6448f0e73247 100644 (file)
@@ -7981,6 +7981,7 @@ intel_modeset_check_state(struct drm_device *dev)
                     "(expected %i, found %i)\n", enabled, crtc->base.enabled);
 
                memset(&pipe_config, 0, sizeof(pipe_config));
+               pipe_config.cpu_transcoder = crtc->config.cpu_transcoder;
                active = dev_priv->display.get_pipe_config(crtc,
                                                           &pipe_config);
                WARN(crtc->active != active,