[Intel-gfx] [PATCH] drm/i915: only use CRT_HOTPLUG_FORCE_DETECT on 965+

[Eric Anholt]

On Mon, 2009-06-22 at 13:03 -0700, Jesse Barnes wrote:
> VGA detection on 945 and below shouldn't try to use
> CRT_HOTPLUG_FORCE_DETECT.  It's not documented and leads to flaky VGA
> detection on my AspireOne.
> 
> Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
> 
> diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
> index 6de97fc..c41cb00 100644
> --- a/drivers/gpu/drm/i915/intel_crt.c
> +++ b/drivers/gpu/drm/i915/intel_crt.c
> @@ -390,7 +390,7 @@ static enum drm_connector_status intel_crt_detect(struct drm_connector *connecto
>  	int dpms_mode;
>  	enum drm_connector_status status;
>  
> -	if (IS_I9XX(dev) && !IS_I915G(dev) && !IS_I915GM(dev)) {
> +	if (IS_I965G(dev)) {
>  		if (intel_crt_detect_hotplug(connector))
>  			return connector_status_connected;
>  		else

It's documented in mine for 945G, 945GM, and G33.  Are we just doing
hotplug detect wrong?

-- 
Eric Anholt
eric at anholt.net                         eric.anholt at intel.com


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part
URL: <http://lists.freedesktop.org/archives/intel-gfx/attachments/20090701/28cec165/attachment.sig>