[PATCH 15/15] drm/i915: Add 90/270 rotation for NV12 format.

Chandra Konduru
2015-09-05T02:35:13Z

Adding NV12 90/270 rotation support for primary and sprite planes.

v2:
-For 90/270 adjust pixel boundary only in Y-direction (bspec)

v3:
-Rebased (me)

Signed-off-by: Chandra Konduru <chandra.konduru@intel.com>
Testcase: igt/kms_nv12
---
drivers/gpu/drm/i915/intel_display.c | 46 +++++++++++++++++++---------
drivers/gpu/drm/i915/intel_sprite.c | 56 ++++++++++++++++++++++------------
2 files changed, 69 insertions(+), 33 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 457b79b..4501e48 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3096,7 +3096,8 @@ static void skylake_update_primary_plane(struct drm_crtc *crtc,
int src_x = 0, src_y = 0, src_w = 0, src_h = 0;
int dst_x = 0, dst_y = 0, dst_w = 0, dst_h = 0;
int scaler_id = -1;
- u32 aux_dist = 0, aux_x_offset = 0, aux_y_offset = 0, aux_stride = 0;
+ unsigned long aux_dist = 0;
+ u32 aux_x_offset = 0, aux_y_offset = 0, aux_stride = 0;
u32 tile_row_adjustment = 0;
u32 hphase = 0, vphase = 0;

@@ -3155,12 +3156,16 @@ static void skylake_update_primary_plane(struct drm_crtc *crtc,
x_offset = stride * tile_height - y - src_h;
y_offset = x;
plane_size = (src_w - 1) << 16 | (src_h - 1);
- /*
- * TBD: For NV12 90/270 rotation, Y and UV subplanes should
- * be treated as separate surfaces and GTT remapping for
- * rotation should be done separately for each subplane.
- * Enable support once seperate remappings are available.
- */
+
+ if (fb->pixel_format == DRM_FORMAT_NV12) {
+ u32 uv_tile_height = intel_tile_height(dev, fb->pixel_format,
+ fb->modifier[0], 1);
+ aux_stride = DIV_ROUND_UP(fb->height / 2, uv_tile_height);
+ aux_dist = intel_plane_obj_offset(to_intel_plane(plane), obj, 1) -
+ surf_addr;
+ aux_x_offset = aux_stride * uv_tile_height - y / 2 - fb->height / 2;
+ aux_y_offset = x / 2;
+ }
} else {
stride = fb->pitches[0] / stride_div;
x_offset = x;
@@ -11708,8 +11713,13 @@ int intel_plane_atomic_calc_changes(struct drm_crtc_state *crtc_state,
if (fb && intel_format_is_yuv(fb->pixel_format)) {
bool can_scale = false;

- intel_plane_state->src.x1 &= ~0x10000;
- intel_plane_state->src.x2 &= ~0x10000;
+ if (intel_rotation_90_or_270(plane_state->rotation)) {
+ intel_plane_state->src.y1 &= ~0x10000;
+ intel_plane_state->src.y2 &= ~0x10000;
+ } else {
+ intel_plane_state->src.x1 &= ~0x10000;
+ intel_plane_state->src.x2 &= ~0x10000;
+ }

/* scaler use allowed when colorkey isn't requested */
if ((INTEL_INFO(dev)->gen >= 9) &&
@@ -11718,12 +11728,20 @@ int intel_plane_atomic_calc_changes(struct drm_crtc_state *crtc_state,

/* Must keep src and dst the same if we can't scale. */
if (!can_scale) {
- intel_plane_state->dst.x1 &= ~1;
- intel_plane_state->dst.x2 &= ~1;
+ if (intel_rotation_90_or_270(plane_state->rotation)) {
+ intel_plane_state->dst.y1 &= ~1;
+ intel_plane_state->dst.y2 &= ~1;
+
+ if (drm_rect_height(&intel_plane_state->dst) == 0)
+ intel_plane_state->visible = false;
+ } else {
+ intel_plane_state->dst.x1 &= ~1;
+ intel_plane_state->dst.x2 &= ~1;
+
+ if (drm_rect_width(&intel_plane_state->dst) == 0)
+ intel_plane_state->visible = false;
+ }
}
-
- if (drm_rect_width(&intel_plane_state->dst) == 0)
- intel_plane_state->visible = false;
}

if (crtc_state && INTEL_INFO(dev)->gen >= 9 &&
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index 07f88f3..3cf601d 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -188,7 +188,8 @@ skl_update_plane(struct drm_plane *drm_plane, struct drm_crtc *crtc,
int x_offset, y_offset;
struct intel_crtc_state *crtc_state = to_intel_crtc(crtc)->config;
int scaler_id;
- u32 aux_dist = 0, aux_x_offset = 0, aux_y_offset = 0, aux_stride = 0;
+ unsigned long aux_dist = 0;
+ u32 aux_x_offset = 0, aux_y_offset = 0, aux_stride = 0;
u32 tile_row_adjustment = 0;
u32 hphase = 0, vphase = 0;

@@ -238,12 +239,14 @@ skl_update_plane(struct drm_plane *drm_plane, struct drm_crtc *crtc,
x_offset = stride * tile_height - y - (src_h + 1);
y_offset = x;

- /*
- * TBD: For NV12 90/270 rotation, Y and UV subplanes should
- * be treated as separate surfaces and GTT remapping for
- * rotation should be done separately for each subplane.
- * Enable support once seperate remappings are available.
- */
+ if (fb->pixel_format == DRM_FORMAT_NV12) {
+ u32 uv_tile_height = intel_tile_height(dev, fb->pixel_format,
+ fb->modifier[0], 1);
+ aux_stride = DIV_ROUND_UP(fb->height / 2, uv_tile_height);
+ aux_dist = intel_plane_obj_offset(intel_plane, obj, 1) - surf_addr;
+ aux_x_offset = aux_stride * uv_tile_height - y / 2 - fb->height / 2;
+ aux_y_offset = x / 2;
+ }
} else {
stride = fb->pitches[0] / stride_div;
plane_size = (src_h << 16) | src_w;
@@ -904,18 +907,33 @@ intel_check_sprite_plane(struct drm_plane *plane,
src_h = drm_rect_height(src) >> 16;

if (intel_format_is_yuv(fb->pixel_format)) {
- src_x &= ~1;
- src_w &= ~1;
-
- /*
- * Must keep src and dst the
- * same if we can't scale.
- */
- if (!can_scale)
- crtc_w &= ~1;
-
- if (crtc_w == 0)
- state->visible = false;
+ if (intel_rotation_90_or_270(state->base.rotation)) {
+ src_y &= ~1;
+ src_h &= ~1;
+
+ /*
+ * Must keep src and dst the
+ * same if we can't scale.
+ */
+ if (!can_scale)
+ crtc_h &= ~1;
+
+ if (crtc_h == 0)
+ state->visible = false;
+ } else {
+ src_x &= ~1;
+ src_w &= ~1;
+
+ /*
+ * Must keep src and dst the
+ * same if we can't scale.
+ */
+ if (!can_scale)
+ crtc_w &= ~1;
+
+ if (crtc_w == 0)
+ state->visible = false;
+ }
}
}

--
1.7.9.5