On Fri, Dec 22, 2017 at 09:22:27PM +0200, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> Split the g4x and snb cases into separate functions to match how we deal
> with all other platforms. Also sort the switch cases to match the format
> lists we've declared earlier, to ease comparisons.
>
> Cc: Ben Widawsky <ben@xxxxxxxxxxxx>
> Cc: Jason Ekstrand <jason@xxxxxxxxxxxxxx>
> Cc: Daniel Stone <daniels@xxxxxxxxxxxxx>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Reviewed-by: Daniel Vetter <daniel.vetter@xxxxxxxx>
> ---
> drivers/gpu/drm/i915/intel_sprite.c | 48 ++++++++++++++++++++++---------------
> 1 file changed, 29 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
> index 51bd79ad647a..349be8134c76 100644
> --- a/drivers/gpu/drm/i915/intel_sprite.c
> +++ b/drivers/gpu/drm/i915/intel_sprite.c
> @@ -1169,12 +1169,9 @@ static const uint64_t skl_plane_format_modifiers[] = {
> DRM_FORMAT_MOD_INVALID
> };
>
> -static bool g4x_sprite_plane_format_mod_supported(struct drm_plane *plane,
> - uint32_t format,
> - uint64_t modifier)
> +static bool g4x_mod_supported(uint32_t format, uint64_t modifier)
> {
> switch (format) {
> - case DRM_FORMAT_XBGR8888:
> case DRM_FORMAT_XRGB8888:
> case DRM_FORMAT_YUYV:
> case DRM_FORMAT_YVYU:
> @@ -1189,22 +1186,38 @@ static bool g4x_sprite_plane_format_mod_supported(struct drm_plane *plane,
> }
> }
>
> -static bool vlv_sprite_plane_format_mod_supported(struct drm_plane *plane,
> - uint32_t format,
> - uint64_t modifier)
> +static bool snb_mod_supported(uint32_t format, uint64_t modifier)
> {
> switch (format) {
> + case DRM_FORMAT_XRGB8888:
> + case DRM_FORMAT_XBGR8888:
> case DRM_FORMAT_YUYV:
> case DRM_FORMAT_YVYU:
> case DRM_FORMAT_UYVY:
> case DRM_FORMAT_VYUY:
> + if (modifier == DRM_FORMAT_MOD_LINEAR ||
> + modifier == I915_FORMAT_MOD_X_TILED)
> + return true;
> + /* fall through */
> + default:
> + return false;
> + }
> +}
> +
> +static bool vlv_mod_supported(uint32_t format, uint64_t modifier)
> +{
> + switch (format) {
> case DRM_FORMAT_RGB565:
> - case DRM_FORMAT_XRGB8888:
> + case DRM_FORMAT_ABGR8888:
> case DRM_FORMAT_ARGB8888:
> + case DRM_FORMAT_XBGR8888:
> + case DRM_FORMAT_XRGB8888:
> case DRM_FORMAT_XBGR2101010:
> case DRM_FORMAT_ABGR2101010:
> - case DRM_FORMAT_XBGR8888:
> - case DRM_FORMAT_ABGR8888:
> + case DRM_FORMAT_YUYV:
> + case DRM_FORMAT_YVYU:
> + case DRM_FORMAT_UYVY:
> + case DRM_FORMAT_VYUY:
> if (modifier == DRM_FORMAT_MOD_LINEAR ||
> modifier == I915_FORMAT_MOD_X_TILED)
> return true;
> @@ -1214,11 +1227,8 @@ static bool vlv_sprite_plane_format_mod_supported(struct drm_plane *plane,
> }
> }
>
> -static bool skl_sprite_plane_format_mod_supported(struct drm_plane *plane,
> - uint32_t format,
> - uint64_t modifier)
> +static bool skl_mod_supported(uint32_t format, uint64_t modifier)
> {
> - /* This is the same as primary plane since SKL has universal planes */
> switch (format) {
> case DRM_FORMAT_XRGB8888:
> case DRM_FORMAT_XBGR8888:
> @@ -1259,13 +1269,13 @@ static bool intel_sprite_plane_format_mod_supported(struct drm_plane *plane,
> return false;
>
> if (INTEL_GEN(dev_priv) >= 9)
> - return skl_sprite_plane_format_mod_supported(plane, format, modifier);
> + return skl_mod_supported(format, modifier);
> else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))
> - return vlv_sprite_plane_format_mod_supported(plane, format, modifier);
> + return vlv_mod_supported(format, modifier);
> + else if (INTEL_GEN(dev_priv) >= 6)
> + return snb_mod_supported(format, modifier);
> else
> - return g4x_sprite_plane_format_mod_supported(plane, format, modifier);
> -
> - unreachable();
> + return g4x_mod_supported(format, modifier);
> }
>
> static const struct drm_plane_funcs intel_sprite_plane_funcs = {
> --
> 2.13.6
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
