summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_crt.c
diff options
context:
space:
mode:
authorDaniel Vetter2014-01-16 22:28:44 +0100
committerDaniel Vetter2014-01-24 17:22:52 +0100
commit754970ee1a4b0a3ba0536ae1d22825a1cfb4c11b (patch)
treebe34c14b0f19afe53ae027b3107196a29196499b /drivers/gpu/drm/i915/intel_crt.c
parentdrm/i915: set the backlight panel delays registers to 1 (diff)
downloadkernel-qcow2-linux-754970ee1a4b0a3ba0536ae1d22825a1cfb4c11b.tar.gz
kernel-qcow2-linux-754970ee1a4b0a3ba0536ae1d22825a1cfb4c11b.tar.xz
kernel-qcow2-linux-754970ee1a4b0a3ba0536ae1d22825a1cfb4c11b.zip
drm/i915: Shuffle modeset reset handling around
Currently we're doing the reset handling a bit late, and we're doing it both in the driver load code and on resume. This makes it unusable for e.g. resetting the panel power sequence state like Paulo wants to. Instead of adding yet another single-use callback shuffle things around: - Output handling code is responsible to reset/init all state on its own at driver load time. - We call the reset functions much earlier, before we start using any of the modeset code. Compared to Paulo's new ->resume callback the only difference in placement is that ->reset is still called without dev->struct_mutex held. Which is imo a feature. v2: Rebase on top of the now merge dinq. Cc: Paulo Zanoni <przanoni@gmail.com> Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_crt.c')
-rw-r--r--drivers/gpu/drm/i915/intel_crt.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index e2e39e65f109..5b444a4b625c 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -857,4 +857,6 @@ void intel_crt_init(struct drm_device *dev)
dev_priv->fdi_rx_config = I915_READ(_FDI_RXA_CTL) & fdi_config;
}
+
+ intel_crt_reset(connector);
}