| From 42ec6e38ed7569d4ba3bcd99e2b8897addbefcb9 Mon Sep 17 00:00:00 2001 |
| From: Chris Wilson <chris@chris-wilson.co.uk> |
| Date: Mon, 26 Aug 2013 19:51:06 -0300 |
| Subject: drm/i915: Apply the force-detect VGA w/a to Valleyview |
| |
| It appears that Valleyview shares its VGA encoder with more recent |
| siblings and requires the same forced detection cycle after a hardware |
| reset before we can rely on hotplugging. |
| |
| Reported-and-tested-by: kobeqin <kobe.qin@intel.com> |
| Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=67733 |
| Tested-by: kobeqin <kobe.qin@intel.com> |
| Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> |
| [danvet: Check for gen >= 5 insted, acked by Chris.] |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| |
| (cherry picked from commit 10603caacf599297c7da0c4f4db440d015b8131a) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/intel_crt.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/gpu/drm/i915/intel_crt.c |
| +++ b/drivers/gpu/drm/i915/intel_crt.c |
| @@ -689,7 +689,7 @@ static void intel_crt_reset(struct drm_c |
| struct drm_i915_private *dev_priv = dev->dev_private; |
| struct intel_crt *crt = intel_attached_crt(connector); |
| |
| - if (HAS_PCH_SPLIT(dev)) { |
| + if (INTEL_INFO(dev)->gen >= 5) { |
| u32 adpa; |
| |
| adpa = I915_READ(crt->adpa_reg); |
