Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5c1e84b authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Ben Skeggs
Browse files

drm/nouveau: hold mutex while syncing to kernel channel 



Not holding the mutex potentially causes corruption of the kernel
channel when page flipping.

Cc: stable@vger.kernel.org #3.13
Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 4019aaa2

drivers/gpu/drm/nouveau/nouveau_display.c

+8 −7
Original line number Diff line number Diff line
@@ -603,6 +603,14 @@ nouveau_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb, 
	if (!s)

		return -ENOMEM;



	if (new_bo != old_bo) {

		ret = nouveau_bo_pin(new_bo, TTM_PL_FLAG_VRAM);

		if (ret)

			goto fail_free;

	}



	mutex_lock(&chan->cli->mutex);



	/* synchronise rendering channel with the kernel's channel */

	spin_lock(&new_bo->bo.bdev->fence_lock);

	fence = nouveau_fence_ref(new_bo->bo.sync_obj);
@@ -612,13 +620,6 @@ nouveau_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb, 
	if (ret)

		goto fail_free;



	if (new_bo != old_bo) {

		ret = nouveau_bo_pin(new_bo, TTM_PL_FLAG_VRAM);

		if (ret)

			goto fail_free;

	}



	mutex_lock(&chan->cli->mutex);

	ret = ttm_bo_reserve(&old_bo->bo, true, false, false, NULL);

	if (ret)

		goto fail_unpin;