drm/i915/tgl: Add Clear Color support for TGL Render Decompression

Render Decompression is supported with Y-Tiled main surface. The CCS is
linear and has 4 bits of data for each main surface cache line pair, a
ratio of 1:256. Additional Clear Color information is passed from the
user-space through an offset in the GEM BO. Add a new modifier to identify
and parse new Clear Color information and extend Gen12 render decompression
functionality to the newly added modifier.

v2: Fix has_alpha flag for modifiers, omit CC modifier during initial
    plane config(Matt). Fix Lookup error.
v3: Fix the panic while running kms_cube
v4: Add alignment check and reuse the comments for ge12_ccs_formats(Matt)
v5: Fix typos and wrap comments(Matt)
v6:
- Use format block descriptors to get the subsampling calculations for
  the CCS surface right.
- Use helpers to convert between main and CCS surfaces.
- Prevent coordinate checks for the CC surface.
- Simplify reading CC value from surface map, add description of CC val
  layout.
- Remove redundant ccval variable from skl_program_plane().
v7:
- Move the CC value readout after syncing against any GPU write on the
  FB obj (Nanley, Chris)
- Make sure the CC value readout works on platforms w/o struct pages
  (dGFX) and other non-coherent platforms wrt. CPU reads (none atm).
  (Chris)
v8:
- Rebase on the function param order change of
  i915_gem_object_read_from_page().
- Clarify code comment on the clear color value format and the required
  FB obj pinning/syncing by the caller.
- Remove redundant variables in
  intel_atomic_prepare_plane_clear_colors().
v9:
- Fix s/sizeof(&ccval)/sizeof(ccval)/ typo.

Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Cc: Ville Syrjala <ville.syrjala@intel.com>
Cc: Shashank Sharma <shashank.sharma@intel.com>
Cc: Rafael Antognolli <rafael.antognolli@intel.com>
Cc: Nanley G Chery <nanley.g.chery@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210115213952.1040398-1-imre.deak@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 16f3f47..2774c60 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -59,6 +59,8 @@
 #include "display/intel_tv.h"
 #include "display/intel_vdsc.h"
 
+#include "gem/i915_gem_object.h"
+
 #include "gt/intel_rps.h"
 
 #include "i915_drv.h"
@@ -1090,8 +1092,8 @@ static bool is_ccs_plane(const struct drm_framebuffer *fb, int plane)
 static bool is_gen12_ccs_modifier(u64 modifier)
 {
        return modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
+              modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC ||
               modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS;
-
 }
 
 static bool is_gen12_ccs_plane(const struct drm_framebuffer *fb, int plane)
@@ -1099,6 +1101,12 @@ static bool is_gen12_ccs_plane(const struct drm_framebuffer *fb, int plane)
        return is_gen12_ccs_modifier(fb->modifier) && is_ccs_plane(fb, plane);
 }
 
+static bool is_gen12_ccs_cc_plane(const struct drm_framebuffer *fb, int plane)
+{
+       return fb->modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC &&
+              plane == 2;
+}
+
 static bool is_aux_plane(const struct drm_framebuffer *fb, int plane)
 {
        if (is_ccs_modifier(fb->modifier))
@@ -1120,6 +1128,9 @@ static int ccs_to_main_plane(const struct drm_framebuffer *fb, int ccs_plane)
        drm_WARN_ON(fb->dev, !is_ccs_modifier(fb->modifier) ||
                    ccs_plane < fb->format->num_planes / 2);
 
+       if (is_gen12_ccs_cc_plane(fb, ccs_plane))
+               return 0;
+
        return ccs_plane - fb->format->num_planes / 2;
 }
 
@@ -1170,6 +1181,7 @@ intel_tile_width_bytes(const struct drm_framebuffer *fb, int color_plane)
                        return 128;
                fallthrough;
        case I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS:
+       case I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC:
        case I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS:
                if (is_ccs_plane(fb, color_plane))
                        return 64;
@@ -1326,6 +1338,7 @@ static unsigned int intel_surf_alignment(const struct drm_framebuffer *fb,
                        return intel_tile_row_size(fb, color_plane);
                fallthrough;
        case I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS:
+       case I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC:
                return 16 * 1024;
        case I915_FORMAT_MOD_Y_TILED_CCS:
        case I915_FORMAT_MOD_Yf_TILED_CCS:
@@ -1730,6 +1743,7 @@ static unsigned int intel_fb_modifier_to_tiling(u64 fb_modifier)
        case I915_FORMAT_MOD_Y_TILED:
        case I915_FORMAT_MOD_Y_TILED_CCS:
        case I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS:
+       case I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC:
        case I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS:
                return I915_TILING_Y;
        default:
@@ -1808,6 +1822,25 @@ static const struct drm_format_info gen12_ccs_formats[] = {
          .hsub = 2, .vsub = 2, .is_yuv = true },
 };
 
+/*
+ * Same as gen12_ccs_formats[] above, but with additional surface used
+ * to pass Clear Color information in plane 2 with 64 bits of data.
+ */
+static const struct drm_format_info gen12_ccs_cc_formats[] = {
+       { .format = DRM_FORMAT_XRGB8888, .depth = 24, .num_planes = 3,
+         .char_per_block = { 4, 1, 0 }, .block_w = { 1, 2, 2 }, .block_h = { 1, 1, 1 },
+         .hsub = 1, .vsub = 1, },
+       { .format = DRM_FORMAT_XBGR8888, .depth = 24, .num_planes = 3,
+         .char_per_block = { 4, 1, 0 }, .block_w = { 1, 2, 2 }, .block_h = { 1, 1, 1 },
+         .hsub = 1, .vsub = 1, },
+       { .format = DRM_FORMAT_ARGB8888, .depth = 32, .num_planes = 3,
+         .char_per_block = { 4, 1, 0 }, .block_w = { 1, 2, 2 }, .block_h = { 1, 1, 1 },
+         .hsub = 1, .vsub = 1, .has_alpha = true },
+       { .format = DRM_FORMAT_ABGR8888, .depth = 32, .num_planes = 3,
+         .char_per_block = { 4, 1, 0 }, .block_w = { 1, 2, 2 }, .block_h = { 1, 1, 1 },
+         .hsub = 1, .vsub = 1, .has_alpha = true },
+};
+
 static const struct drm_format_info *
 lookup_format_info(const struct drm_format_info formats[],
                   int num_formats, u32 format)
@@ -1836,6 +1869,10 @@ intel_get_format_info(const struct drm_mode_fb_cmd2 *cmd)
                return lookup_format_info(gen12_ccs_formats,
                                          ARRAY_SIZE(gen12_ccs_formats),
                                          cmd->pixel_format);
+       case I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC:
+               return lookup_format_info(gen12_ccs_cc_formats,
+                                         ARRAY_SIZE(gen12_ccs_cc_formats),
+                                         cmd->pixel_format);
        default:
                return NULL;
        }
@@ -1844,6 +1881,7 @@ intel_get_format_info(const struct drm_mode_fb_cmd2 *cmd)
 bool is_ccs_modifier(u64 modifier)
 {
        return modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
+              modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC ||
               modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS ||
               modifier == I915_FORMAT_MOD_Y_TILED_CCS ||
               modifier == I915_FORMAT_MOD_Yf_TILED_CCS;
@@ -2062,7 +2100,7 @@ intel_fb_check_ccs_xy(struct drm_framebuffer *fb, int ccs_plane, int x, int y)
        int ccs_x, ccs_y;
        int main_x, main_y;
 
-       if (!is_ccs_plane(fb, ccs_plane))
+       if (!is_ccs_plane(fb, ccs_plane) || is_gen12_ccs_cc_plane(fb, ccs_plane))
                return 0;
 
        intel_tile_dims(fb, ccs_plane, &tile_width, &tile_height);
@@ -2189,6 +2227,18 @@ intel_fill_fb_info(struct drm_i915_private *dev_priv,
                int x, y;
                int ret;
 
+               /*
+                * Plane 2 of Render Compression with Clear Color fb modifier
+                * is consumed by the driver and not passed to DE. Skip the
+                * arithmetic related to alignment and offset calculation.
+                */
+               if (is_gen12_ccs_cc_plane(fb, i)) {
+                       if (IS_ALIGNED(fb->offsets[i], PAGE_SIZE))
+                               continue;
+                       else
+                               return -EINVAL;
+               }
+
                cpp = fb->format->cpp[i];
                intel_fb_plane_dims(&width, &height, fb, i);
 
@@ -3130,7 +3180,8 @@ static int skl_check_ccs_aux_surface(struct intel_plane_state *plane_state)
                int hsub, vsub;
                int x, y;
 
-               if (!is_ccs_plane(fb, ccs_plane))
+               if (!is_ccs_plane(fb, ccs_plane) ||
+                   is_gen12_ccs_cc_plane(fb, ccs_plane))
                        continue;
 
                intel_fb_plane_get_subsampling(&main_hsub, &main_vsub, fb,
@@ -3370,6 +3421,7 @@ static u32 skl_plane_ctl_tiling(u64 fb_modifier)
        case I915_FORMAT_MOD_Y_TILED:
                return PLANE_CTL_TILED_Y;
        case I915_FORMAT_MOD_Y_TILED_CCS:
+       case I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC:
                return PLANE_CTL_TILED_Y | PLANE_CTL_RENDER_DECOMPRESSION_ENABLE;
        case I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS:
                return PLANE_CTL_TILED_Y |
@@ -13117,6 +13169,43 @@ static void intel_atomic_cleanup_work(struct work_struct *work)
        intel_atomic_helper_free_state(i915);
 }
 
+static void intel_atomic_prepare_plane_clear_colors(struct intel_atomic_state *state)
+{
+       struct drm_i915_private *i915 = to_i915(state->base.dev);
+       struct intel_plane *plane;
+       struct intel_plane_state *plane_state;
+       int i;
+
+       for_each_new_intel_plane_in_state(state, plane, plane_state, i) {
+               struct drm_framebuffer *fb = plane_state->hw.fb;
+               int ret;
+
+               if (!fb ||
+                   fb->modifier != I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC)
+                       continue;
+
+               /*
+                * The layout of the fast clear color value expected by HW
+                * (the DRM ABI requiring this value to be located in fb at offset 0 of plane#2):
+                * - 4 x 4 bytes per-channel value
+                *   (in surface type specific float/int format provided by the fb user)
+                * - 8 bytes native color value used by the display
+                *   (converted/written by GPU during a fast clear operation using the
+                *    above per-channel values)
+                *
+                * The commit's FB prepare hook already ensured that FB obj is pinned and the
+                * caller made sure that the object is synced wrt. the related color clear value
+                * GPU write on it.
+                */
+               ret = i915_gem_object_read_from_page(intel_fb_obj(fb),
+                                                    fb->offsets[2] + 16,
+                                                    &plane_state->ccval,
+                                                    sizeof(plane_state->ccval));
+               /* The above could only fail if the FB obj has an unexpected backing store type. */
+               drm_WARN_ON(&i915->drm, ret);
+       }
+}
+
 static void intel_atomic_commit_tail(struct intel_atomic_state *state)
 {
        struct drm_device *dev = state->base.dev;
@@ -13134,6 +13223,8 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)
        if (state->modeset)
                wakeref = intel_display_power_get(dev_priv, POWER_DOMAIN_MODESET);
 
+       intel_atomic_prepare_plane_clear_colors(state);
+
        for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state,
                                            new_crtc_state, i) {
                if (intel_crtc_needs_modeset(new_crtc_state) ||
@@ -14202,7 +14293,7 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb,
                        goto err;
                }
 
-               if (is_gen12_ccs_plane(fb, i)) {
+               if (is_gen12_ccs_plane(fb, i) && !is_gen12_ccs_cc_plane(fb, i)) {
                        int ccs_aux_stride = gen12_ccs_aux_stride(fb, i);
 
                        if (fb->pitches[i] != ccs_aux_stride) {

diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index 1a92434..927a8ae 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -631,6 +631,9 @@ struct intel_plane_state {
        struct drm_intel_sprite_colorkey ckey;
 
        struct drm_rect psr2_sel_fetch_area;
+
+       /* Clear Color Value */
+       u64 ccval;
 };
 
 struct intel_initial_plane_config {

diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c b/drivers/gpu/drm/i915/display/intel_sprite.c
index adc5f08..138b971 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_sprite.c
+++ b/drivers/gpu/drm/i915/display/intel_sprite.c
@@ -871,6 +871,10 @@ skl_program_plane(struct intel_plane *plane,
        if (fb->format->is_yuv && icl_is_hdr_plane(dev_priv, plane_id))
                icl_program_input_csc(plane, crtc_state, plane_state);
 
+       if (fb->modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC)
+               intel_uncore_write64_fw(&dev_priv->uncore,
+                                       PLANE_CC_VAL(pipe, plane_id), plane_state->ccval);
+
        skl_write_plane_wm(plane, crtc_state);
 
        intel_de_write_fw(dev_priv, PLANE_KEYVAL(pipe, plane_id),
@@ -2392,7 +2396,8 @@ static int skl_plane_check_fb(const struct intel_crtc_state *crtc_state,
             fb->modifier == I915_FORMAT_MOD_Y_TILED_CCS ||
             fb->modifier == I915_FORMAT_MOD_Yf_TILED_CCS ||
             fb->modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
-            fb->modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS)) {
+            fb->modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS ||
+            fb->modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC)) {
                drm_dbg_kms(&dev_priv->drm,
                            "Y/Yf tiling not supported in IF-ID mode\n");
                return -EINVAL;
@@ -2882,6 +2887,7 @@ static const u64 skl_plane_format_modifiers_ccs[] = {
 static const u64 gen12_plane_format_modifiers_mc_ccs[] = {
        I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS,
        I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS,
+       I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC,
        I915_FORMAT_MOD_Y_TILED,
        I915_FORMAT_MOD_X_TILED,
        DRM_FORMAT_MOD_LINEAR,
@@ -2890,6 +2896,7 @@ static const u64 gen12_plane_format_modifiers_mc_ccs[] = {
 
 static const u64 gen12_plane_format_modifiers_rc_ccs[] = {
        I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS,
+       I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC,
        I915_FORMAT_MOD_Y_TILED,
        I915_FORMAT_MOD_X_TILED,
        DRM_FORMAT_MOD_LINEAR,
@@ -3080,6 +3087,7 @@ static bool gen12_plane_format_mod_supported(struct drm_plane *_plane,
        case I915_FORMAT_MOD_X_TILED:
        case I915_FORMAT_MOD_Y_TILED:
        case I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS:
+       case I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC:
                break;
        default:
                return false;

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 249a815..8b9bbc6 100644 (file)
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -7070,6 +7070,8 @@ enum {
 #define _PLANE_KEYMAX_1_A                      0x701a0
 #define _PLANE_KEYMAX_2_A                      0x702a0
 #define  PLANE_KEYMAX_ALPHA(a)                 ((a) << 24)
+#define _PLANE_CC_VAL_1_A                      0x701b4
+#define _PLANE_CC_VAL_2_A                      0x702b4
 #define _PLANE_AUX_DIST_1_A                    0x701c0
 #define _PLANE_AUX_DIST_2_A                    0x702c0
 #define _PLANE_AUX_OFFSET_1_A                  0x701c4
@@ -7111,6 +7113,13 @@ enum {
 #define _PLANE_NV12_BUF_CFG_1_A                0x70278
 #define _PLANE_NV12_BUF_CFG_2_A                0x70378
 
+#define _PLANE_CC_VAL_1_B                      0x711b4
+#define _PLANE_CC_VAL_2_B                      0x712b4
+#define _PLANE_CC_VAL_1(pipe)  _PIPE(pipe, _PLANE_CC_VAL_1_A, _PLANE_CC_VAL_1_B)
+#define _PLANE_CC_VAL_2(pipe)  _PIPE(pipe, _PLANE_CC_VAL_2_A, _PLANE_CC_VAL_2_B)
+#define PLANE_CC_VAL(pipe, plane)      \
+       _MMIO_PLANE(plane, _PLANE_CC_VAL_1(pipe), _PLANE_CC_VAL_2(pipe))
+
 /* Input CSC Register Definitions */
 #define _PLANE_INPUT_CSC_RY_GY_1_A     0x701E0
 #define _PLANE_INPUT_CSC_RY_GY_2_A     0x702E0