Explorar o código

drm/i915: Use the GM45 VGA hotplug workaround on G45 as well.

Although spec say CRT_HOTPLUG_ACTIVATION_PERIOD_64 is only useful for
mobile platform, it is also required to detect vga on G4x desktops correctly.
Tested on G45/G43/Q45 platforms with no regressions.

It fixed freedesktop.org bug #21120 and part of bug #21210

Signed-off-by: Ma Ling <ling.ma@intel.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Ma Ling %!s(int64=16) %!d(string=hai) anos
pai
achega
e92597cfff
Modificáronse 1 ficheiros con 1 adicións e 1 borrados
  1. 1 1
      drivers/gpu/drm/i915/intel_crt.c

+ 1 - 1
drivers/gpu/drm/i915/intel_crt.c

@@ -161,7 +161,7 @@ static bool intel_crt_detect_hotplug(struct drm_connector *connector)
 	hotplug_en &= CRT_FORCE_HOTPLUG_MASK;
 	hotplug_en &= CRT_FORCE_HOTPLUG_MASK;
 	hotplug_en |= CRT_HOTPLUG_FORCE_DETECT;
 	hotplug_en |= CRT_HOTPLUG_FORCE_DETECT;
 
 
-	if (IS_GM45(dev))
+	if (IS_G4X(dev))
 		hotplug_en |= CRT_HOTPLUG_ACTIVATION_PERIOD_64;
 		hotplug_en |= CRT_HOTPLUG_ACTIVATION_PERIOD_64;
 
 
 	hotplug_en |= CRT_HOTPLUG_VOLTAGE_COMPARE_50;
 	hotplug_en |= CRT_HOTPLUG_VOLTAGE_COMPARE_50;