OSDN Git Service

drm/i915: Add PLANE_CUS_CTL restriction in max_width
authorVidya Srinivas <vidya.srinivas@intel.com>
Thu, 2 Dec 2021 11:08:36 +0000 (16:38 +0530)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Thu, 2 Dec 2021 12:54:28 +0000 (14:54 +0200)
PLANE_CUS_CTL has a restriction of 4096 width even though
PLANE_SIZE and scaler size registers supports max 5120.
Take care of this restriction in max_width.

Without this patch, when 5k content is sent on HDR plane
with NV12 content, FIFO underrun is seen and screen blanks
out.

v2: Addressed review comments from Ville. Added separate
functions for max_width - for HDR and SDR

v3: Addressed review comments from Ville. Changed names of
HDR and SDR max_width functions to icl_hdr_plane_max_width
and icl_sdr_plane_max_width

v4: Fixed paranthesis alignment. No code change

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Vidya Srinivas <vidya.srinivas@intel.com>
[vsyrjala: Fix alignment]
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211202110836.17536-1-vidya.srinivas@intel.com
drivers/gpu/drm/i915/display/skl_universal_plane.c

index 2889087..a8d1617 100644 (file)
@@ -420,9 +420,19 @@ static int icl_plane_min_width(const struct drm_framebuffer *fb,
        }
 }
 
-static int icl_plane_max_width(const struct drm_framebuffer *fb,
-                              int color_plane,
-                              unsigned int rotation)
+static int icl_hdr_plane_max_width(const struct drm_framebuffer *fb,
+                                  int color_plane,
+                                  unsigned int rotation)
+{
+       if (intel_format_info_is_yuv_semiplanar(fb->format, fb->modifier))
+               return 4096;
+       else
+               return 5120;
+}
+
+static int icl_sdr_plane_max_width(const struct drm_framebuffer *fb,
+                                  int color_plane,
+                                  unsigned int rotation)
 {
        return 5120;
 }
@@ -2108,7 +2118,10 @@ skl_universal_plane_create(struct drm_i915_private *dev_priv,
 
        if (DISPLAY_VER(dev_priv) >= 11) {
                plane->min_width = icl_plane_min_width;
-               plane->max_width = icl_plane_max_width;
+               if (icl_is_hdr_plane(dev_priv, plane_id))
+                       plane->max_width = icl_hdr_plane_max_width;
+               else
+                       plane->max_width = icl_sdr_plane_max_width;
                plane->max_height = icl_plane_max_height;
                plane->min_cdclk = icl_plane_min_cdclk;
        } else if (DISPLAY_VER(dev_priv) >= 10) {