Commit 37235451 authored Feb 27, 2017 by Gabriel Krisman Bertazi Committed by Gerd Hoffmann Feb 28, 2017

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>

parent 3538e80a

drivers/gpu/drm/qxl/qxl_display.c

+1 −9

Original line number	Diff line number	Diff line
		@@ -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);