Commit 37235451 authored by Gabriel Krisman Bertazi's avatar Gabriel Krisman Bertazi Committed by Gerd Hoffmann

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: default avatarGabriel Krisman Bertazi <krisman@collabora.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/20170227204328.18761-9-krisman@collabora.co.ukSigned-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 3538e80a
...@@ -491,15 +491,7 @@ static void qxl_crtc_commit(struct drm_crtc *crtc) ...@@ -491,15 +491,7 @@ static void qxl_crtc_commit(struct drm_crtc *crtc)
static void qxl_crtc_disable(struct drm_crtc *crtc) static void qxl_crtc_disable(struct drm_crtc *crtc)
{ {
struct qxl_crtc *qcrtc = to_qxl_crtc(crtc); struct qxl_crtc *qcrtc = to_qxl_crtc(crtc);
struct drm_device *dev = crtc->dev; struct qxl_device *qdev = crtc->dev->dev_private;
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;
}
qxl_monitors_config_set(qdev, qcrtc->index, 0, 0, 0, 0, 0); qxl_monitors_config_set(qdev, qcrtc->index, 0, 0, 0, 0, 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment