All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ville Syrjala <ville.syrjala@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH 12/13] drm/i915: Move chv rotation checks to plane->check()
Date: Fri,  7 Sep 2018 18:24:12 +0300	[thread overview]
Message-ID: <20180907152413.15761-13-ville.syrjala@linux.intel.com> (raw)
In-Reply-To: <20180907152413.15761-1-ville.syrjala@linux.intel.com>

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

Move the chv rotation vs. reflections checks to the plane->check() hook,
away from the (now) platform agnostic
intel_plane_atomic_check_with_state().

Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_atomic_plane.c |  9 ---------
 drivers/gpu/drm/i915/intel_display.c      |  4 ++++
 drivers/gpu/drm/i915/intel_drv.h          |  1 +
 drivers/gpu/drm/i915/intel_sprite.c       | 21 +++++++++++++++++++++
 4 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.c b/drivers/gpu/drm/i915/intel_atomic_plane.c
index 7c0873060934..aabebe0d2e9b 100644
--- a/drivers/gpu/drm/i915/intel_atomic_plane.c
+++ b/drivers/gpu/drm/i915/intel_atomic_plane.c
@@ -113,7 +113,6 @@ int intel_plane_atomic_check_with_state(const struct intel_crtc_state *old_crtc_
 					struct intel_plane_state *intel_state)
 {
 	struct drm_plane *plane = intel_state->base.plane;
-	struct drm_i915_private *dev_priv = to_i915(plane->dev);
 	struct drm_plane_state *state = &intel_state->base;
 	struct intel_plane *intel_plane = to_intel_plane(plane);
 	int ret;
@@ -121,14 +120,6 @@ int intel_plane_atomic_check_with_state(const struct intel_crtc_state *old_crtc_
 	if (!intel_state->base.crtc && !old_plane_state->base.crtc)
 		return 0;
 
-	/* CHV ignores the mirror bit when the rotate bit is set :( */
-	if (IS_CHERRYVIEW(dev_priv) &&
-	    state->rotation & DRM_MODE_ROTATE_180 &&
-	    state->rotation & DRM_MODE_REFLECT_X) {
-		DRM_DEBUG_KMS("Cannot rotate and reflect at the same time\n");
-		return -EINVAL;
-	}
-
 	intel_state->base.visible = false;
 	ret = intel_plane->check_plane(crtc_state, intel_state);
 	if (ret)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 8be6c74395d8..1484e23b2bff 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3323,6 +3323,10 @@ i9xx_plane_check(struct intel_crtc_state *crtc_state,
 {
 	int ret;
 
+	ret = chv_plane_check_rotation(plane_state);
+	if (ret)
+		return ret;
+
 	ret = drm_atomic_helper_check_plane_state(&plane_state->base,
 						  &crtc_state->base,
 						  DRM_PLANE_HELPER_NO_SCALING,
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 118be54feb8e..bf1c38728a59 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -2141,6 +2141,7 @@ unsigned int skl_plane_max_stride(struct intel_plane *plane,
 int skl_plane_check(struct intel_crtc_state *crtc_state,
 		    struct intel_plane_state *plane_state);
 int intel_plane_check_src_coordinates(struct intel_plane_state *plane_state);
+int chv_plane_check_rotation(const struct intel_plane_state *plane_state);
 
 /* intel_tv.c */
 void intel_tv_init(struct drm_i915_private *dev_priv);
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index 206e9d055272..8821e59b70ea 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -1128,12 +1128,33 @@ g4x_sprite_check(struct intel_crtc_state *crtc_state,
 	return 0;
 }
 
+int chv_plane_check_rotation(const struct intel_plane_state *plane_state)
+{
+	struct intel_plane *plane = to_intel_plane(plane_state->base.plane);
+	struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
+	unsigned int rotation = plane_state->base.rotation;
+
+	/* CHV ignores the mirror bit when the rotate bit is set :( */
+	if (IS_CHERRYVIEW(dev_priv) &&
+	    rotation & DRM_MODE_ROTATE_180 &&
+	    rotation & DRM_MODE_REFLECT_X) {
+		DRM_DEBUG_KMS("Cannot rotate and reflect at the same time\n");
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
 static int
 vlv_sprite_check(struct intel_crtc_state *crtc_state,
 		 struct intel_plane_state *plane_state)
 {
 	int ret;
 
+	ret = chv_plane_check_rotation(plane_state);
+	if (ret)
+		return ret;
+
 	ret = drm_atomic_helper_check_plane_state(&plane_state->base,
 						  &crtc_state->base,
 						  DRM_PLANE_HELPER_NO_SCALING,
-- 
2.16.4

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2018-09-07 15:24 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-07 15:24 [PATCH 00/13] drm/i915: Display gtt remapping prep stuff Ville Syrjala
2018-09-07 15:24 ` [PATCH 01/13] drm/i915: s/tile_offset/aligned_offset/ etc Ville Syrjala
2018-09-07 15:24 ` [PATCH 02/13] drm/i915: Add .max_stride() plane hook Ville Syrjala
2018-09-07 15:24 ` [PATCH 03/13] drm/i915: Use pipe A primary plane .max_stride() as the global stride limit Ville Syrjala
2018-09-07 15:24 ` [PATCH 04/13] drm/i915: Rename the plane_state->main/aux to plane_state->color_plane[] Ville Syrjala
2018-09-07 15:30   ` Chris Wilson
2018-09-07 15:54     ` Ville Syrjälä
2018-09-07 15:24 ` [PATCH 05/13] drm/i915: Store the final plane stride in plane_state Ville Syrjala
2018-09-11 15:01   ` [PATCH v4 " Ville Syrjala
2018-09-07 15:24 ` [PATCH 06/13] drm/i915: Store ggtt_view " Ville Syrjala
2018-09-07 15:24 ` [PATCH 07/13] drm/i915: s/int plane/int color_plane/ Ville Syrjala
2018-09-07 15:24 ` [PATCH 08/13] drm/i915: Nuke plane->can_scale/min_downscale Ville Syrjala
2018-09-07 15:24 ` [PATCH 09/13] drm/i915: Extract per-platform plane->check() functions Ville Syrjala
2018-09-07 15:24 ` [PATCH 10/13] drm/i915: Move skl plane fb related checks into a better place Ville Syrjala
2018-09-07 15:24 ` [PATCH 11/13] drm/i915: Move display w/a #1175 Ville Syrjala
2018-09-07 15:24 ` Ville Syrjala [this message]
2018-09-07 15:24 ` [PATCH 13/13] drm/i915: Extract intel_cursor_check_surface() Ville Syrjala
2018-09-07 16:08 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Display gtt remapping prep stuff Patchwork
2018-09-07 16:13 ` ✗ Fi.CI.SPARSE: " Patchwork
2018-09-07 16:25 ` ✓ Fi.CI.BAT: success " Patchwork
2018-09-07 18:00 ` ✓ Fi.CI.IGT: " Patchwork
2018-09-11 16:40 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Display gtt remapping prep stuff (rev2) Patchwork
2018-09-11 16:45 ` ✗ Fi.CI.SPARSE: " Patchwork
2018-09-11 16:58 ` ✓ Fi.CI.BAT: success " Patchwork
2018-09-11 20:39 ` ✓ Fi.CI.IGT: " Patchwork
2018-09-12 15:13 ` [PATCH 00/13] drm/i915: Display gtt remapping prep stuff Ville Syrjälä

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180907152413.15761-13-ville.syrjala@linux.intel.com \
    --to=ville.syrjala@linux.intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.