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

Commit 47fbf82b authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2018-06-12' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 



Only a small qxl fix that was queued for v4.17.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/08dcbd63-ed18-6232-7bbd-547a3d63b90f@linux.intel.com
parents 4216c1b9 889ad63d

drivers/gpu/drm/qxl/qxl_display.c

+5 −2
Original line number Diff line number Diff line
@@ -623,7 +623,7 @@ static void qxl_cursor_atomic_update(struct drm_plane *plane, 
	struct qxl_cursor_cmd *cmd;

	struct qxl_cursor *cursor;

	struct drm_gem_object *obj;

	struct qxl_bo *cursor_bo = NULL, *user_bo = NULL;

	struct qxl_bo *cursor_bo = NULL, *user_bo = NULL, *old_cursor_bo = NULL;

	int ret;

	void *user_ptr;

	int size = 64*64*4;
@@ -677,7 +677,7 @@ static void qxl_cursor_atomic_update(struct drm_plane *plane, 
							   cursor_bo, 0);

		cmd->type = QXL_CURSOR_SET;



		qxl_bo_unref(&qcrtc->cursor_bo);

		old_cursor_bo = qcrtc->cursor_bo;

		qcrtc->cursor_bo = cursor_bo;

		cursor_bo = NULL;

	} else {
@@ -697,6 +697,9 @@ static void qxl_cursor_atomic_update(struct drm_plane *plane, 
	qxl_push_cursor_ring_release(qdev, release, QXL_CMD_CURSOR, false);

	qxl_release_fence_buffer_objects(release);



	if (old_cursor_bo)

		qxl_bo_unref(&old_cursor_bo);



	qxl_bo_unref(&cursor_bo);



	return;