* [Intel-gfx] [PATCH v2] drm/i915: Add Plane color encoding support for YCBCR_BT2020
@ 2020-04-08 8:47 Kishore Kadiyala
2020-04-08 8:51 ` Shankar, Uma
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Kishore Kadiyala @ 2020-04-08 8:47 UTC (permalink / raw)
To: intel-gfx; +Cc: Kishore Kadiyala
Currently the plane property doesn't have support for YCBCR_BT2020,
which enables the corresponding color conversion mode on plane CSC.
This propery setting is confined only to HDR Planes as there is
limitation in SDR Planes.
V2: Enabling support for YCBCT_BT2020 for HDR planes on
platforms GLK & ICL
Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
Cc: Uma Shankar <uma.shankar@intel.com>
---
drivers/gpu/drm/i915/display/intel_sprite.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c b/drivers/gpu/drm/i915/display/intel_sprite.c
index deda351719db..4c25d90d16ce 100644
--- a/drivers/gpu/drm/i915/display/intel_sprite.c
+++ b/drivers/gpu/drm/i915/display/intel_sprite.c
@@ -3031,6 +3031,7 @@ skl_universal_plane_create(struct drm_i915_private *dev_priv,
struct intel_plane *plane;
enum drm_plane_type plane_type;
unsigned int supported_rotations;
+ unsigned int supported_csc;
const u64 *modifiers;
const u32 *formats;
int num_formats;
@@ -3105,9 +3106,14 @@ skl_universal_plane_create(struct drm_i915_private *dev_priv,
DRM_MODE_ROTATE_0,
supported_rotations);
+ supported_csc = BIT(DRM_COLOR_YCBCR_BT601) | BIT(DRM_COLOR_YCBCR_BT709);
+
+ if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv) &&
+ (icl_is_hdr_plane(dev_priv, plane_id)))
+ supported_csc |= BIT(DRM_COLOR_YCBCR_BT2020);
+
drm_plane_create_color_properties(&plane->base,
- BIT(DRM_COLOR_YCBCR_BT601) |
- BIT(DRM_COLOR_YCBCR_BT709),
+ supported_csc,
BIT(DRM_COLOR_YCBCR_LIMITED_RANGE) |
BIT(DRM_COLOR_YCBCR_FULL_RANGE),
DRM_COLOR_YCBCR_BT709,
--
2.17.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [Intel-gfx] [PATCH v2] drm/i915: Add Plane color encoding support for YCBCR_BT2020 2020-04-08 8:47 [Intel-gfx] [PATCH v2] drm/i915: Add Plane color encoding support for YCBCR_BT2020 Kishore Kadiyala @ 2020-04-08 8:51 ` Shankar, Uma 2020-04-08 10:20 ` Kadiyala, Kishore 2020-04-08 9:53 ` Jani Nikula 2020-04-08 10:18 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for " Patchwork 2 siblings, 1 reply; 6+ messages in thread From: Shankar, Uma @ 2020-04-08 8:51 UTC (permalink / raw) To: Kadiyala, Kishore, intel-gfx@lists.freedesktop.org > -----Original Message----- > From: Kadiyala, Kishore <kishore.kadiyala@intel.com> > Sent: Wednesday, April 8, 2020 2:18 PM > To: intel-gfx@lists.freedesktop.org > Cc: Kadiyala, Kishore <kishore.kadiyala@intel.com>; Ville Syrjala > <ville.syrjala@linux.intel.com>; Shankar, Uma <uma.shankar@intel.com> > Subject: [PATCH v2] drm/i915: Add Plane color encoding support for YCBCR_BT2020 > > Currently the plane property doesn't have support for YCBCR_BT2020, which enables > the corresponding color conversion mode on plane CSC. > This propery setting is confined only to HDR Planes as there is limitation in SDR > Planes. Append that this restriction is for ICL+ > > V2: Enabling support for YCBCT_BT2020 for HDR planes on > platforms GLK & ICL > > Cc: Ville Syrjala <ville.syrjala@linux.intel.com> > Cc: Uma Shankar <uma.shankar@intel.com> > --- > drivers/gpu/drm/i915/display/intel_sprite.c | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c > b/drivers/gpu/drm/i915/display/intel_sprite.c > index deda351719db..4c25d90d16ce 100644 > --- a/drivers/gpu/drm/i915/display/intel_sprite.c > +++ b/drivers/gpu/drm/i915/display/intel_sprite.c > @@ -3031,6 +3031,7 @@ skl_universal_plane_create(struct drm_i915_private > *dev_priv, > struct intel_plane *plane; > enum drm_plane_type plane_type; > unsigned int supported_rotations; > + unsigned int supported_csc; > const u64 *modifiers; > const u32 *formats; > int num_formats; > @@ -3105,9 +3106,14 @@ skl_universal_plane_create(struct drm_i915_private > *dev_priv, > DRM_MODE_ROTATE_0, > supported_rotations); > > + supported_csc = BIT(DRM_COLOR_YCBCR_BT601) | > +BIT(DRM_COLOR_YCBCR_BT709); > + > + if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv) && > + (icl_is_hdr_plane(dev_priv, plane_id))) Refine this condition to enable for all GLK planes and restrict this only to bottom 3 HDR planes for ICL. Will be good to mention a comment as well that ICL SDR planes have some issues with BT2020 conversion, hence not enabling it on those planes for ICL. > + supported_csc |= BIT(DRM_COLOR_YCBCR_BT2020); > + > drm_plane_create_color_properties(&plane->base, > - BIT(DRM_COLOR_YCBCR_BT601) | > - BIT(DRM_COLOR_YCBCR_BT709), > + supported_csc, Handle the BT2020 format in glk_plane_color_ctl as well for GLK. > BIT(DRM_COLOR_YCBCR_LIMITED_RANGE) | > BIT(DRM_COLOR_YCBCR_FULL_RANGE), > DRM_COLOR_YCBCR_BT709, > -- > 2.17.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Intel-gfx] [PATCH v2] drm/i915: Add Plane color encoding support for YCBCR_BT2020 2020-04-08 8:51 ` Shankar, Uma @ 2020-04-08 10:20 ` Kadiyala, Kishore 0 siblings, 0 replies; 6+ messages in thread From: Kadiyala, Kishore @ 2020-04-08 10:20 UTC (permalink / raw) To: Shankar, Uma, intel-gfx@lists.freedesktop.org > -----Original Message----- > From: Shankar, Uma <uma.shankar@intel.com> > Sent: Wednesday, April 8, 2020 2:21 PM > To: Kadiyala, Kishore <kishore.kadiyala@intel.com>; intel- > gfx@lists.freedesktop.org > Cc: Ville Syrjala <ville.syrjala@linux.intel.com> > Subject: RE: [PATCH v2] drm/i915: Add Plane color encoding support for > YCBCR_BT2020 > > > > > -----Original Message----- > > From: Kadiyala, Kishore <kishore.kadiyala@intel.com> > > Sent: Wednesday, April 8, 2020 2:18 PM > > To: intel-gfx@lists.freedesktop.org > > Cc: Kadiyala, Kishore <kishore.kadiyala@intel.com>; Ville Syrjala > > <ville.syrjala@linux.intel.com>; Shankar, Uma <uma.shankar@intel.com> > > Subject: [PATCH v2] drm/i915: Add Plane color encoding support for > > YCBCR_BT2020 > > > > Currently the plane property doesn't have support for YCBCR_BT2020, > > which enables the corresponding color conversion mode on plane CSC. > > This propery setting is confined only to HDR Planes as there is > > limitation in SDR Planes. > > Append that this restriction is for ICL+ > > > > > V2: Enabling support for YCBCT_BT2020 for HDR planes on > > platforms GLK & ICL > > > > Cc: Ville Syrjala <ville.syrjala@linux.intel.com> > > Cc: Uma Shankar <uma.shankar@intel.com> > > --- > > drivers/gpu/drm/i915/display/intel_sprite.c | 10 ++++++++-- > > 1 file changed, 8 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c > > b/drivers/gpu/drm/i915/display/intel_sprite.c > > index deda351719db..4c25d90d16ce 100644 > > --- a/drivers/gpu/drm/i915/display/intel_sprite.c > > +++ b/drivers/gpu/drm/i915/display/intel_sprite.c > > @@ -3031,6 +3031,7 @@ skl_universal_plane_create(struct > > drm_i915_private *dev_priv, > > struct intel_plane *plane; > > enum drm_plane_type plane_type; > > unsigned int supported_rotations; > > + unsigned int supported_csc; > > const u64 *modifiers; > > const u32 *formats; > > int num_formats; > > @@ -3105,9 +3106,14 @@ skl_universal_plane_create(struct > > drm_i915_private *dev_priv, > > DRM_MODE_ROTATE_0, > > supported_rotations); > > > > + supported_csc = BIT(DRM_COLOR_YCBCR_BT601) | > > +BIT(DRM_COLOR_YCBCR_BT709); > > + > > + if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv) && > > + (icl_is_hdr_plane(dev_priv, plane_id))) > > Refine this condition to enable for all GLK planes and restrict this only to bottom > 3 HDR planes for ICL. Will be good to mention a comment as well that ICL SDR > planes have some issues with BT2020 conversion, hence not enabling it on those > planes for ICL. > Sure Uma , will do the changes > > + supported_csc |= BIT(DRM_COLOR_YCBCR_BT2020); > > + > > drm_plane_create_color_properties(&plane->base, > > - BIT(DRM_COLOR_YCBCR_BT601) | > > - BIT(DRM_COLOR_YCBCR_BT709), > > + supported_csc, > > Handle the BT2020 format in glk_plane_color_ctl as well for GLK. > Ok Uma, will fix > > BIT(DRM_COLOR_YCBCR_LIMITED_RANGE) | > > > BIT(DRM_COLOR_YCBCR_FULL_RANGE), > > DRM_COLOR_YCBCR_BT709, > > -- > > 2.17.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Intel-gfx] [PATCH v2] drm/i915: Add Plane color encoding support for YCBCR_BT2020 2020-04-08 8:47 [Intel-gfx] [PATCH v2] drm/i915: Add Plane color encoding support for YCBCR_BT2020 Kishore Kadiyala 2020-04-08 8:51 ` Shankar, Uma @ 2020-04-08 9:53 ` Jani Nikula 2020-04-08 10:24 ` Kadiyala, Kishore 2020-04-08 10:18 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for " Patchwork 2 siblings, 1 reply; 6+ messages in thread From: Jani Nikula @ 2020-04-08 9:53 UTC (permalink / raw) To: Kishore Kadiyala, intel-gfx; +Cc: Kishore Kadiyala On Wed, 08 Apr 2020, Kishore Kadiyala <kishore.kadiyala@intel.com> wrote: > Currently the plane property doesn't have support for YCBCR_BT2020, > which enables the corresponding color conversion mode on plane CSC. > This propery setting is confined only to HDR Planes as there is > limitation in SDR Planes. > > V2: Enabling support for YCBCT_BT2020 for HDR planes on > platforms GLK & ICL > > Cc: Ville Syrjala <ville.syrjala@linux.intel.com> > Cc: Uma Shankar <uma.shankar@intel.com> > --- > drivers/gpu/drm/i915/display/intel_sprite.c | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c b/drivers/gpu/drm/i915/display/intel_sprite.c > index deda351719db..4c25d90d16ce 100644 > --- a/drivers/gpu/drm/i915/display/intel_sprite.c > +++ b/drivers/gpu/drm/i915/display/intel_sprite.c > @@ -3031,6 +3031,7 @@ skl_universal_plane_create(struct drm_i915_private *dev_priv, > struct intel_plane *plane; > enum drm_plane_type plane_type; > unsigned int supported_rotations; > + unsigned int supported_csc; > const u64 *modifiers; > const u32 *formats; > int num_formats; > @@ -3105,9 +3106,14 @@ skl_universal_plane_create(struct drm_i915_private *dev_priv, > DRM_MODE_ROTATE_0, > supported_rotations); > > + supported_csc = BIT(DRM_COLOR_YCBCR_BT601) | BIT(DRM_COLOR_YCBCR_BT709); > + > + if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv) && > + (icl_is_hdr_plane(dev_priv, plane_id))) This is incorrect and/or misleading in so many levels. First, the precedence means this is (gen >= 10 || (is_glk && icl_is_hdr_plane)) Second, it's odd to have an icl_ prefixed function used only on glk. Third, icl_is_hdr_plane() internally has gen >= 11. So the right hand part of the || is always false. Fourth, there's no point in wrapping the icl_is_hdr_plane() in parens. Fifth, does this really apply to gen 10 cnl? BR, Jani. > + supported_csc |= BIT(DRM_COLOR_YCBCR_BT2020); > + > drm_plane_create_color_properties(&plane->base, > - BIT(DRM_COLOR_YCBCR_BT601) | > - BIT(DRM_COLOR_YCBCR_BT709), > + supported_csc, > BIT(DRM_COLOR_YCBCR_LIMITED_RANGE) | > BIT(DRM_COLOR_YCBCR_FULL_RANGE), > DRM_COLOR_YCBCR_BT709, -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Intel-gfx] [PATCH v2] drm/i915: Add Plane color encoding support for YCBCR_BT2020 2020-04-08 9:53 ` Jani Nikula @ 2020-04-08 10:24 ` Kadiyala, Kishore 0 siblings, 0 replies; 6+ messages in thread From: Kadiyala, Kishore @ 2020-04-08 10:24 UTC (permalink / raw) To: Jani Nikula, intel-gfx@lists.freedesktop.org > -----Original Message----- > From: Jani Nikula <jani.nikula@linux.intel.com> > Sent: Wednesday, April 8, 2020 3:24 PM > To: Kadiyala, Kishore <kishore.kadiyala@intel.com>; intel- > gfx@lists.freedesktop.org > Cc: Kadiyala, Kishore <kishore.kadiyala@intel.com> > Subject: Re: [Intel-gfx] [PATCH v2] drm/i915: Add Plane color encoding support > for YCBCR_BT2020 > > On Wed, 08 Apr 2020, Kishore Kadiyala <kishore.kadiyala@intel.com> wrote: > > Currently the plane property doesn't have support for YCBCR_BT2020, > > which enables the corresponding color conversion mode on plane CSC. > > This propery setting is confined only to HDR Planes as there is > > limitation in SDR Planes. > > > > V2: Enabling support for YCBCT_BT2020 for HDR planes on > > platforms GLK & ICL > > > > Cc: Ville Syrjala <ville.syrjala@linux.intel.com> > > Cc: Uma Shankar <uma.shankar@intel.com> > > --- > > drivers/gpu/drm/i915/display/intel_sprite.c | 10 ++++++++-- > > 1 file changed, 8 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c > > b/drivers/gpu/drm/i915/display/intel_sprite.c > > index deda351719db..4c25d90d16ce 100644 > > --- a/drivers/gpu/drm/i915/display/intel_sprite.c > > +++ b/drivers/gpu/drm/i915/display/intel_sprite.c > > @@ -3031,6 +3031,7 @@ skl_universal_plane_create(struct drm_i915_private > *dev_priv, > > struct intel_plane *plane; > > enum drm_plane_type plane_type; > > unsigned int supported_rotations; > > + unsigned int supported_csc; > > const u64 *modifiers; > > const u32 *formats; > > int num_formats; > > @@ -3105,9 +3106,14 @@ skl_universal_plane_create(struct > drm_i915_private *dev_priv, > > DRM_MODE_ROTATE_0, > > supported_rotations); > > > > + supported_csc = BIT(DRM_COLOR_YCBCR_BT601) | > > +BIT(DRM_COLOR_YCBCR_BT709); > > + > > + if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv) && > > + (icl_is_hdr_plane(dev_priv, plane_id))) > > This is incorrect and/or misleading in so many levels. > > First, the precedence means this is > > (gen >= 10 || (is_glk && icl_is_hdr_plane)) > > Second, it's odd to have an icl_ prefixed function used only on glk. > > Third, icl_is_hdr_plane() internally has gen >= 11. So the right hand part of the || > is always false. > > Fourth, there's no point in wrapping the icl_is_hdr_plane() in parens. > > Fifth, does this really apply to gen 10 cnl? Agree Jani, could have been avoided Will send updated patch Thanks, Kishore > > BR, > Jani. > > > > + supported_csc |= BIT(DRM_COLOR_YCBCR_BT2020); > > + > > drm_plane_create_color_properties(&plane->base, > > - BIT(DRM_COLOR_YCBCR_BT601) | > > - BIT(DRM_COLOR_YCBCR_BT709), > > + supported_csc, > > > BIT(DRM_COLOR_YCBCR_LIMITED_RANGE) | > > > BIT(DRM_COLOR_YCBCR_FULL_RANGE), > > DRM_COLOR_YCBCR_BT709, > > -- > Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 6+ messages in thread
* [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915: Add Plane color encoding support for YCBCR_BT2020 2020-04-08 8:47 [Intel-gfx] [PATCH v2] drm/i915: Add Plane color encoding support for YCBCR_BT2020 Kishore Kadiyala 2020-04-08 8:51 ` Shankar, Uma 2020-04-08 9:53 ` Jani Nikula @ 2020-04-08 10:18 ` Patchwork 2 siblings, 0 replies; 6+ messages in thread From: Patchwork @ 2020-04-08 10:18 UTC (permalink / raw) To: Kishore Kadiyala; +Cc: intel-gfx == Series Details == Series: drm/i915: Add Plane color encoding support for YCBCR_BT2020 URL : https://patchwork.freedesktop.org/series/75660/ State : failure == Summary == CALL scripts/checksyscalls.sh CALL scripts/atomic/check-atomics.sh DESCEND objtool CHK include/generated/compile.h CC [M] drivers/gpu/drm/i915/display/intel_sprite.o drivers/gpu/drm/i915/display/intel_sprite.c: In function ‘skl_universal_plane_create’: drivers/gpu/drm/i915/display/intel_sprite.c:3111:59: error: suggest parentheses around ‘&&’ within ‘||’ [-Werror=parentheses] if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv) && cc1: all warnings being treated as errors scripts/Makefile.build:267: recipe for target 'drivers/gpu/drm/i915/display/intel_sprite.o' failed make[4]: *** [drivers/gpu/drm/i915/display/intel_sprite.o] Error 1 scripts/Makefile.build:505: recipe for target 'drivers/gpu/drm/i915' failed make[3]: *** [drivers/gpu/drm/i915] Error 2 scripts/Makefile.build:505: recipe for target 'drivers/gpu/drm' failed make[2]: *** [drivers/gpu/drm] Error 2 scripts/Makefile.build:505: recipe for target 'drivers/gpu' failed make[1]: *** [drivers/gpu] Error 2 Makefile:1683: recipe for target 'drivers' failed make: *** [drivers] Error 2 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-04-08 10:24 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2020-04-08 8:47 [Intel-gfx] [PATCH v2] drm/i915: Add Plane color encoding support for YCBCR_BT2020 Kishore Kadiyala 2020-04-08 8:51 ` Shankar, Uma 2020-04-08 10:20 ` Kadiyala, Kishore 2020-04-08 9:53 ` Jani Nikula 2020-04-08 10:24 ` Kadiyala, Kishore 2020-04-08 10:18 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for " Patchwork
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.