diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-09 09:41:32 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-20 13:36:51 -0700 |
| commit | d3ad7717c9fbfd738308b39d47bf830aad23f408 (patch) | |
| tree | fdfa9b56fb0b3149fe3c6e271c731a64a6e73256 | |
| parent | 7e8ceff067f0482ee15a7b0b944f958a00a3fac3 (diff) | |
| download | kernel-common-d3ad7717c9fbfd738308b39d47bf830aad23f408.tar.gz kernel-common-d3ad7717c9fbfd738308b39d47bf830aad23f408.tar.bz2 kernel-common-d3ad7717c9fbfd738308b39d47bf830aad23f408.zip | |
drm: Only decouple the old_fb from the crtc is we call mode_set*
commit 356ad3cd616185631235ffb48b3efbf39f9923b3 upstream.
Otherwise when disabling the output we switch to the new fb (which is
likely NULL) and skip the call to mode_set -- leaking driver private
state on the old_fb.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=29857
Reported-by: Sitsofe Wheeler <sitsofe@yahoo.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Dave Airlie <airlied@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/gpu/drm/drm_crtc_helper.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c index 9b2a54117c91..25d70d63646e 100644 --- a/drivers/gpu/drm/drm_crtc_helper.c +++ b/drivers/gpu/drm/drm_crtc_helper.c @@ -610,13 +610,13 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set) mode_changed = true; if (mode_changed) { - old_fb = set->crtc->fb; - set->crtc->fb = set->fb; set->crtc->enabled = (set->mode != NULL); if (set->mode != NULL) { DRM_DEBUG_KMS("attempting to set mode from" " userspace\n"); drm_mode_debug_printmodeline(set->mode); + old_fb = set->crtc->fb; + set->crtc->fb = set->fb; if (!drm_crtc_helper_set_mode(set->crtc, set->mode, set->x, set->y, old_fb)) { |