On Tuesday, August 1, 2017 3:47:53 PM PDT Ben Widawsky wrote: > On 17-08-01 15:43:50, Kenneth Graunke wrote: > >On Tuesday, August 1, 2017 9:58:17 AM PDT Ben Widawsky wrote: > >> v2: > >> - Support sprite plane. > >> - Support pipe C/D limitation on GEN9. > >> > >> v3: > >> - Rename structure (Ville) > >> - Handle GLK (Ville) > >> > >> v4: > >> - Fix PIPE_C check, introduced in v2 (Daniel) > >> - Whitespace fix (Daniel) > >> > >> Cc: Daniel Stone > >> Cc: Kristian Høgsberg > >> Signed-off-by: Ben Widawsky > >> --- > >> drivers/gpu/drm/i915/intel_display.c | 30 +++++++++++++++++++++++++++--- > >> drivers/gpu/drm/i915/intel_sprite.c | 28 +++++++++++++++++++++++++++- > >> 2 files changed, 54 insertions(+), 4 deletions(-) > >> > >> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > >> index ad49b99ef25f..0dc9f40edc7e 100644 > >> --- a/drivers/gpu/drm/i915/intel_display.c > >> +++ b/drivers/gpu/drm/i915/intel_display.c > >> @@ -93,7 +93,17 @@ static const uint32_t skl_primary_formats[] = { > >> DRM_FORMAT_VYUY, > >> }; > >> > >> -static const uint64_t skl_format_modifiers[] = { > >> +static const uint64_t skl_format_modifiers_noccs[] = { > >> + I915_FORMAT_MOD_Yf_TILED, > >> + I915_FORMAT_MOD_Y_TILED, > >> + I915_FORMAT_MOD_X_TILED, > >> + DRM_FORMAT_MOD_LINEAR, > >> + DRM_FORMAT_MOD_INVALID > >> +}; > >> + > >> +static const uint64_t skl_format_modifiers_ccs[] = { > >> + I915_FORMAT_MOD_Yf_TILED_CCS, > >> + I915_FORMAT_MOD_Y_TILED_CCS, > >> I915_FORMAT_MOD_Yf_TILED, > >> I915_FORMAT_MOD_Y_TILED, > >> I915_FORMAT_MOD_X_TILED, > >> @@ -13853,6 +13863,10 @@ static bool skl_mod_supported(uint32_t format, uint64_t modifier) > >> case DRM_FORMAT_XBGR8888: > >> case DRM_FORMAT_ARGB8888: > >> case DRM_FORMAT_ABGR8888: > >> + if (modifier == I915_FORMAT_MOD_Yf_TILED_CCS || > >> + modifier == I915_FORMAT_MOD_Y_TILED_CCS) > >> + return true; > >> + /* fall through */ > >> case DRM_FORMAT_RGB565: > >> case DRM_FORMAT_XRGB2101010: > >> case DRM_FORMAT_XBGR2101010: > >> @@ -14099,10 +14113,20 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) > >> primary->frontbuffer_bit = INTEL_FRONTBUFFER_PRIMARY(pipe); > >> primary->check_plane = intel_check_primary_plane; > >> > >> - if (INTEL_GEN(dev_priv) >= 9) { > >> + if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv)) { > >> + intel_primary_formats = skl_primary_formats; > >> + num_formats = ARRAY_SIZE(skl_primary_formats); > >> + modifiers = skl_format_modifiers_ccs; > >> + > >> + primary->update_plane = skylake_update_primary_plane; > >> + primary->disable_plane = skylake_disable_primary_plane; > >> + } else if (INTEL_GEN(dev_priv) >= 9) { > >> intel_primary_formats = skl_primary_formats; > >> num_formats = ARRAY_SIZE(skl_primary_formats); > >> - modifiers = skl_format_modifiers; > >> + if (pipe < PIPE_C) > >> + modifiers = skl_format_modifiers_ccs; > >> + else > >> + modifiers = skl_format_modifiers_noccs; > >> > >> primary->update_plane = skylake_update_primary_plane; > >> primary->disable_plane = skylake_disable_primary_plane; > >> diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c > >> index b1cc4835b963..5a2b3f3693a6 100644 > >> --- a/drivers/gpu/drm/i915/intel_sprite.c > >> +++ b/drivers/gpu/drm/i915/intel_sprite.c > >> @@ -1085,7 +1085,17 @@ static uint32_t skl_plane_formats[] = { > >> DRM_FORMAT_VYUY, > >> }; > >> > >> +static const uint64_t skl_plane_format_modifiers_noccs[] = { > >> + I915_FORMAT_MOD_Yf_TILED, > >> + I915_FORMAT_MOD_Y_TILED, > >> + I915_FORMAT_MOD_X_TILED, > >> + DRM_FORMAT_MOD_LINEAR, > >> + DRM_FORMAT_MOD_INVALID > >> +}; > >> + > >> static const uint64_t skl_plane_format_modifiers[] = { > >> + I915_FORMAT_MOD_Yf_TILED_CCS, > >> + I915_FORMAT_MOD_Y_TILED_CCS, > >> I915_FORMAT_MOD_Yf_TILED, > >> I915_FORMAT_MOD_Y_TILED, > >> I915_FORMAT_MOD_X_TILED, > >> @@ -1148,6 +1158,9 @@ static bool skl_sprite_plane_format_mod_supported(struct drm_plane *plane, > >> case DRM_FORMAT_XBGR8888: > >> case DRM_FORMAT_ARGB8888: > >> case DRM_FORMAT_ABGR8888: > >> + if (modifier == I915_FORMAT_MOD_Y_TILED_CCS || > >> + modifier == I915_FORMAT_MOD_Yf_TILED_CCS) > >> + return true; > >> case DRM_FORMAT_RGB565: > >> case DRM_FORMAT_XRGB2101010: > >> case DRM_FORMAT_XBGR2101010: > >> @@ -1230,7 +1243,7 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv, > >> } > >> intel_plane->base.state = &state->base; > >> > >> - if (INTEL_GEN(dev_priv) >= 9) { > >> + if (INTEL_GEN(dev_priv) >= 10) { > > > >I think this should be INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv). > > > >With that fixed, this patch would be: > >Reviewed-by: Kenneth Graunke > > > >for what it's worth (I'm not that familiar with display). > > > > Thanks. Here is what I've changed locally which didn't match the primary > support: > > diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c > index 5a2b3f3693a6..1c484195fd0f 100644 > --- a/drivers/gpu/drm/i915/intel_sprite.c > +++ b/drivers/gpu/drm/i915/intel_sprite.c > @@ -1093,7 +1093,7 @@ static const uint64_t skl_plane_format_modifiers_noccs[] = { > DRM_FORMAT_MOD_INVALID > }; > > -static const uint64_t skl_plane_format_modifiers[] = { > +static const uint64_t skl_plane_format_modifiers_ccs[] = { > I915_FORMAT_MOD_Yf_TILED_CCS, > I915_FORMAT_MOD_Y_TILED_CCS, > I915_FORMAT_MOD_Yf_TILED, > @@ -1243,7 +1243,7 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv, > } > intel_plane->base.state = &state->base; > > - if (INTEL_GEN(dev_priv) >= 10) { > + if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv)) { > intel_plane->can_scale = true; > state->scaler_id = -1; > > @@ -1252,7 +1252,7 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv, > > plane_formats = skl_plane_formats; > num_plane_formats = ARRAY_SIZE(skl_plane_formats); > - modifiers = skl_plane_format_modifiers; > + modifiers = skl_plane_format_modifiers_ccs; > } else if (INTEL_GEN(dev_priv) >= 9) { > intel_plane->can_scale = true; > state->scaler_id = -1; > @@ -1262,10 +1262,10 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv, > > plane_formats = skl_plane_formats; > num_plane_formats = ARRAY_SIZE(skl_plane_formats); > - if (pipe >= PIPE_C) > - modifiers = skl_plane_format_modifiers_noccs; > + if (pipe < PIPE_C) > + modifiers = skl_plane_format_modifiers_ccs; > else > - modifiers = skl_plane_format_modifiers; > + modifiers = skl_plane_format_modifiers_noccs; > } else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) { > intel_plane->can_scale = false; That looks good, with that squashed in, Reviewed-by: Kenneth Graunke