From: Daniel Vetter Date: Mon, 29 Apr 2013 16:29:19 +0000 (+0200) Subject: drm/i915: put the right cpu_transcoder into pipe_config for hw state readout X-Git-Tag: next-20130521~50^2~92 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=60c4ae101fdebdd1451e93f08161af3d78725cff;p=karo-tx-linux.git drm/i915: put the right cpu_transcoder into pipe_config for hw state readout 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 Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index dacfc6c90550..90bed0ab0fe2 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -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,