| Message ID | 1523621644-32363-4-git-send-email-vidya.srinivas@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Apr 13, 2018 at 5:18 AM Vidya Srinivas <vidya.srinivas@intel.com> wrote: > From: Chandra Konduru <chandra.konduru@intel.com> > This patch adds NV12 to list of supported formats for sprite plane. > v2: Rebased (me) > v3: Review comments by Ville addressed > - Removed skl_plane_formats_with_nv12 and added > NV12 case in existing skl_plane_formats > - Added the 10bpc RGB formats > v4: Addressed review comments from Clinton A Taylor > "Why are we adding 10 bit RGB formats with the NV12 series patches? > Trying to set XR30 or AB30 results in error returned even though > the modes are advertised for the planes" > - Removed 10bit RGB formats added previously with NV12 series > v5: Missed the Tested-by/Reviewed-by in the previous series > Adding the same to commit message in this version. > Addressed review comments from Clinton A Taylor > "Why are we adding 10 bit RGB formats with the NV12 series patches? > Trying to set XR30 or AB30 results in error returned even though > the modes are advertised for the planes" > - Previous version has 10bit RGB format removed from VLV formats > by mistake. Fixing that in this version. > Removed 10bit RGB formats added previously with NV12 series > for SKL. > v6: Addressed review comments by Ville > Restricting the NV12 to BXT and PIPE A and B > v7: Rebased (me) > v8: Rebased (me) > Restricting NV12 changes to BXT and KBL > Restricting NV12 changes for plane 0 (overlay) > v9: Rebased (me) > v10: Addressed review comments from Maarten. > Adding NV12 to skl_plane_formats itself. > v11: Addressed review comments from Shashank Sharma > v12: Addressed review comments from Shashank Sharma > Made the condition in intel_sprite_plane_create > simple and easy to read as suggested. > v13: Adding reviewed by tag from Shashank Sharma > Addressed review comments from Juha-Pekka Heikkila > "NV12 not to be supported by SKL" > v14: Addressed review comments from Ville > Added skl_planar_formats to include NV12 > and a check skl_plane_has_planar in sprite create > Added NV12 format to skl_mod_supported. These were > review comments from Kristian Høgsberg <hoegsberg@gmail.com> > v15: Added reviewed by from Juha-Pekka Heikkila > v16: Rebased the series > v17: Added all tiling under mod supported for NV12 > Credits to Megha Aggarwal > Credits-to: Megha Aggarwal <megha.aggarwal@intel.com> > Credits-to: Kristian Høgsberg <hoegsberg@gmail.com> > Tested-by: Clinton Taylor <clinton.a.taylor@intel.com> > Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com> > Reviewed-by: Shashank Sharma <shashank.sharma@intel.com> > Reviewed-by: Clinton Taylor <clinton.a.taylor@intel.com> > Signed-off-by: Chandra Konduru <chandra.konduru@intel.com> > Signed-off-by: Nabendu Maiti <nabendu.bikash.maiti@intel.com> > Signed-off-by: Vidya Srinivas <vidya.srinivas@intel.com> > --- > drivers/gpu/drm/i915/intel_sprite.c | 29 +++++++++++++++++++++++++++-- > 1 file changed, 27 insertions(+), 2 deletions(-) > diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c > index aa1dfaa..8b7947d 100644 > --- a/drivers/gpu/drm/i915/intel_sprite.c > +++ b/drivers/gpu/drm/i915/intel_sprite.c > @@ -1253,6 +1253,19 @@ static uint32_t skl_plane_formats[] = { > DRM_FORMAT_VYUY, > }; > +static uint32_t skl_planar_formats[] = { > + DRM_FORMAT_RGB565, > + DRM_FORMAT_ABGR8888, > + DRM_FORMAT_ARGB8888, > + DRM_FORMAT_XBGR8888, > + DRM_FORMAT_XRGB8888, > + DRM_FORMAT_YUYV, > + DRM_FORMAT_YVYU, > + DRM_FORMAT_UYVY, > + DRM_FORMAT_VYUY, > + DRM_FORMAT_NV12, > +}; > + > static const uint64_t skl_plane_format_modifiers_noccs[] = { > I915_FORMAT_MOD_Yf_TILED, > I915_FORMAT_MOD_Y_TILED, > @@ -1350,6 +1363,12 @@ static bool skl_mod_supported(uint32_t format, uint64_t modifier) > if (modifier == I915_FORMAT_MOD_Yf_TILED) > return true; > /* fall through */ > + case DRM_FORMAT_NV12: > + if (modifier == DRM_FORMAT_MOD_LINEAR || > + modifier == I915_FORMAT_MOD_X_TILED || > + modifier == I915_FORMAT_MOD_Y_TILED || > + modifier == I915_FORMAT_MOD_Yf_TILED) > + return true; Thanks for adding the modifier support. Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com> > case DRM_FORMAT_C8: > if (modifier == DRM_FORMAT_MOD_LINEAR || > modifier == I915_FORMAT_MOD_X_TILED || > @@ -1446,8 +1465,14 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv, > intel_plane->disable_plane = skl_disable_plane; > intel_plane->get_hw_state = skl_plane_get_hw_state; > - plane_formats = skl_plane_formats; > - num_plane_formats = ARRAY_SIZE(skl_plane_formats); > + if (skl_plane_has_planar(dev_priv, pipe, > + PLANE_SPRITE0 + plane)) { > + plane_formats = skl_planar_formats; > + num_plane_formats = ARRAY_SIZE(skl_planar_formats); > + } else { > + plane_formats = skl_plane_formats; > + num_plane_formats = ARRAY_SIZE(skl_plane_formats); > + } > if (skl_plane_has_ccs(dev_priv, pipe, PLANE_SPRITE0 + plane)) > modifiers = skl_plane_format_modifiers_ccs; > -- > 2.7.4 > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Thank you so much. I had included your name also under credits-to I will add your RB before merging. Regards Vidya > -----Original Message----- > From: Kristian Høgsberg [mailto:hoegsberg@gmail.com] > Sent: Friday, April 13, 2018 9:44 PM > To: Srinivas, Vidya <vidya.srinivas@intel.com> > Cc: intel-gfx@lists.freedesktop.org > Subject: Re: [Intel-gfx] [PATCH v2 3/6] drm/i915: Add NV12 as supported > format for sprite plane > > On Fri, Apr 13, 2018 at 5:18 AM Vidya Srinivas <vidya.srinivas@intel.com> > wrote: > > > From: Chandra Konduru <chandra.konduru@intel.com> > > > This patch adds NV12 to list of supported formats for sprite plane. > > > v2: Rebased (me) > > > v3: Review comments by Ville addressed > > - Removed skl_plane_formats_with_nv12 and added > > NV12 case in existing skl_plane_formats > > - Added the 10bpc RGB formats > > > v4: Addressed review comments from Clinton A Taylor "Why are we > adding > > 10 bit RGB formats with the NV12 series patches? > > Trying to set XR30 or AB30 results in error returned even though the > > modes are advertised for the planes" > > - Removed 10bit RGB formats added previously with NV12 series > > > v5: Missed the Tested-by/Reviewed-by in the previous series Adding the > > same to commit message in this version. > > Addressed review comments from Clinton A Taylor "Why are we adding 10 > > bit RGB formats with the NV12 series patches? > > Trying to set XR30 or AB30 results in error returned even though the > > modes are advertised for the planes" > > - Previous version has 10bit RGB format removed from VLV formats by > > mistake. Fixing that in this version. > > Removed 10bit RGB formats added previously with NV12 series for SKL. > > > v6: Addressed review comments by Ville Restricting the NV12 to BXT and > > PIPE A and B > > > v7: Rebased (me) > > > v8: Rebased (me) > > Restricting NV12 changes to BXT and KBL Restricting NV12 changes for > > plane 0 (overlay) > > > v9: Rebased (me) > > > v10: Addressed review comments from Maarten. > > Adding NV12 to skl_plane_formats itself. > > > v11: Addressed review comments from Shashank Sharma > > > v12: Addressed review comments from Shashank Sharma Made the > condition > > in intel_sprite_plane_create simple and easy to read as suggested. > > > v13: Adding reviewed by tag from Shashank Sharma Addressed review > > comments from Juha-Pekka Heikkila > > "NV12 not to be supported by SKL" > > > v14: Addressed review comments from Ville Added skl_planar_formats to > > include NV12 and a check skl_plane_has_planar in sprite create Added > > NV12 format to skl_mod_supported. These were review comments from > > Kristian Høgsberg <hoegsberg@gmail.com> > > > v15: Added reviewed by from Juha-Pekka Heikkila > > > v16: Rebased the series > > > v17: Added all tiling under mod supported for NV12 Credits to Megha > > Aggarwal > > > Credits-to: Megha Aggarwal <megha.aggarwal@intel.com> > > Credits-to: Kristian Høgsberg <hoegsberg@gmail.com> > > Tested-by: Clinton Taylor <clinton.a.taylor@intel.com> > > Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com> > > Reviewed-by: Shashank Sharma <shashank.sharma@intel.com> > > Reviewed-by: Clinton Taylor <clinton.a.taylor@intel.com> > > Signed-off-by: Chandra Konduru <chandra.konduru@intel.com> > > Signed-off-by: Nabendu Maiti <nabendu.bikash.maiti@intel.com> > > Signed-off-by: Vidya Srinivas <vidya.srinivas@intel.com> > > --- > > drivers/gpu/drm/i915/intel_sprite.c | 29 > +++++++++++++++++++++++++++-- > > 1 file changed, 27 insertions(+), 2 deletions(-) > > > diff --git a/drivers/gpu/drm/i915/intel_sprite.c > b/drivers/gpu/drm/i915/intel_sprite.c > > index aa1dfaa..8b7947d 100644 > > --- a/drivers/gpu/drm/i915/intel_sprite.c > > +++ b/drivers/gpu/drm/i915/intel_sprite.c > > @@ -1253,6 +1253,19 @@ static uint32_t skl_plane_formats[] = { > > DRM_FORMAT_VYUY, > > }; > > > +static uint32_t skl_planar_formats[] = { > > + DRM_FORMAT_RGB565, > > + DRM_FORMAT_ABGR8888, > > + DRM_FORMAT_ARGB8888, > > + DRM_FORMAT_XBGR8888, > > + DRM_FORMAT_XRGB8888, > > + DRM_FORMAT_YUYV, > > + DRM_FORMAT_YVYU, > > + DRM_FORMAT_UYVY, > > + DRM_FORMAT_VYUY, > > + DRM_FORMAT_NV12, > > +}; > > + > > static const uint64_t skl_plane_format_modifiers_noccs[] = { > > I915_FORMAT_MOD_Yf_TILED, > > I915_FORMAT_MOD_Y_TILED, > > @@ -1350,6 +1363,12 @@ static bool skl_mod_supported(uint32_t > format, > uint64_t modifier) > > if (modifier == I915_FORMAT_MOD_Yf_TILED) > > return true; > > /* fall through */ > > + case DRM_FORMAT_NV12: > > + if (modifier == DRM_FORMAT_MOD_LINEAR || > > + modifier == I915_FORMAT_MOD_X_TILED || > > + modifier == I915_FORMAT_MOD_Y_TILED || > > + modifier == I915_FORMAT_MOD_Yf_TILED) > > + return true; > > Thanks for adding the modifier support. > > Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com> > > > case DRM_FORMAT_C8: > > if (modifier == DRM_FORMAT_MOD_LINEAR || > > modifier == I915_FORMAT_MOD_X_TILED || @@ -1446,8 > > +1465,14 @@ intel_sprite_plane_create(struct drm_i915_private > *dev_priv, > > intel_plane->disable_plane = skl_disable_plane; > > intel_plane->get_hw_state = skl_plane_get_hw_state; > > > - plane_formats = skl_plane_formats; > > - num_plane_formats = ARRAY_SIZE(skl_plane_formats); > > + if (skl_plane_has_planar(dev_priv, pipe, > > + PLANE_SPRITE0 + plane)) { > > + plane_formats = skl_planar_formats; > > + num_plane_formats = > ARRAY_SIZE(skl_planar_formats); > > + } else { > > + plane_formats = skl_plane_formats; > > + num_plane_formats = ARRAY_SIZE(skl_plane_formats); > > + } > > > if (skl_plane_has_ccs(dev_priv, pipe, PLANE_SPRITE0 + > plane)) > > modifiers = skl_plane_format_modifiers_ccs; > > -- > > 2.7.4 > > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c index aa1dfaa..8b7947d 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c @@ -1253,6 +1253,19 @@ static uint32_t skl_plane_formats[] = { DRM_FORMAT_VYUY, }; +static uint32_t skl_planar_formats[] = { + DRM_FORMAT_RGB565, + DRM_FORMAT_ABGR8888, + DRM_FORMAT_ARGB8888, + DRM_FORMAT_XBGR8888, + DRM_FORMAT_XRGB8888, + DRM_FORMAT_YUYV, + DRM_FORMAT_YVYU, + DRM_FORMAT_UYVY, + DRM_FORMAT_VYUY, + DRM_FORMAT_NV12, +}; + static const uint64_t skl_plane_format_modifiers_noccs[] = { I915_FORMAT_MOD_Yf_TILED, I915_FORMAT_MOD_Y_TILED, @@ -1350,6 +1363,12 @@ static bool skl_mod_supported(uint32_t format, uint64_t modifier) if (modifier == I915_FORMAT_MOD_Yf_TILED) return true; /* fall through */ + case DRM_FORMAT_NV12: + if (modifier == DRM_FORMAT_MOD_LINEAR || + modifier == I915_FORMAT_MOD_X_TILED || + modifier == I915_FORMAT_MOD_Y_TILED || + modifier == I915_FORMAT_MOD_Yf_TILED) + return true; case DRM_FORMAT_C8: if (modifier == DRM_FORMAT_MOD_LINEAR || modifier == I915_FORMAT_MOD_X_TILED || @@ -1446,8 +1465,14 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv, intel_plane->disable_plane = skl_disable_plane; intel_plane->get_hw_state = skl_plane_get_hw_state; - plane_formats = skl_plane_formats; - num_plane_formats = ARRAY_SIZE(skl_plane_formats); + if (skl_plane_has_planar(dev_priv, pipe, + PLANE_SPRITE0 + plane)) { + plane_formats = skl_planar_formats; + num_plane_formats = ARRAY_SIZE(skl_planar_formats); + } else { + plane_formats = skl_plane_formats; + num_plane_formats = ARRAY_SIZE(skl_plane_formats); + } if (skl_plane_has_ccs(dev_priv, pipe, PLANE_SPRITE0 + plane)) modifiers = skl_plane_format_modifiers_ccs;