Skip to content

Commit

Permalink
drm/i915: don't update the fb base if there is no fb
Browse files Browse the repository at this point in the history
Otherwise we'll set_fb complains pretty loudly if we the crtc is off
and userspace moves the NULL fb around a bit. Yeah, this actually
happens in the wild ...

Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Daniel Vetter committed Sep 6, 2012
1 parent 431e50f commit 835c587
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -6828,7 +6828,7 @@ intel_set_config_compute_mode_changes(struct drm_mode_set *set,
config->fb_changed = true;
}

if (set->x != set->crtc->x || set->y != set->crtc->y)
if (set->fb && (set->x != set->crtc->x || set->y != set->crtc->y))
config->fb_changed = true;

if (set->mode && !drm_mode_equal(set->mode, &set->crtc->mode)) {
Expand Down

0 comments on commit 835c587

Please sign in to comment.