[PATCH] modes: Force output modes for manually enabled heads

Julien Cristau jcristau at debian.org
Thu Oct 8 10:03:03 PDT 2009


On Thu, Oct  8, 2009 at 17:43:16 +0100, Chris Wilson wrote:

> @@ -1564,8 +1550,24 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
>  	/*
>  	 * Check connection status
>  	 */
> -	output->status = (*output->funcs->detect)(output);
> -
> +	if (xf86GetOptValBool (output->options, OPTION_ENABLE, &user_enable) && user_enable)
> +	{
> +	    /* Was this output enabled in the config file? */
> +	    xf86DrvMsg (output->scrn->scrnIndex, X_INFO,
> +			"Output %s enabled by config file\n", output->name);
> +	    output->status = XF86OutputStatusConnected;
> +	}
> +	else if (xf86GetOptValBool (output->options, OPTION_DISABLE, &user_enable) && user_enable)
> +	{
> +	    /* Or was it explicitly disabled? */
> +	    xf86DrvMsg (output->scrn->scrnIndex, X_INFO,
> +			"Output %s disabled by config file\n", output->name);
> +	    output->status = XF86OutputStatusDisconnected;
> +	}

Both these messages should probably use X_CONFIG instead of X_INFO.

Cheers,
Julien


More information about the xorg-devel mailing list