summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorGabriel Krisman Bertazi <krisman@collabora.co.uk>2017-02-27 23:43:22 +0300
committerGerd Hoffmann <kraxel@redhat.com>2017-02-28 19:26:15 +0300
commit37235451c6990683a85ef7ee12de07136570751f (patch)
treea37459165e7b5692a959378f2c3f9fbacf932639 /drivers
parent3538e80a869be74764ae7db484b371894f04d0f8 (diff)
downloadlinux-37235451c6990683a85ef7ee12de07136570751f.tar.xz
drm: qxl: Atomic phase 1: Don't unpin primary when disabling crtc
In the qxl atomic model, the primary doesn't stay pinned all the time, instead it is only pinned/unpinned between prepare_fb and cleanup_fb. So, we no longer need a final unpin of the primary framebuffer when disabling the crtc. Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.co.uk> Link: http://patchwork.freedesktop.org/patch/msgid/20170227204328.18761-9-krisman@collabora.co.uk Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/qxl/qxl_display.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c
index b23979fad1e2..09c076f5a792 100644
--- a/drivers/gpu/drm/qxl/qxl_display.c
+++ b/drivers/gpu/drm/qxl/qxl_display.c
@@ -491,15 +491,7 @@ static void qxl_crtc_commit(struct drm_crtc *crtc)
static void qxl_crtc_disable(struct drm_crtc *crtc)
{
struct qxl_crtc *qcrtc = to_qxl_crtc(crtc);
- struct drm_device *dev = crtc->dev;
- struct qxl_device *qdev = dev->dev_private;
- if (crtc->primary->fb) {
- struct qxl_framebuffer *qfb = to_qxl_framebuffer(crtc->primary->fb);
- struct qxl_bo *bo = gem_to_qxl_bo(qfb->obj);
-
- qxl_bo_unpin(bo);
- crtc->primary->fb = NULL;
- }
+ struct qxl_device *qdev = crtc->dev->dev_private;
qxl_monitors_config_set(qdev, qcrtc->index, 0, 0, 0, 0, 0);