Commit 820e690e authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge tag 'drm-misc-next-fixes-2022-01-14' of... 

Merge tag 'drm-misc-next-fixes-2022-01-14' of git://anongit.freedesktop.org/drm/drm-misc

 into drm-next

 * atomic helpers: Fix error messages
 * mipi-dbi: Fix buffer mapping

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/YeGHu7qU92pjuQOn@linux-uq9g
parents 71e4a702 5d474cc5

drivers/gpu/drm/drm_atomic_helper.c

+6 −6
Original line number Diff line number Diff line
@@ -828,7 +828,7 @@ int drm_atomic_helper_check_plane_state(struct drm_plane_state *plane_state, 
	}



	if (!crtc_state->enable && !can_update_disabled) {

		drm_dbg_kms(plane_state->crtc->dev,

		drm_dbg_kms(plane_state->plane->dev,

			    "Cannot update plane of a disabled CRTC.\n");

		return -EINVAL;

	}
@@ -839,7 +839,7 @@ int drm_atomic_helper_check_plane_state(struct drm_plane_state *plane_state, 
	hscale = drm_rect_calc_hscale(src, dst, min_scale, max_scale);

	vscale = drm_rect_calc_vscale(src, dst, min_scale, max_scale);

	if (hscale < 0 || vscale < 0) {

		drm_dbg_kms(plane_state->crtc->dev,

		drm_dbg_kms(plane_state->plane->dev,

			    "Invalid scaling of plane\n");

		drm_rect_debug_print("src: ", &plane_state->src, true);

		drm_rect_debug_print("dst: ", &plane_state->dst, false);
@@ -864,7 +864,7 @@ int drm_atomic_helper_check_plane_state(struct drm_plane_state *plane_state, 
		return 0;



	if (!can_position && !drm_rect_equals(dst, &clip)) {

		drm_dbg_kms(plane_state->crtc->dev,

		drm_dbg_kms(plane_state->plane->dev,

			    "Plane must cover entire CRTC\n");

		drm_rect_debug_print("dst: ", dst, false);

		drm_rect_debug_print("clip: ", &clip, false);

drivers/gpu/drm/drm_mipi_dbi.c

+1 −1
Original line number Diff line number Diff line
@@ -209,11 +209,11 @@ int mipi_dbi_buf_copy(void *dst, struct drm_framebuffer *fb, 
	ret = drm_gem_fb_begin_cpu_access(fb, DMA_FROM_DEVICE);

	if (ret)

		return ret;

	src = data[0].vaddr; /* TODO: Use mapping abstraction properly */



	ret = drm_gem_fb_vmap(fb, map, data);

	if (ret)

		goto out_drm_gem_fb_end_cpu_access;

	src = data[0].vaddr; /* TODO: Use mapping abstraction properly */



	switch (fb->format->format) {

	case DRM_FORMAT_RGB565: