Re: [Intel-gfx] [PATCH v2] drm/i915/tgl: Gen-12 display loses Yf tiling and legacy CCS support
On Wed, 2019-08-28 at 19:25 +0300, Ville Syrjälä wrote:
> On Tue, Aug 27, 2019 at 01:45:16AM -0700, Dhinakaran Pandiyan wrote:
> > Yf tiling was removed in gen-12, so do not expose Yf modifiers to user
> > space. Gen-12 display also is incompatible with pre-gen12 Y-tiled
> > CCS, so do not expose I915_FORMAT_MOD_Y_TILED_CCS.
> >
> > v2: Rebase to carry forward recently added gen11 formats.
> >
> > Cc: Ville Syrjälä
> > Cc: Stanislav Lisovskiy
> > Signed-off-by: Dhinakaran Pandiyan
> > Signed-off-by: Lucas De Marchi
>
> Reviewed-by: Ville Syrjälä
Thanks for reviewing this patch again, I'll rebase and send the render
decompression patches next.
Lucas,
Thanks for pushing the patch, I was attempting learn dim again :)
-DK
>
> > ---
> > drivers/gpu/drm/i915/display/intel_sprite.c | 86 +++--
> > 1 file changed, 80 insertions(+), 6 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c
> > b/drivers/gpu/drm/i915/display/intel_sprite.c
> > index dea63be1964f..8ca2fbc2af1d 100644
> > --- a/drivers/gpu/drm/i915/display/intel_sprite.c
> > +++ b/drivers/gpu/drm/i915/display/intel_sprite.c
> > @@ -2157,6 +2157,13 @@ static const u64 skl_plane_format_modifiers_ccs[] = {
> > DRM_FORMAT_MOD_INVALID
> > };
> >
> > +static const u64 gen12_plane_format_modifiers_noccs[] = {
> > + I915_FORMAT_MOD_Y_TILED,
> > + I915_FORMAT_MOD_X_TILED,
> > + DRM_FORMAT_MOD_LINEAR,
> > + DRM_FORMAT_MOD_INVALID
> > +};
> > +
> > static bool g4x_sprite_format_mod_supported(struct drm_plane *_plane,
> > u32 format, u64 modifier)
> > {
> > @@ -2305,6 +2312,55 @@ static bool skl_plane_format_mod_supported(struct
> > drm_plane *_plane,
> > }
> > }
> >
> > +static bool gen12_plane_format_mod_supported(struct drm_plane *_plane,
> > +u32 format, u64 modifier)
> > +{
> > + switch (modifier) {
> > + case DRM_FORMAT_MOD_LINEAR:
> > + case I915_FORMAT_MOD_X_TILED:
> > + case I915_FORMAT_MOD_Y_TILED:
> > + break;
> > + default:
> > + return false;
> > + }
> > +
> > + switch (format) {
> > + case DRM_FORMAT_XRGB:
> > + case DRM_FORMAT_XBGR:
> > + case DRM_FORMAT_ARGB:
> > + case DRM_FORMAT_ABGR:
> > + case DRM_FORMAT_RGB565:
> > + case DRM_FORMAT_XRGB2101010:
> > + case DRM_FORMAT_XBGR2101010:
> > + case DRM_FORMAT_YUYV:
> > + case DRM_FORMAT_YVYU:
> > + case DRM_FORMAT_UYVY:
> > + case DRM_FORMAT_VYUY:
> > + case DRM_FORMAT_NV12:
> > + case DRM_FORMAT_P010:
> > + case DRM_FORMAT_P012:
> > + case DRM_FORMAT_P016:
> > + case DRM_FORMAT_XVYU2101010:
> > + case DRM_FORMAT_C8:
> > + case DRM_FORMAT_XBGR16161616F:
> > + case DRM_FORMAT_ABGR16161616F:
> > + case DRM_FORMAT_XRGB16161616F:
> > + case DRM_FORMAT_ARGB16161616F:
> > + case DRM_FORMAT_Y210:
> > + case DRM_FORMAT_Y212:
> > + case DRM_FORMAT_Y216:
> > + case DRM_FORMAT_XVYU12_16161616:
> > + case DRM_FORMAT_XVYU16161616:
> > + if (modifier == DRM_FORMAT_MOD_LINEAR ||
> > + modifier == I915_FORMAT_MOD_X_TILED ||
> > + modifier == I915_FORMAT_MOD_Y_TILED)
> > + return true;
> > + /* fall through */
> > + default:
> > + return false;
> > + }
> > +}
> > +
> > static const struct drm_plane_funcs g4x_sprite_funcs = {
> > .update_plane = drm_atomic_helper_update_plane,
> > .disable_plane = drm_atomic_helper_disable_plane,
> > @@ -2341,6 +2397,15 @@ static const struct drm_plane_funcs skl_plane_funcs
> > = {
> > .format_mod_supported = skl_plane_format_mod_supported,
> > };
> >
> > +static const struct drm_plane_funcs gen12_plane_funcs = {
> > + .update_plane = drm_atomic_helper_update_plane,
> > + .disable_plane = drm_atomic_helper_disable_plane,
> > + .destroy = intel_plane_destroy,
> > + .atomic_duplicate_state = intel_plane_duplicate_state,
> > + .atomic_destroy_state = intel_plane_destroy_state,
> > + .format_mod_supported = gen12_plane_format_mod_supported,
> > +};
> > +
> > static bool skl_plane_has_fbc(struct drm_i915_private *dev_priv,
> > enum pipe pipe, enum plane_id plane_id)
> > {
> > @@ -2429,6 +2494,7 @@ struct intel_plane *
> > skl_universal_plane_create(struct drm_i915_private *dev_priv,
> >enum pipe pipe, enum plane_id plane_id)
> > {
> > + static const struct drm_plane_funcs *plane_funcs;
> > struct intel_plane *plane;
> > enum drm_plane_type plane_type;
> > unsigned int supported_rotations;
> > @@ -2471,11 +2537,19 @@ skl_universal_plane_create(struct drm_i915_private
> > *dev_priv,
> > formats = skl_get_plane_formats(dev_priv, pipe,
> > plane_id, &num_formats);
> >
> > - plane->has_ccs = skl_plane_has_ccs(dev_priv, pipe, plane_id);
> > - if (plane->has_ccs)
> > - modifiers = skl_plane_forma
Re: [Intel-gfx] [PATCH v2] drm/i915/tgl: Gen-12 display loses Yf tiling and legacy CCS support
On Tue, Aug 27, 2019 at 01:45:16AM -0700, Dhinakaran Pandiyan wrote:
> Yf tiling was removed in gen-12, so do not expose Yf modifiers to user
> space. Gen-12 display also is incompatible with pre-gen12 Y-tiled
> CCS, so do not expose I915_FORMAT_MOD_Y_TILED_CCS.
>
> v2: Rebase to carry forward recently added gen11 formats.
>
> Cc: Ville Syrjälä
> Cc: Stanislav Lisovskiy
> Signed-off-by: Dhinakaran Pandiyan
> Signed-off-by: Lucas De Marchi
Reviewed-by: Ville Syrjälä
> ---
> drivers/gpu/drm/i915/display/intel_sprite.c | 86 +++--
> 1 file changed, 80 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c
> b/drivers/gpu/drm/i915/display/intel_sprite.c
> index dea63be1964f..8ca2fbc2af1d 100644
> --- a/drivers/gpu/drm/i915/display/intel_sprite.c
> +++ b/drivers/gpu/drm/i915/display/intel_sprite.c
> @@ -2157,6 +2157,13 @@ static const u64 skl_plane_format_modifiers_ccs[] = {
> DRM_FORMAT_MOD_INVALID
> };
>
> +static const u64 gen12_plane_format_modifiers_noccs[] = {
> + I915_FORMAT_MOD_Y_TILED,
> + I915_FORMAT_MOD_X_TILED,
> + DRM_FORMAT_MOD_LINEAR,
> + DRM_FORMAT_MOD_INVALID
> +};
> +
> static bool g4x_sprite_format_mod_supported(struct drm_plane *_plane,
> u32 format, u64 modifier)
> {
> @@ -2305,6 +2312,55 @@ static bool skl_plane_format_mod_supported(struct
> drm_plane *_plane,
> }
> }
>
> +static bool gen12_plane_format_mod_supported(struct drm_plane *_plane,
> + u32 format, u64 modifier)
> +{
> + switch (modifier) {
> + case DRM_FORMAT_MOD_LINEAR:
> + case I915_FORMAT_MOD_X_TILED:
> + case I915_FORMAT_MOD_Y_TILED:
> + break;
> + default:
> + return false;
> + }
> +
> + switch (format) {
> + case DRM_FORMAT_XRGB:
> + case DRM_FORMAT_XBGR:
> + case DRM_FORMAT_ARGB:
> + case DRM_FORMAT_ABGR:
> + case DRM_FORMAT_RGB565:
> + case DRM_FORMAT_XRGB2101010:
> + case DRM_FORMAT_XBGR2101010:
> + case DRM_FORMAT_YUYV:
> + case DRM_FORMAT_YVYU:
> + case DRM_FORMAT_UYVY:
> + case DRM_FORMAT_VYUY:
> + case DRM_FORMAT_NV12:
> + case DRM_FORMAT_P010:
> + case DRM_FORMAT_P012:
> + case DRM_FORMAT_P016:
> + case DRM_FORMAT_XVYU2101010:
> + case DRM_FORMAT_C8:
> + case DRM_FORMAT_XBGR16161616F:
> + case DRM_FORMAT_ABGR16161616F:
> + case DRM_FORMAT_XRGB16161616F:
> + case DRM_FORMAT_ARGB16161616F:
> + case DRM_FORMAT_Y210:
> + case DRM_FORMAT_Y212:
> + case DRM_FORMAT_Y216:
> + case DRM_FORMAT_XVYU12_16161616:
> + case DRM_FORMAT_XVYU16161616:
> + if (modifier == DRM_FORMAT_MOD_LINEAR ||
> + modifier == I915_FORMAT_MOD_X_TILED ||
> + modifier == I915_FORMAT_MOD_Y_TILED)
> + return true;
> + /* fall through */
> + default:
> + return false;
> + }
> +}
> +
> static const struct drm_plane_funcs g4x_sprite_funcs = {
> .update_plane = drm_atomic_helper_update_plane,
> .disable_plane = drm_atomic_helper_disable_plane,
> @@ -2341,6 +2397,15 @@ static const struct drm_plane_funcs skl_plane_funcs = {
> .format_mod_supported = skl_plane_format_mod_supported,
> };
>
> +static const struct drm_plane_funcs gen12_plane_funcs = {
> + .update_plane = drm_atomic_helper_update_plane,
> + .disable_plane = drm_atomic_helper_disable_plane,
> + .destroy = intel_plane_destroy,
> + .atomic_duplicate_state = intel_plane_duplicate_state,
> + .atomic_destroy_state = intel_plane_destroy_state,
> + .format_mod_supported = gen12_plane_format_mod_supported,
> +};
> +
> static bool skl_plane_has_fbc(struct drm_i915_private *dev_priv,
> enum pipe pipe, enum plane_id plane_id)
> {
> @@ -2429,6 +2494,7 @@ struct intel_plane *
> skl_universal_plane_create(struct drm_i915_private *dev_priv,
> enum pipe pipe, enum plane_id plane_id)
> {
> + static const struct drm_plane_funcs *plane_funcs;
> struct intel_plane *plane;
> enum drm_plane_type plane_type;
> unsigned int supported_rotations;
> @@ -2471,11 +2537,19 @@ skl_universal_plane_create(struct drm_i915_private
> *dev_priv,
> formats = skl_get_plane_formats(dev_priv, pipe,
> plane_id, &num_formats);
>
> - plane->has_ccs = skl_plane_has_ccs(dev_priv, pipe, plane_id);
> - if (plane->has_ccs)
> - modifiers = skl_plane_format_modifiers_ccs;
> - else
> - modifiers = skl_plane_format_modifiers_noccs;
> + if (INTEL_GEN(dev_priv) >= 12) {
> + /* TODO: Implement support for gen-12 CCS modifiers */
> + plane->has_ccs = false;
> + modifiers = gen12_plane_format_modifiers_noccs;
> + plane_funcs = &gen12_plane
[Intel-gfx] [PATCH v2] drm/i915/tgl: Gen-12 display loses Yf tiling and legacy CCS support
Yf tiling was removed in gen-12, so do not expose Yf modifiers to user
space. Gen-12 display also is incompatible with pre-gen12 Y-tiled
CCS, so do not expose I915_FORMAT_MOD_Y_TILED_CCS.
v2: Rebase to carry forward recently added gen11 formats.
Cc: Ville Syrjälä
Cc: Stanislav Lisovskiy
Signed-off-by: Dhinakaran Pandiyan
Signed-off-by: Lucas De Marchi
---
drivers/gpu/drm/i915/display/intel_sprite.c | 86 +++--
1 file changed, 80 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c
b/drivers/gpu/drm/i915/display/intel_sprite.c
index dea63be1964f..8ca2fbc2af1d 100644
--- a/drivers/gpu/drm/i915/display/intel_sprite.c
+++ b/drivers/gpu/drm/i915/display/intel_sprite.c
@@ -2157,6 +2157,13 @@ static const u64 skl_plane_format_modifiers_ccs[] = {
DRM_FORMAT_MOD_INVALID
};
+static const u64 gen12_plane_format_modifiers_noccs[] = {
+ I915_FORMAT_MOD_Y_TILED,
+ I915_FORMAT_MOD_X_TILED,
+ DRM_FORMAT_MOD_LINEAR,
+ DRM_FORMAT_MOD_INVALID
+};
+
static bool g4x_sprite_format_mod_supported(struct drm_plane *_plane,
u32 format, u64 modifier)
{
@@ -2305,6 +2312,55 @@ static bool skl_plane_format_mod_supported(struct
drm_plane *_plane,
}
}
+static bool gen12_plane_format_mod_supported(struct drm_plane *_plane,
+u32 format, u64 modifier)
+{
+ switch (modifier) {
+ case DRM_FORMAT_MOD_LINEAR:
+ case I915_FORMAT_MOD_X_TILED:
+ case I915_FORMAT_MOD_Y_TILED:
+ break;
+ default:
+ return false;
+ }
+
+ switch (format) {
+ case DRM_FORMAT_XRGB:
+ case DRM_FORMAT_XBGR:
+ case DRM_FORMAT_ARGB:
+ case DRM_FORMAT_ABGR:
+ case DRM_FORMAT_RGB565:
+ case DRM_FORMAT_XRGB2101010:
+ case DRM_FORMAT_XBGR2101010:
+ case DRM_FORMAT_YUYV:
+ case DRM_FORMAT_YVYU:
+ case DRM_FORMAT_UYVY:
+ case DRM_FORMAT_VYUY:
+ case DRM_FORMAT_NV12:
+ case DRM_FORMAT_P010:
+ case DRM_FORMAT_P012:
+ case DRM_FORMAT_P016:
+ case DRM_FORMAT_XVYU2101010:
+ case DRM_FORMAT_C8:
+ case DRM_FORMAT_XBGR16161616F:
+ case DRM_FORMAT_ABGR16161616F:
+ case DRM_FORMAT_XRGB16161616F:
+ case DRM_FORMAT_ARGB16161616F:
+ case DRM_FORMAT_Y210:
+ case DRM_FORMAT_Y212:
+ case DRM_FORMAT_Y216:
+ case DRM_FORMAT_XVYU12_16161616:
+ case DRM_FORMAT_XVYU16161616:
+ if (modifier == DRM_FORMAT_MOD_LINEAR ||
+ modifier == I915_FORMAT_MOD_X_TILED ||
+ modifier == I915_FORMAT_MOD_Y_TILED)
+ return true;
+ /* fall through */
+ default:
+ return false;
+ }
+}
+
static const struct drm_plane_funcs g4x_sprite_funcs = {
.update_plane = drm_atomic_helper_update_plane,
.disable_plane = drm_atomic_helper_disable_plane,
@@ -2341,6 +2397,15 @@ static const struct drm_plane_funcs skl_plane_funcs = {
.format_mod_supported = skl_plane_format_mod_supported,
};
+static const struct drm_plane_funcs gen12_plane_funcs = {
+ .update_plane = drm_atomic_helper_update_plane,
+ .disable_plane = drm_atomic_helper_disable_plane,
+ .destroy = intel_plane_destroy,
+ .atomic_duplicate_state = intel_plane_duplicate_state,
+ .atomic_destroy_state = intel_plane_destroy_state,
+ .format_mod_supported = gen12_plane_format_mod_supported,
+};
+
static bool skl_plane_has_fbc(struct drm_i915_private *dev_priv,
enum pipe pipe, enum plane_id plane_id)
{
@@ -2429,6 +2494,7 @@ struct intel_plane *
skl_universal_plane_create(struct drm_i915_private *dev_priv,
enum pipe pipe, enum plane_id plane_id)
{
+ static const struct drm_plane_funcs *plane_funcs;
struct intel_plane *plane;
enum drm_plane_type plane_type;
unsigned int supported_rotations;
@@ -2471,11 +2537,19 @@ skl_universal_plane_create(struct drm_i915_private
*dev_priv,
formats = skl_get_plane_formats(dev_priv, pipe,
plane_id, &num_formats);
- plane->has_ccs = skl_plane_has_ccs(dev_priv, pipe, plane_id);
- if (plane->has_ccs)
- modifiers = skl_plane_format_modifiers_ccs;
- else
- modifiers = skl_plane_format_modifiers_noccs;
+ if (INTEL_GEN(dev_priv) >= 12) {
+ /* TODO: Implement support for gen-12 CCS modifiers */
+ plane->has_ccs = false;
+ modifiers = gen12_plane_format_modifiers_noccs;
+ plane_funcs = &gen12_plane_funcs;
+ } else {
+ plane->has_ccs = skl_plane_has_ccs(dev_priv, pipe, plane_id);
+ if (plane->has_ccs)
+ modifiers = skl_plane_format_modifiers
