diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-07-10 20:11:08 +0400 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-09-06 10:02:07 +0400 |
| commit | 835c5873d6e38cb317091ace7c1f3c40cc0607ce (patch) | |
| tree | 7f7f1bb48df98937649489b9f3742ba9ebccfb80 /drivers/gpu/drm/i915/intel_display.c | |
| parent | 431e50f799b356a899a63924883f2b0d1bfaf7b3 (diff) | |
| download | linux-835c5873d6e38cb317091ace7c1f3c40cc0607ce.tar.xz | |
drm/i915: don't update the fb base if there is no fb
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>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 71cb90d763bd..01d871b16f62 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -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)) { |