drm/i915: Move is_ccs_modifier() to intel_fb.c

Move the function to intel_fb.c and rename it adding the intel_fb_
prefix following the naming of exported functions.

Cc: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211020195138.1841242-11-imre.deak@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index bf97a56..85cb550 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -2042,13 +2042,4 @@ to_intel_frontbuffer(struct drm_framebuffer *fb)
        return fb ? to_intel_framebuffer(fb)->frontbuffer : NULL;
 }
 
-static inline 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;
-}
-
 #endif /*  __INTEL_DISPLAY_TYPES_H__ */

diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c
index f5e1ad3..6b4b3fb 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fb.c
+++ b/drivers/gpu/drm/i915/display/intel_fb.c
@@ -264,6 +264,19 @@ static bool is_ccs_type_modifier(const struct intel_modifier_desc *md, u8 ccs_ty
        return md->ccs.type & ccs_type;
 }
 
+/**
+ * intel_fb_is_ccs_modifier: Check if a modifier is a CCS modifier type
+ * @modifier: Modifier to check
+ *
+ * Returns:
+ * Returns %true if @modifier is a render, render with color clear or
+ * media compression modifier.
+ */
+bool intel_fb_is_ccs_modifier(u64 modifier)
+{
+       return is_ccs_type_modifier(lookup_modifier(modifier), INTEL_CCS_ANY);
+}
+
 static bool check_modifier_display_ver_range(const struct intel_modifier_desc *md,
                                             u8 display_ver_from, u8 display_ver_until)
 {
@@ -457,7 +470,7 @@ bool is_surface_linear(const struct drm_framebuffer *fb, int color_plane)
 
 int main_to_ccs_plane(const struct drm_framebuffer *fb, int main_plane)
 {
-       drm_WARN_ON(fb->dev, !is_ccs_modifier(fb->modifier) ||
+       drm_WARN_ON(fb->dev, !intel_fb_is_ccs_modifier(fb->modifier) ||
                    (main_plane && main_plane >= fb->format->num_planes / 2));
 
        return fb->format->num_planes / 2 + main_plane;
@@ -465,7 +478,7 @@ int main_to_ccs_plane(const struct drm_framebuffer *fb, int main_plane)
 
 int skl_ccs_to_main_plane(const struct drm_framebuffer *fb, int ccs_plane)
 {
-       drm_WARN_ON(fb->dev, !is_ccs_modifier(fb->modifier) ||
+       drm_WARN_ON(fb->dev, !intel_fb_is_ccs_modifier(fb->modifier) ||
                    ccs_plane < fb->format->num_planes / 2);
 
        if (is_gen12_ccs_cc_plane(fb, ccs_plane))
@@ -510,7 +523,7 @@ int skl_main_to_aux_plane(const struct drm_framebuffer *fb, int main_plane)
 {
        struct drm_i915_private *i915 = to_i915(fb->dev);
 
-       if (is_ccs_modifier(fb->modifier))
+       if (intel_fb_is_ccs_modifier(fb->modifier))
                return main_to_ccs_plane(fb, main_plane);
        else if (DISPLAY_VER(i915) < 11 &&
                 intel_format_info_is_yuv_semiplanar(fb->format, fb->modifier))
@@ -1074,7 +1087,7 @@ static bool intel_plane_can_remap(const struct intel_plane_state *plane_state)
         * The new CCS hash mode isn't compatible with remapping as
         * the virtual address of the pages affects the compressed data.
         */
-       if (is_ccs_modifier(fb->modifier))
+       if (intel_fb_is_ccs_modifier(fb->modifier))
                return false;
 
        /* Linear needs a page aligned stride for remapping */
@@ -1481,7 +1494,7 @@ static void intel_plane_remap_gtt(struct intel_plane_state *plane_state)
        src_w = drm_rect_width(&plane_state->uapi.src) >> 16;
        src_h = drm_rect_height(&plane_state->uapi.src) >> 16;
 
-       drm_WARN_ON(&i915->drm, is_ccs_modifier(fb->modifier));
+       drm_WARN_ON(&i915->drm, intel_fb_is_ccs_modifier(fb->modifier));
 
        /* Make src coordinates relative to the viewport */
        drm_rect_translate(&plane_state->uapi.src,
@@ -1544,7 +1557,7 @@ u32 intel_fb_max_stride(struct drm_i915_private *dev_priv,
         *
         * The new CCS hash mode makes remapping impossible
         */
-       if (DISPLAY_VER(dev_priv) < 4 || is_ccs_modifier(modifier) ||
+       if (DISPLAY_VER(dev_priv) < 4 || intel_fb_is_ccs_modifier(modifier) ||
            intel_modifier_uses_dpt(dev_priv, modifier))
                return intel_plane_fb_max_stride(dev_priv, pixel_format, modifier);
        else if (DISPLAY_VER(dev_priv) >= 7)
@@ -1569,14 +1582,14 @@ intel_fb_stride_alignment(const struct drm_framebuffer *fb, int color_plane)
                 * we need the stride to be page aligned.
                 */
                if (fb->pitches[color_plane] > max_stride &&
-                   !is_ccs_modifier(fb->modifier))
+                   !intel_fb_is_ccs_modifier(fb->modifier))
                        return intel_tile_size(dev_priv);
                else
                        return 64;
        }
 
        tile_width = intel_tile_width_bytes(fb, color_plane);
-       if (is_ccs_modifier(fb->modifier)) {
+       if (intel_fb_is_ccs_modifier(fb->modifier)) {
                /*
                 * On ADL-P the stride must be either 8 tiles or a stride
                 * that is aligned to 16 tiles, required by the 16 tiles =

diff --git a/drivers/gpu/drm/i915/display/intel_fb.h b/drivers/gpu/drm/i915/display/intel_fb.h
index c80822b..f32306f 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fb.h
+++ b/drivers/gpu/drm/i915/display/intel_fb.h
@@ -27,6 +27,8 @@ enum intel_plane_caps {
        PLANE_HAS_CCS_MC = BIT(2),
 };
 
+bool intel_fb_is_ccs_modifier(u64 modifier);
+
 bool intel_fb_is_ccs_aux_plane(const struct drm_framebuffer *fb, int color_plane);
 int intel_fb_rc_ccs_cc_plane(const struct drm_framebuffer *fb);
 

diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
index cd17f03..e2d1c05 100644 (file)
--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
@@ -1183,7 +1183,7 @@ static int skl_plane_check_fb(const struct intel_crtc_state *crtc_state,
                return 0;
 
        if (rotation & ~(DRM_MODE_ROTATE_0 | DRM_MODE_ROTATE_180) &&
-           is_ccs_modifier(fb->modifier)) {
+           intel_fb_is_ccs_modifier(fb->modifier)) {
                drm_dbg_kms(&dev_priv->drm,
                            "RC support only with 0/180 degree rotation (%x)\n",
                            rotation);
@@ -1482,7 +1482,7 @@ static int skl_check_main_surface(struct intel_plane_state *plane_state)
         * CCS AUX surface doesn't have its own x/y offsets, we must make sure
         * they match with the main surface x/y offsets.
         */
-       if (is_ccs_modifier(fb->modifier)) {
+       if (intel_fb_is_ccs_modifier(fb->modifier)) {
                while (!skl_check_main_ccs_coordinates(plane_state, x, y,
                                                       offset, aux_plane)) {
                        if (offset == 0)
@@ -1546,7 +1546,7 @@ static int skl_check_nv12_aux_surface(struct intel_plane_state *plane_state)
        offset = intel_plane_compute_aligned_offset(&x, &y,
                                                    plane_state, uv_plane);
 
-       if (is_ccs_modifier(fb->modifier)) {
+       if (intel_fb_is_ccs_modifier(fb->modifier)) {
                int ccs_plane = main_to_ccs_plane(fb, uv_plane);
                u32 aux_offset = plane_state->view.color_plane[ccs_plane].offset;
                u32 alignment = intel_surf_alignment(fb, uv_plane);
@@ -1644,7 +1644,7 @@ static int skl_check_plane_surface(struct intel_plane_state *plane_state)
         * Handle the AUX surface first since the main surface setup depends on
         * it.
         */
-       if (is_ccs_modifier(fb->modifier)) {
+       if (intel_fb_is_ccs_modifier(fb->modifier)) {
                ret = skl_check_ccs_aux_surface(plane_state);
                if (ret)
                        return ret;
@@ -1845,7 +1845,7 @@ static bool skl_plane_format_mod_supported(struct drm_plane *_plane,
        case DRM_FORMAT_XBGR8888:
        case DRM_FORMAT_ARGB8888:
        case DRM_FORMAT_ABGR8888:
-               if (is_ccs_modifier(modifier))
+               if (intel_fb_is_ccs_modifier(modifier))
                        return true;
                fallthrough;
        case DRM_FORMAT_RGB565:
@@ -1899,7 +1899,7 @@ static bool gen12_plane_format_mod_supported(struct drm_plane *_plane,
        case DRM_FORMAT_XBGR8888:
        case DRM_FORMAT_ARGB8888:
        case DRM_FORMAT_ABGR8888:
-               if (is_ccs_modifier(modifier))
+               if (intel_fb_is_ccs_modifier(modifier))
                        return true;
                fallthrough;
        case DRM_FORMAT_YUYV: