Commit bd672b75 authored by Claudio Suarez's avatar Claudio Suarez Committed by Thomas Zimmermann
Browse files

drm: fix error found in some cases after the patch d1af5cd86997 



The patch d1af5cd86997 ("drm: get rid of DRM_DEBUG_* log
calls in drm core, files drm_a*.c") fails when the drm_device
cannot be found in the parameter plane_state->crtc.
Fix it using plane_state->plane.

Reported-by: default avatarkernel test robot <oliver.sang@intel.com>
Fixes: 6e22dc35 ("drm: get rid of DRM_DEBUG_* log calls in drm core, files drm_a*.c")
Signed-off-by: default avatarClaudio Suarez <cssk@net-c.es>
[danvet: fix Fixes: line]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/YaiXEARd8z2C463h@gineta.localdomain


(cherry picked from commit 521d459b)
Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
parent 69e63001

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);