| Message ID | 20180309151450.20365-2-ville.syrjala@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, 2018-03-09 at 17:14 +0200, Ville Syrjala wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Replace the messy framebuffer format/modifier validation code > with a single call to drm_any_plane_has_format(). The code was > extremely annoying to maintain as you had to have a lot of platform > checks for different formats. The new code requires zero maintenance. > > v2: Nuke the modifier checks as well since the core does that too now > v3: Call drm_any_plane_has_format() from the driver code > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Patch looks good to me, but does not apply cleanly now. > --- > drivers/gpu/drm/i915/intel_display.c | 90 ++++-------------------- > ------------ > 1 file changed, 8 insertions(+), 82 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c > b/drivers/gpu/drm/i915/intel_display.c > index 2933ad38094f..7f06fa83d894 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -13989,7 +13989,6 @@ static int intel_framebuffer_init(struct > intel_framebuffer *intel_fb, > { > struct drm_i915_private *dev_priv = to_i915(obj->base.dev); > struct drm_framebuffer *fb = &intel_fb->base; > - struct drm_format_name_buf format_name; > u32 pitch_limit; > unsigned int tiling, stride; > int ret = -EINVAL; > @@ -14020,33 +14019,14 @@ static int intel_framebuffer_init(struct > intel_framebuffer *intel_fb, > } > } > > - /* Passed in modifier sanity checking. */ > - switch (mode_cmd->modifier[0]) { > - case I915_FORMAT_MOD_Y_TILED_CCS: > - case I915_FORMAT_MOD_Yf_TILED_CCS: > - switch (mode_cmd->pixel_format) { > - case DRM_FORMAT_XBGR8888: > - case DRM_FORMAT_ABGR8888: > - case DRM_FORMAT_XRGB8888: > - case DRM_FORMAT_ARGB8888: > - break; > - default: > - DRM_DEBUG_KMS("RC supported only with RGB8888 > formats\n"); > - goto err; > - } > - /* fall through */ > - case I915_FORMAT_MOD_Y_TILED: > - case I915_FORMAT_MOD_Yf_TILED: > - if (INTEL_GEN(dev_priv) < 9) { > - DRM_DEBUG_KMS("Unsupported tiling 0x%llx!\n", > - mode_cmd->modifier[0]); > - goto err; > - } > - case DRM_FORMAT_MOD_LINEAR: > - case I915_FORMAT_MOD_X_TILED: > - break; > - default: > - DRM_DEBUG_KMS("Unsupported fb modifier 0x%llx!\n", > + if (!drm_any_plane_has_format(&dev_priv->drm, > + mode_cmd->pixel_format, > + mode_cmd->modifier[0])) { > + struct drm_format_name_buf format_name; > + > + DRM_DEBUG_KMS("unsupported pixel format %s / modifier > 0x%llx\n", > + drm_get_format_name(mode_cmd- > >pixel_format, > + &format_name), > mode_cmd->modifier[0]); > goto err; > } > @@ -14081,60 +14061,6 @@ static int intel_framebuffer_init(struct > intel_framebuffer *intel_fb, > goto err; > } > > - /* Reject formats not supported by any plane early. */ > - switch (mode_cmd->pixel_format) { > - case DRM_FORMAT_C8: > - case DRM_FORMAT_RGB565: > - case DRM_FORMAT_XRGB8888: > - case DRM_FORMAT_ARGB8888: > - break; > - case DRM_FORMAT_XRGB1555: > - if (INTEL_GEN(dev_priv) > 3) { > - DRM_DEBUG_KMS("unsupported pixel format: %s\n", > - drm_get_format_name(mode_cmd- > >pixel_format, &format_name)); > - goto err; > - } > - break; > - case DRM_FORMAT_ABGR8888: > - if (!IS_VALLEYVIEW(dev_priv) && > !IS_CHERRYVIEW(dev_priv) && > - INTEL_GEN(dev_priv) < 9) { > - DRM_DEBUG_KMS("unsupported pixel format: %s\n", > - drm_get_format_name(mode_cmd- > >pixel_format, &format_name)); > - goto err; > - } > - break; > - case DRM_FORMAT_XBGR8888: > - case DRM_FORMAT_XRGB2101010: > - case DRM_FORMAT_XBGR2101010: > - if (INTEL_GEN(dev_priv) < 4) { > - DRM_DEBUG_KMS("unsupported pixel format: %s\n", > - drm_get_format_name(mode_cmd- > >pixel_format, &format_name)); > - goto err; > - } > - break; > - case DRM_FORMAT_ABGR2101010: > - if (!IS_VALLEYVIEW(dev_priv) && > !IS_CHERRYVIEW(dev_priv)) { > - DRM_DEBUG_KMS("unsupported pixel format: %s\n", > - drm_get_format_name(mode_cmd- > >pixel_format, &format_name)); > - goto err; > - } > - break; > - case DRM_FORMAT_YUYV: > - case DRM_FORMAT_UYVY: > - case DRM_FORMAT_YVYU: > - case DRM_FORMAT_VYUY: > - if (INTEL_GEN(dev_priv) < 5 && !IS_G4X(dev_priv)) { > - DRM_DEBUG_KMS("unsupported pixel format: %s\n", > - drm_get_format_name(mode_cmd- > >pixel_format, &format_name)); > - goto err; > - } > - break; > - default: > - DRM_DEBUG_KMS("unsupported pixel format: %s\n", > - drm_get_format_name(mode_cmd- > >pixel_format, &format_name)); > - goto err; > - } > - > /* FIXME need to adjust LINOFF/TILEOFF accordingly. */ > if (mode_cmd->offsets[0] != 0) > goto err;
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 2933ad38094f..7f06fa83d894 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -13989,7 +13989,6 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb, { struct drm_i915_private *dev_priv = to_i915(obj->base.dev); struct drm_framebuffer *fb = &intel_fb->base; - struct drm_format_name_buf format_name; u32 pitch_limit; unsigned int tiling, stride; int ret = -EINVAL; @@ -14020,33 +14019,14 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb, } } - /* Passed in modifier sanity checking. */ - switch (mode_cmd->modifier[0]) { - case I915_FORMAT_MOD_Y_TILED_CCS: - case I915_FORMAT_MOD_Yf_TILED_CCS: - switch (mode_cmd->pixel_format) { - case DRM_FORMAT_XBGR8888: - case DRM_FORMAT_ABGR8888: - case DRM_FORMAT_XRGB8888: - case DRM_FORMAT_ARGB8888: - break; - default: - DRM_DEBUG_KMS("RC supported only with RGB8888 formats\n"); - goto err; - } - /* fall through */ - case I915_FORMAT_MOD_Y_TILED: - case I915_FORMAT_MOD_Yf_TILED: - if (INTEL_GEN(dev_priv) < 9) { - DRM_DEBUG_KMS("Unsupported tiling 0x%llx!\n", - mode_cmd->modifier[0]); - goto err; - } - case DRM_FORMAT_MOD_LINEAR: - case I915_FORMAT_MOD_X_TILED: - break; - default: - DRM_DEBUG_KMS("Unsupported fb modifier 0x%llx!\n", + if (!drm_any_plane_has_format(&dev_priv->drm, + mode_cmd->pixel_format, + mode_cmd->modifier[0])) { + struct drm_format_name_buf format_name; + + DRM_DEBUG_KMS("unsupported pixel format %s / modifier 0x%llx\n", + drm_get_format_name(mode_cmd->pixel_format, + &format_name), mode_cmd->modifier[0]); goto err; } @@ -14081,60 +14061,6 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb, goto err; } - /* Reject formats not supported by any plane early. */ - switch (mode_cmd->pixel_format) { - case DRM_FORMAT_C8: - case DRM_FORMAT_RGB565: - case DRM_FORMAT_XRGB8888: - case DRM_FORMAT_ARGB8888: - break; - case DRM_FORMAT_XRGB1555: - if (INTEL_GEN(dev_priv) > 3) { - DRM_DEBUG_KMS("unsupported pixel format: %s\n", - drm_get_format_name(mode_cmd->pixel_format, &format_name)); - goto err; - } - break; - case DRM_FORMAT_ABGR8888: - if (!IS_VALLEYVIEW(dev_priv) && !IS_CHERRYVIEW(dev_priv) && - INTEL_GEN(dev_priv) < 9) { - DRM_DEBUG_KMS("unsupported pixel format: %s\n", - drm_get_format_name(mode_cmd->pixel_format, &format_name)); - goto err; - } - break; - case DRM_FORMAT_XBGR8888: - case DRM_FORMAT_XRGB2101010: - case DRM_FORMAT_XBGR2101010: - if (INTEL_GEN(dev_priv) < 4) { - DRM_DEBUG_KMS("unsupported pixel format: %s\n", - drm_get_format_name(mode_cmd->pixel_format, &format_name)); - goto err; - } - break; - case DRM_FORMAT_ABGR2101010: - if (!IS_VALLEYVIEW(dev_priv) && !IS_CHERRYVIEW(dev_priv)) { - DRM_DEBUG_KMS("unsupported pixel format: %s\n", - drm_get_format_name(mode_cmd->pixel_format, &format_name)); - goto err; - } - break; - case DRM_FORMAT_YUYV: - case DRM_FORMAT_UYVY: - case DRM_FORMAT_YVYU: - case DRM_FORMAT_VYUY: - if (INTEL_GEN(dev_priv) < 5 && !IS_G4X(dev_priv)) { - DRM_DEBUG_KMS("unsupported pixel format: %s\n", - drm_get_format_name(mode_cmd->pixel_format, &format_name)); - goto err; - } - break; - default: - DRM_DEBUG_KMS("unsupported pixel format: %s\n", - drm_get_format_name(mode_cmd->pixel_format, &format_name)); - goto err; - } - /* FIXME need to adjust LINOFF/TILEOFF accordingly. */ if (mode_cmd->offsets[0] != 0) goto err;