[Intel-gfx] [PATCH 1/2] drm/i915: check fb->pixel_format instead of bits_per_pixel

[Ville Syrjälä]

On Thu, Mar 28, 2013 at 01:49:26PM +0100, Daniel Vetter wrote:
> We've mostly switched over to the new more flexible schema, but
> there's one check left in the modeset code.

Having to do a full modeset for an fb change kind of sucks, but
as long as we're choosing the pipe bpp based on the primary plane
format I guess we don't have much of a choice.

> 
> Motivated by a question from Ville whether there's really no way an
> unsupported pixel_format can escape into our platform update_plane
> callbacks.
> 
> Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
> Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
> ---
>  drivers/gpu/drm/i915/intel_display.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 84bd8d3..8cbb65c 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -7956,8 +7956,8 @@ intel_set_config_compute_mode_changes(struct drm_mode_set *set,
>  			config->mode_changed = true;
>  		} else if (set->fb->depth != set->crtc->fb->depth) {
>  			config->mode_changed = true;

With the format check in place you can drop the depth check too.

> -		} else if (set->fb->bits_per_pixel !=
> -			   set->crtc->fb->bits_per_pixel) {
> +		} else if (set->fb->pixel_format !=
> +			   set->crtc->fb->pixel_format) {
>  			config->mode_changed = true;
>  		} else
>  			config->fb_changed = true;
> -- 
> 1.7.10.4

-- 
Ville Syrjälä
Intel OTC