aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2013-03-28 11:01:35 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-03-28 11:55:03 -0400
commit72f4901e3c9b138d4ba5fd51e93eb97207c6eaca (patch)
tree69d44b4172fdcda4b862cbf6df857fe0b053b557 /drivers/gpu
parent1d5bfac96f1e1856fbdb3f06679691e5b9c2ba8f (diff)
drm/i915: check fb->pixel_format instead of bits_per_pixel
We've mostly switched over to the new more flexible schema, but there's one check left in the modeset code. Motivated by a question from Ville whether there's really no way an unsupported pixel_format can escape into our platform update_plane callbacks. v2: Ville noticed that the fb->depth check is redudant when we already check fb->pixel_format. Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 84bd8d36ce02..3f3a3dc7b4da 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -7954,10 +7954,8 @@ intel_set_config_compute_mode_changes(struct drm_mode_set *set,
7954 config->mode_changed = true; 7954 config->mode_changed = true;
7955 } else if (set->fb == NULL) { 7955 } else if (set->fb == NULL) {
7956 config->mode_changed = true; 7956 config->mode_changed = true;
7957 } else if (set->fb->depth != set->crtc->fb->depth) { 7957 } else if (set->fb->pixel_format !=
7958 config->mode_changed = true; 7958 set->crtc->fb->pixel_format) {
7959 } else if (set->fb->bits_per_pixel !=
7960 set->crtc->fb->bits_per_pixel) {
7961 config->mode_changed = true; 7959 config->mode_changed = true;
7962 } else 7960 } else
7963 config->fb_changed = true; 7961 config->fb_changed = true;