OSDN Git Service

drm/i915: skylake primary plane scaling using shared scalers
authorChandra Konduru <chandra.konduru@intel.com>
Mon, 27 Apr 2015 20:48:39 +0000 (13:48 -0700)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 8 May 2015 11:03:06 +0000 (13:03 +0200)
This patch enables skylake primary plane scaling using shared
scalers atomic desgin.

v2:
-use single copy of scaler limits (Matt)

v3:
-move detach_scalers to crtc commit path (Matt)
-use values in plane_state->src as regular integers (me)

v4:
-changes to align with updated scaler structures (Matt, me)
-keep plane src rect in 16.16 format (Matt, Daniel)

v5:
-Rebased on top of 90/270 rotation changes (me)
-Fixed an issue introduced by 90/270 changes where plane programming
 is using drm_plane->state rect instead of intel_plane->state rect.
 This change also required for scaling to work properly. (me)
-With 90/270, updated limits to cover both portrait and landscape usages (me)
-Refactored skylake_update_primary_plane to reduce its size (Daniel)
 Added helper functions for refactoring are comprehended enough to be
 used for skylake_update_plane (for sprite) too. One stop towards
 having single function for all planes.

v6:
-Added fixme note when checking plane_state->src width in update_plane (Daniel)
-Release lock when failing to colorkey request with active scaler (Daniel)

Signed-off-by: Chandra Konduru <chandra.konduru@intel.com>
Reviewed-by: matthew.d.roper@intel.com
Reviewed-by: sonika.jindal@intel.com (v5)
Testcase: igt/kms_plane_scaling
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_atomic.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_sprite.c

index 3c4b7cd..cb6d5f2 100644 (file)
@@ -169,7 +169,7 @@ int intel_atomic_commit(struct drm_device *dev,
                plane->state->state = NULL;
        }
 
-       /* swap crtc_state */
+       /* swap crtc_scaler_state */
        for (i = 0; i < dev->mode_config.num_crtc; i++) {
                struct drm_crtc *crtc = state->crtcs[i];
                if (!crtc) {
@@ -178,6 +178,9 @@ int intel_atomic_commit(struct drm_device *dev,
 
                to_intel_crtc(crtc)->config->scaler_state =
                        to_intel_crtc_state(state->crtc_states[i])->scaler_state;
+
+               if (INTEL_INFO(dev)->gen >= 9)
+                       skl_detach_scalers(to_intel_crtc(crtc));
        }
 
        drm_atomic_helper_commit_planes(dev, state);
index 3094b08..1470954 100644 (file)
@@ -2985,126 +2985,204 @@ void skl_detach_scalers(struct intel_crtc *intel_crtc)
        }
 }
 
-static void skylake_update_primary_plane(struct drm_crtc *crtc,
-                                        struct drm_framebuffer *fb,
-                                        int x, int y)
+u32 skl_plane_ctl_format(uint32_t pixel_format)
 {
-       struct drm_device *dev = crtc->dev;
-       struct drm_i915_private *dev_priv = dev->dev_private;
-       struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
-       struct drm_i915_gem_object *obj;
-       int pipe = intel_crtc->pipe;
-       u32 plane_ctl, stride_div, stride;
-       u32 tile_height, plane_offset, plane_size;
-       unsigned int rotation;
-       int x_offset, y_offset;
-       unsigned long surf_addr;
-       struct drm_plane *plane;
-
-       if (!intel_crtc->primary_enabled) {
-               I915_WRITE(PLANE_CTL(pipe, 0), 0);
-               I915_WRITE(PLANE_SURF(pipe, 0), 0);
-               POSTING_READ(PLANE_CTL(pipe, 0));
-               return;
-       }
-
-       plane_ctl = PLANE_CTL_ENABLE |
-                   PLANE_CTL_PIPE_GAMMA_ENABLE |
-                   PLANE_CTL_PIPE_CSC_ENABLE;
-
-       switch (fb->pixel_format) {
+       u32 plane_ctl_format = 0;
+       switch (pixel_format) {
        case DRM_FORMAT_RGB565:
-               plane_ctl |= PLANE_CTL_FORMAT_RGB_565;
-               break;
-       case DRM_FORMAT_XRGB8888:
-               plane_ctl |= PLANE_CTL_FORMAT_XRGB_8888;
-               break;
-       case DRM_FORMAT_ARGB8888:
-               plane_ctl |= PLANE_CTL_FORMAT_XRGB_8888;
-               plane_ctl |= PLANE_CTL_ALPHA_SW_PREMULTIPLY;
+               plane_ctl_format = PLANE_CTL_FORMAT_RGB_565;
                break;
        case DRM_FORMAT_XBGR8888:
-               plane_ctl |= PLANE_CTL_ORDER_RGBX;
-               plane_ctl |= PLANE_CTL_FORMAT_XRGB_8888;
+               plane_ctl_format = PLANE_CTL_FORMAT_XRGB_8888 | PLANE_CTL_ORDER_RGBX;
                break;
+       case DRM_FORMAT_XRGB8888:
+               plane_ctl_format = PLANE_CTL_FORMAT_XRGB_8888;
+               break;
+       /*
+        * XXX: For ARBG/ABGR formats we default to expecting scanout buffers
+        * to be already pre-multiplied. We need to add a knob (or a different
+        * DRM_FORMAT) for user-space to configure that.
+        */
        case DRM_FORMAT_ABGR8888:
-               plane_ctl |= PLANE_CTL_ORDER_RGBX;
-               plane_ctl |= PLANE_CTL_FORMAT_XRGB_8888;
-               plane_ctl |= PLANE_CTL_ALPHA_SW_PREMULTIPLY;
+               plane_ctl_format = PLANE_CTL_FORMAT_XRGB_8888 | PLANE_CTL_ORDER_RGBX |
+                       PLANE_CTL_ALPHA_SW_PREMULTIPLY;
+               break;
+       case DRM_FORMAT_ARGB8888:
+               plane_ctl_format = PLANE_CTL_FORMAT_XRGB_8888 |
+                       PLANE_CTL_ALPHA_SW_PREMULTIPLY;
                break;
        case DRM_FORMAT_XRGB2101010:
-               plane_ctl |= PLANE_CTL_FORMAT_XRGB_2101010;
+               plane_ctl_format = PLANE_CTL_FORMAT_XRGB_2101010;
                break;
        case DRM_FORMAT_XBGR2101010:
-               plane_ctl |= PLANE_CTL_ORDER_RGBX;
-               plane_ctl |= PLANE_CTL_FORMAT_XRGB_2101010;
+               plane_ctl_format = PLANE_CTL_ORDER_RGBX | PLANE_CTL_FORMAT_XRGB_2101010;
+               break;
+       case DRM_FORMAT_YUYV:
+               plane_ctl_format = PLANE_CTL_FORMAT_YUV422 | PLANE_CTL_YUV422_YUYV;
+               break;
+       case DRM_FORMAT_YVYU:
+               plane_ctl_format = PLANE_CTL_FORMAT_YUV422 | PLANE_CTL_YUV422_YVYU;
+               break;
+       case DRM_FORMAT_UYVY:
+               plane_ctl_format = PLANE_CTL_FORMAT_YUV422 | PLANE_CTL_YUV422_UYVY;
+               break;
+       case DRM_FORMAT_VYUY:
+               plane_ctl_format = PLANE_CTL_FORMAT_YUV422 | PLANE_CTL_YUV422_VYUY;
                break;
        default:
                BUG();
        }
+       return plane_ctl_format;
+}
 
-       switch (fb->modifier[0]) {
+u32 skl_plane_ctl_tiling(uint64_t fb_modifier)
+{
+       u32 plane_ctl_tiling = 0;
+       switch (fb_modifier) {
        case DRM_FORMAT_MOD_NONE:
                break;
        case I915_FORMAT_MOD_X_TILED:
-               plane_ctl |= PLANE_CTL_TILED_X;
+               plane_ctl_tiling = PLANE_CTL_TILED_X;
                break;
        case I915_FORMAT_MOD_Y_TILED:
-               plane_ctl |= PLANE_CTL_TILED_Y;
+               plane_ctl_tiling = PLANE_CTL_TILED_Y;
                break;
        case I915_FORMAT_MOD_Yf_TILED:
-               plane_ctl |= PLANE_CTL_TILED_YF;
+               plane_ctl_tiling = PLANE_CTL_TILED_YF;
                break;
        default:
-               MISSING_CASE(fb->modifier[0]);
+               MISSING_CASE(fb_modifier);
        }
+       return plane_ctl_tiling;
+}
 
-       plane_ctl |= PLANE_CTL_PLANE_GAMMA_DISABLE;
-
-       plane = crtc->primary;
-       rotation = plane->state->rotation;
+u32 skl_plane_ctl_rotation(unsigned int rotation)
+{
+       u32 plane_ctl_rotation = 0;
        switch (rotation) {
+       case BIT(DRM_ROTATE_0):
+               break;
        case BIT(DRM_ROTATE_90):
-               plane_ctl |= PLANE_CTL_ROTATE_90;
+               plane_ctl_rotation = PLANE_CTL_ROTATE_90;
                break;
-
        case BIT(DRM_ROTATE_180):
-               plane_ctl |= PLANE_CTL_ROTATE_180;
+               plane_ctl_rotation = PLANE_CTL_ROTATE_180;
                break;
-
        case BIT(DRM_ROTATE_270):
-               plane_ctl |= PLANE_CTL_ROTATE_270;
+               plane_ctl_rotation = PLANE_CTL_ROTATE_270;
                break;
+       default:
+               MISSING_CASE(rotation);
+       }
+
+       return plane_ctl_rotation;
+}
+
+static void skylake_update_primary_plane(struct drm_crtc *crtc,
+                                        struct drm_framebuffer *fb,
+                                        int x, int y)
+{
+       struct drm_device *dev = crtc->dev;
+       struct drm_i915_private *dev_priv = dev->dev_private;
+       struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
+       struct drm_i915_gem_object *obj;
+       int pipe = intel_crtc->pipe;
+       u32 plane_ctl, stride_div, stride;
+       u32 tile_height, plane_offset, plane_size;
+       unsigned int rotation;
+       int x_offset, y_offset;
+       unsigned long surf_addr;
+       struct drm_plane *plane;
+       struct intel_crtc_state *crtc_state = intel_crtc->config;
+       struct intel_plane_state *plane_state;
+       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;
+
+       plane = crtc->primary;
+       plane_state = to_intel_plane_state(plane->state);
+
+       if (!intel_crtc->primary_enabled) {
+               I915_WRITE(PLANE_CTL(pipe, 0), 0);
+               I915_WRITE(PLANE_SURF(pipe, 0), 0);
+               POSTING_READ(PLANE_CTL(pipe, 0));
+               return;
        }
 
+       plane_ctl = PLANE_CTL_ENABLE |
+                   PLANE_CTL_PIPE_GAMMA_ENABLE |
+                   PLANE_CTL_PIPE_CSC_ENABLE;
+
+       plane_ctl |= skl_plane_ctl_format(fb->pixel_format);
+       plane_ctl |= skl_plane_ctl_tiling(fb->modifier[0]);
+       plane_ctl |= PLANE_CTL_PLANE_GAMMA_DISABLE;
+
+       rotation = plane->state->rotation;
+       plane_ctl |= skl_plane_ctl_rotation(rotation);
+
        obj = intel_fb_obj(fb);
        stride_div = intel_fb_stride_alignment(dev, fb->modifier[0],
                                               fb->pixel_format);
        surf_addr = intel_plane_obj_offset(to_intel_plane(plane), obj);
 
+       /*
+        * FIXME: intel_plane_state->src, dst aren't set when transitional
+        * update_plane helpers are called from legacy paths.
+        * Once full atomic crtc is available, below check can be avoided.
+        */
+       if (drm_rect_width(&plane_state->src)) {
+               scaler_id = plane_state->scaler_id;
+               src_x = plane_state->src.x1 >> 16;
+               src_y = plane_state->src.y1 >> 16;
+               src_w = drm_rect_width(&plane_state->src) >> 16;
+               src_h = drm_rect_height(&plane_state->src) >> 16;
+               dst_x = plane_state->dst.x1;
+               dst_y = plane_state->dst.y1;
+               dst_w = drm_rect_width(&plane_state->dst);
+               dst_h = drm_rect_height(&plane_state->dst);
+
+               WARN_ON(x != src_x || y != src_y);
+       } else {
+               src_w = intel_crtc->config->pipe_src_w;
+               src_h = intel_crtc->config->pipe_src_h;
+       }
+
        if (intel_rotation_90_or_270(rotation)) {
                /* stride = Surface height in tiles */
                tile_height = intel_tile_height(dev, fb->bits_per_pixel,
                                                fb->modifier[0]);
                stride = DIV_ROUND_UP(fb->height, tile_height);
-               x_offset = stride * tile_height - y - (plane->state->src_h >> 16);
+               x_offset = stride * tile_height - y - src_h;
                y_offset = x;
-               plane_size = ((plane->state->src_w >> 16) - 1) << 16 |
-                                       ((plane->state->src_h >> 16) - 1);
+               plane_size = (src_w - 1) << 16 | (src_h - 1);
        } else {
                stride = fb->pitches[0] / stride_div;
                x_offset = x;
                y_offset = y;
-               plane_size = ((plane->state->src_h >> 16) - 1) << 16 |
-                       ((plane->state->src_w >> 16) - 1);
+               plane_size = (src_h - 1) << 16 | (src_w - 1);
        }
        plane_offset = y_offset << 16 | x_offset;
 
        I915_WRITE(PLANE_CTL(pipe, 0), plane_ctl);
-       I915_WRITE(PLANE_POS(pipe, 0), 0);
        I915_WRITE(PLANE_OFFSET(pipe, 0), plane_offset);
        I915_WRITE(PLANE_SIZE(pipe, 0), plane_size);
        I915_WRITE(PLANE_STRIDE(pipe, 0), stride);
+
+       if (scaler_id >= 0) {
+               uint32_t ps_ctrl = 0;
+
+               WARN_ON(!dst_w || !dst_h);
+               ps_ctrl = PS_SCALER_EN | PS_PLANE_SEL(0) |
+                       crtc_state->scaler_state.scalers[scaler_id].mode;
+               I915_WRITE(SKL_PS_CTRL(pipe, scaler_id), ps_ctrl);
+               I915_WRITE(SKL_PS_PWR_GATE(pipe, scaler_id), 0);
+               I915_WRITE(SKL_PS_WIN_POS(pipe, scaler_id), (dst_x << 16) | dst_y);
+               I915_WRITE(SKL_PS_WIN_SZ(pipe, scaler_id), (dst_w << 16) | dst_h);
+               I915_WRITE(PLANE_POS(pipe, 0), 0);
+       } else {
+               I915_WRITE(PLANE_POS(pipe, 0), (dst_y << 16) | dst_x);
+       }
+
        I915_WRITE(PLANE_SURF(pipe, 0), surf_addr);
 
        POSTING_READ(PLANE_SURF(pipe, 0));
@@ -4383,6 +4461,7 @@ skl_update_scaler_users(
        int *scaler_id;
        struct drm_framebuffer *fb;
        struct intel_crtc_scaler_state *scaler_state;
+       unsigned int rotation;
 
        if (!intel_crtc || !crtc_state)
                return 0;
@@ -4398,6 +4477,7 @@ skl_update_scaler_users(
                dst_w = drm_rect_width(&plane_state->dst);
                dst_h = drm_rect_height(&plane_state->dst);
                scaler_id = &plane_state->scaler_id;
+               rotation = plane_state->base.rotation;
        } else {
                struct drm_display_mode *adjusted_mode =
                        &crtc_state->base.adjusted_mode;
@@ -4406,8 +4486,12 @@ skl_update_scaler_users(
                dst_w = adjusted_mode->hdisplay;
                dst_h = adjusted_mode->vdisplay;
                scaler_id = &scaler_state->scaler_id;
+               rotation = DRM_ROTATE_0;
        }
-       need_scaling = (src_w != dst_w || src_h != dst_h);
+
+       need_scaling = intel_rotation_90_or_270(rotation) ?
+               (src_h != dst_w || src_w != dst_h):
+               (src_w != dst_w || src_h != dst_h);
 
        /*
         * if plane is being disabled or scaler is no more required or force detach
@@ -13133,6 +13217,36 @@ intel_cleanup_plane_fb(struct drm_plane *plane,
        }
 }
 
+int
+skl_max_scale(struct intel_crtc *intel_crtc, struct intel_crtc_state *crtc_state)
+{
+       int max_scale;
+       struct drm_device *dev;
+       struct drm_i915_private *dev_priv;
+       int crtc_clock, cdclk;
+
+       if (!intel_crtc || !crtc_state)
+               return DRM_PLANE_HELPER_NO_SCALING;
+
+       dev = intel_crtc->base.dev;
+       dev_priv = dev->dev_private;
+       crtc_clock = crtc_state->base.adjusted_mode.crtc_clock;
+       cdclk = dev_priv->display.get_display_clock_speed(dev);
+
+       if (!crtc_clock || !cdclk)
+               return DRM_PLANE_HELPER_NO_SCALING;
+
+       /*
+        * skl max scale is lower of:
+        *    close to 3 but not 3, -1 is for that purpose
+        *            or
+        *    cdclk/crtc_clock
+        */
+       max_scale = min((1 << 16) * 3 - 1, (1 << 8) * ((cdclk << 8) / crtc_clock));
+
+       return max_scale;
+}
+
 static int
 intel_check_primary_plane(struct drm_plane *plane,
                          struct intel_plane_state *state)
@@ -13141,23 +13255,31 @@ intel_check_primary_plane(struct drm_plane *plane,
        struct drm_i915_private *dev_priv = dev->dev_private;
        struct drm_crtc *crtc = state->base.crtc;
        struct intel_crtc *intel_crtc;
+       struct intel_crtc_state *crtc_state;
        struct drm_framebuffer *fb = state->base.fb;
        struct drm_rect *dest = &state->dst;
        struct drm_rect *src = &state->src;
        const struct drm_rect *clip = &state->clip;
        bool can_position = false;
+       int max_scale = DRM_PLANE_HELPER_NO_SCALING;
+       int min_scale = DRM_PLANE_HELPER_NO_SCALING;
        int ret;
 
        crtc = crtc ? crtc : plane->crtc;
        intel_crtc = to_intel_crtc(crtc);
+       crtc_state = state->base.state ?
+               intel_atomic_get_crtc_state(state->base.state, intel_crtc) : NULL;
 
-       if (INTEL_INFO(dev)->gen >= 9)
+       if (INTEL_INFO(dev)->gen >= 9) {
+               min_scale = 1;
+               max_scale = skl_max_scale(intel_crtc, crtc_state);
                can_position = true;
+       }
 
        ret = drm_plane_helper_check_update(plane, crtc, fb,
                                            src, dest, clip,
-                                           DRM_PLANE_HELPER_NO_SCALING,
-                                           DRM_PLANE_HELPER_NO_SCALING,
+                                           min_scale,
+                                           max_scale,
                                            can_position, true,
                                            &state->visible);
        if (ret)
@@ -13202,6 +13324,13 @@ intel_check_primary_plane(struct drm_plane *plane,
                        intel_crtc->atomic.update_wm = true;
        }
 
+       if (INTEL_INFO(dev)->gen >= 9) {
+               ret = skl_update_scaler_users(intel_crtc, crtc_state,
+                       to_intel_plane(plane), state, 0);
+               if (ret)
+                       return ret;
+       }
+
        return 0;
 }
 
@@ -13381,6 +13510,9 @@ static struct drm_plane *intel_primary_plane_create(struct drm_device *dev,
 
        primary->can_scale = false;
        primary->max_downscale = 1;
+       if (INTEL_INFO(dev)->gen >= 9) {
+               primary->can_scale = true;
+       }
        state->scaler_id = -1;
        primary->pipe = pipe;
        primary->plane = pipe;
index 43fe003..fb8797f 100644 (file)
@@ -285,11 +285,11 @@ struct intel_initial_plane_config {
 #define SKL_MIN_SRC_W 8
 #define SKL_MAX_SRC_W 4096
 #define SKL_MIN_SRC_H 8
-#define SKL_MAX_SRC_H 2304
+#define SKL_MAX_SRC_H 4096
 #define SKL_MIN_DST_W 8
 #define SKL_MAX_DST_W 4096
 #define SKL_MIN_DST_H 8
-#define SKL_MAX_DST_H 2304
+#define SKL_MAX_DST_H 4096
 
 struct intel_scaler {
        int id;
@@ -1145,9 +1145,13 @@ void skl_detach_scalers(struct intel_crtc *intel_crtc);
 int skl_update_scaler_users(struct intel_crtc *intel_crtc,
        struct intel_crtc_state *crtc_state, struct intel_plane *intel_plane,
        struct intel_plane_state *plane_state, int force_detach);
+int skl_max_scale(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state);
 
 unsigned long intel_plane_obj_offset(struct intel_plane *intel_plane,
                                     struct drm_i915_gem_object *obj);
+u32 skl_plane_ctl_format(uint32_t pixel_format);
+u32 skl_plane_ctl_tiling(uint64_t fb_modifier);
+u32 skl_plane_ctl_rotation(unsigned int rotation);
 
 /* intel_dp.c */
 void intel_dp_init(struct drm_device *dev, int output_reg, enum port port);
index e3d41c0..b3c5911 100644 (file)
@@ -1150,6 +1150,16 @@ int intel_sprite_set_colorkey(struct drm_device *dev, void *data,
        }
 
        intel_plane = to_intel_plane(plane);
+
+       if (INTEL_INFO(dev)->gen >= 9) {
+               /* plane scaling and colorkey are mutually exclusive */
+               if (to_intel_plane_state(plane->state)->scaler_id >= 0) {
+                       DRM_ERROR("colorkey not allowed with scaler\n");
+                       ret = -EINVAL;
+                       goto out_unlock;
+               }
+       }
+
        intel_plane->ckey = *set;
 
        /*