Commit 5acbdcd1 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/plane: convert to drm device based logging and WARN 



Prefer drm device based logging and WARN.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/9742b56ee0935a6b833f108ca8f72a29935853df.1642769982.git.jani.nikula@intel.com
parent 9d0bfa7a

drivers/gpu/drm/i915/display/intel_atomic_plane.c

+3 −2
Original line number Diff line number Diff line
@@ -601,6 +601,7 @@ int intel_atomic_plane_check_clipping(struct intel_plane_state *plane_state, 
				      int min_scale, int max_scale,

				      bool can_position)

{

	struct drm_i915_private *i915 = to_i915(plane_state->uapi.plane->dev);

	struct drm_framebuffer *fb = plane_state->hw.fb;

	struct drm_rect *src = &plane_state->uapi.src;

	struct drm_rect *dst = &plane_state->uapi.dst;
@@ -619,7 +620,7 @@ int intel_atomic_plane_check_clipping(struct intel_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_DEBUG_KMS("Invalid scaling of plane\n");

		drm_dbg_kms(&i915->drm, "Invalid scaling of plane\n");

		drm_rect_debug_print("src: ", src, true);

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

		return -ERANGE;
@@ -644,7 +645,7 @@ int intel_atomic_plane_check_clipping(struct intel_plane_state *plane_state, 


	if (!can_position && plane_state->uapi.visible &&

	    !drm_rect_equals(dst, &clip)) {

		DRM_DEBUG_KMS("Plane must cover entire CRTC\n");

		drm_dbg_kms(&i915->drm, "Plane must cover entire CRTC\n");

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

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

		return -EINVAL;

drivers/gpu/drm/i915/display/skl_universal_plane.c

+6 −4
Original line number Diff line number Diff line
@@ -961,6 +961,7 @@ static u32 glk_plane_color_ctl(const struct intel_crtc_state *crtc_state, 
static u32 skl_surf_address(const struct intel_plane_state *plane_state,

			    int color_plane)

{

	struct drm_i915_private *i915 = to_i915(plane_state->uapi.plane->dev);

	const struct drm_framebuffer *fb = plane_state->hw.fb;

	u32 offset = plane_state->view.color_plane[color_plane].offset;
@@ -969,11 +970,11 @@ static u32 skl_surf_address(const struct intel_plane_state *plane_state, 
		 * The DPT object contains only one vma, so the VMA's offset

		 * within the DPT is always 0.

		 */

		WARN_ON(plane_state->dpt_vma->node.start);

		WARN_ON(offset & 0x1fffff);

		drm_WARN_ON(&i915->drm, plane_state->dpt_vma->node.start);

		drm_WARN_ON(&i915->drm, offset & 0x1fffff);

		return offset >> 9;

	} else {

		WARN_ON(offset & 0xfff);

		drm_WARN_ON(&i915->drm, offset & 0xfff);

		return offset;

	}

}
@@ -1350,6 +1351,7 @@ static int skl_plane_check_dst_coordinates(const struct intel_crtc_state *crtc_s 


static int skl_plane_check_nv12_rotation(const struct intel_plane_state *plane_state)

{

	struct drm_i915_private *i915 = to_i915(plane_state->uapi.plane->dev);

	const struct drm_framebuffer *fb = plane_state->hw.fb;

	unsigned int rotation = plane_state->hw.rotation;

	int src_w = drm_rect_width(&plane_state->uapi.src) >> 16;
@@ -1359,7 +1361,7 @@ static int skl_plane_check_nv12_rotation(const struct intel_plane_state *plane_s 
	    src_w & 3 &&

	    (rotation == DRM_MODE_ROTATE_270 ||

	     rotation == (DRM_MODE_REFLECT_X | DRM_MODE_ROTATE_90))) {

		DRM_DEBUG_KMS("src width must be multiple of 4 for rotated planar YUV\n");

		drm_dbg_kms(&i915->drm, "src width must be multiple of 4 for rotated planar YUV\n");

		return -EINVAL;

	}