[Intel-gfx] [PATCH] drm/i915: honor forced connector modes v2

[Daniel Vetter]

On Thu, Feb 20, 2014 at 12:28:07PM -0800, Jesse Barnes wrote:
> In the move over to use BIOS connector configs, we lost the ability to
> force a specific set of connectors on or off.  Try to remedy that by
> dropping back to the old behavior if we detect a hard coded connector
> config.
> 
> v2: don't deref connector state for disabled connectors (Jesse)
> 
> Reported-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>

Queued for -next, thanks for the patch.
-Daniel

> ---
>  drivers/gpu/drm/i915/intel_fbdev.c |   18 ++++++++++++++++++
>  1 file changed, 18 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
> index 7693728..5935544 100644
> --- a/drivers/gpu/drm/i915/intel_fbdev.c
> +++ b/drivers/gpu/drm/i915/intel_fbdev.c
> @@ -293,6 +293,24 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
>  	bool *save_enabled;
>  	bool any_enabled = false;
>  
> +	/*
> +	 * If the user specified any force options, just bail here
> +	 * and use that config.
> +	 */
> +	for (i = 0; i < fb_helper->connector_count; i++) {
> +		struct drm_fb_helper_connector *fb_conn;
> +		struct drm_connector *connector;
> +
> +		fb_conn = fb_helper->connector_info[i];
> +		connector = fb_conn->connector;
> +
> +		if (!enabled[i])
> +			continue;
> +
> +		if (connector->force != DRM_FORCE_UNSPECIFIED)
> +			return false;
> +	}
> +
>  	save_enabled = kcalloc(dev->mode_config.num_connector, sizeof(bool),
>  			       GFP_KERNEL);
>  	if (!save_enabled)
> -- 
> 1.7.9.5
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch