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

Jesse Barnes jbarnes at virtuousgeek.org
Tue Jun 23 03:46:54 CEST 2009


On Mon, 22 Jun 2009 13:03:41 -0700
Jesse Barnes <jbarnes at virtuousgeek.org> 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

Caveat on this one; we've been using this bit and it has been working
for awhile.  I didn't see anything obvious that might have broken it,
but given that the docs I have don't list it I thought it was safest to
avoid it.

-- 
Jesse Barnes, Intel Open Source Technology Center



More information about the Intel-gfx mailing list