| Message ID | 20240213064835.139464-6-uma.shankar@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Plane Color Pipeline support for Intel platforms | expand |
On Tue, 13 Feb 2024 12:18:12 +0530 Uma Shankar <uma.shankar@intel.com> wrote: > From: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com> > > Add support for 3x3 Color Transformation Matrices in Color Pipeline. > > Signed-off-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com> > Signed-off-by: Uma Shankar <uma.shankar@intel.com> > --- > drivers/gpu/drm/drm_atomic_uapi.c | 3 +++ > drivers/gpu/drm/drm_colorop.c | 2 +- > include/uapi/drm/drm_mode.h | 1 + > 3 files changed, 5 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c > index e7bf1fb054af..c54b0d6c133e 100644 > --- a/drivers/gpu/drm/drm_atomic_uapi.c > +++ b/drivers/gpu/drm/drm_atomic_uapi.c > @@ -716,6 +716,9 @@ static int drm_atomic_color_set_data_property(struct drm_colorop *colorop, > case DRM_COLOROP_CTM_3X4: > size = sizeof(struct drm_color_ctm_3x4); > break; > + case DRM_COLOROP_CTM_3X3: > + size = sizeof(struct drm_color_ctm); > + break; > default: > /* should never get here */ > return -EINVAL; > diff --git a/drivers/gpu/drm/drm_colorop.c b/drivers/gpu/drm/drm_colorop.c > index 462ffec42cdf..6bae6dc8e54b 100644 > --- a/drivers/gpu/drm/drm_colorop.c > +++ b/drivers/gpu/drm/drm_colorop.c > @@ -107,7 +107,7 @@ int drm_colorop_init(struct drm_device *dev, struct drm_colorop *colorop, > 0); > > /* data */ > - if (type == DRM_COLOROP_CTM_3X4) { > + if (type == DRM_COLOROP_CTM_3X4 || type == DRM_COLOROP_CTM_3X3) { > prop = drm_property_create(dev, DRM_MODE_PROP_ATOMIC | DRM_MODE_PROP_BLOB, > "DATA", 0); > if (!prop) > diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h > index f16318f1785f..68696253867e 100644 > --- a/include/uapi/drm/drm_mode.h > +++ b/include/uapi/drm/drm_mode.h > @@ -868,6 +868,7 @@ struct drm_color_lut { > > enum drm_colorop_type { > DRM_COLOROP_1D_CURVE, > + DRM_COLOROP_CTM_3X3, > DRM_COLOROP_CTM_3X4, > }; > Hi, where are the docs for DRM_COLOROP_CTM_3X3? Thanks, pq
> -----Original Message----- > From: Pekka Paalanen <pekka.paalanen@haloniitty.fi> > Sent: Tuesday, February 13, 2024 2:45 PM > To: Shankar, Uma <uma.shankar@intel.com> > Cc: intel-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org; > ville.syrjala@linux.intel.com; contact@emersion.fr; harry.wentland@amd.com; > mwen@igalia.com; jadahl@redhat.com; sebastian.wick@redhat.com; > shashank.sharma@amd.com; agoins@nvidia.com; joshua@froggi.es; > mdaenzer@redhat.com; aleixpol@kde.org; xaver.hugl@gmail.com; > victoria@system76.com; daniel@ffwll.ch; quic_naseer@quicinc.com; > quic_cbraga@quicinc.com; quic_abhinavk@quicinc.com; arthurgrillo@riseup.net; > marcan@marcan.st; Liviu.Dudau@arm.com; sashamcintosh@google.com; > sean@poorly.run; Borah, Chaitanya Kumar <chaitanya.kumar.borah@intel.com> > Subject: Re: [PATCH 05/28] drm: Add support for 3x3 CTM > > On Tue, 13 Feb 2024 12:18:12 +0530 > Uma Shankar <uma.shankar@intel.com> wrote: > > > From: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com> > > > > Add support for 3x3 Color Transformation Matrices in Color Pipeline. > > > > Signed-off-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com> > > Signed-off-by: Uma Shankar <uma.shankar@intel.com> > > --- > > drivers/gpu/drm/drm_atomic_uapi.c | 3 +++ > > drivers/gpu/drm/drm_colorop.c | 2 +- > > include/uapi/drm/drm_mode.h | 1 + > > 3 files changed, 5 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/drm_atomic_uapi.c > > b/drivers/gpu/drm/drm_atomic_uapi.c > > index e7bf1fb054af..c54b0d6c133e 100644 > > --- a/drivers/gpu/drm/drm_atomic_uapi.c > > +++ b/drivers/gpu/drm/drm_atomic_uapi.c > > @@ -716,6 +716,9 @@ static int drm_atomic_color_set_data_property(struct > drm_colorop *colorop, > > case DRM_COLOROP_CTM_3X4: > > size = sizeof(struct drm_color_ctm_3x4); > > break; > > + case DRM_COLOROP_CTM_3X3: > > + size = sizeof(struct drm_color_ctm); > > + break; > > default: > > /* should never get here */ > > return -EINVAL; > > diff --git a/drivers/gpu/drm/drm_colorop.c > > b/drivers/gpu/drm/drm_colorop.c index 462ffec42cdf..6bae6dc8e54b > > 100644 > > --- a/drivers/gpu/drm/drm_colorop.c > > +++ b/drivers/gpu/drm/drm_colorop.c > > @@ -107,7 +107,7 @@ int drm_colorop_init(struct drm_device *dev, struct > drm_colorop *colorop, > > 0); > > > > /* data */ > > - if (type == DRM_COLOROP_CTM_3X4) { > > + if (type == DRM_COLOROP_CTM_3X4 || type == > DRM_COLOROP_CTM_3X3) { > > prop = drm_property_create(dev, DRM_MODE_PROP_ATOMIC | > DRM_MODE_PROP_BLOB, > > "DATA", 0); > > if (!prop) > > diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h > > index f16318f1785f..68696253867e 100644 > > --- a/include/uapi/drm/drm_mode.h > > +++ b/include/uapi/drm/drm_mode.h > > @@ -868,6 +868,7 @@ struct drm_color_lut { > > > > enum drm_colorop_type { > > DRM_COLOROP_1D_CURVE, > > + DRM_COLOROP_CTM_3X3, > > DRM_COLOROP_CTM_3X4, > > }; > > > > Hi, > > where are the docs for DRM_COLOROP_CTM_3X3? Hi Pekka, Sorry, we missed this in the current version. Will update the same in next revision. Regards, Uma Shankar > > Thanks, > pq
diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c index e7bf1fb054af..c54b0d6c133e 100644 --- a/drivers/gpu/drm/drm_atomic_uapi.c +++ b/drivers/gpu/drm/drm_atomic_uapi.c @@ -716,6 +716,9 @@ static int drm_atomic_color_set_data_property(struct drm_colorop *colorop, case DRM_COLOROP_CTM_3X4: size = sizeof(struct drm_color_ctm_3x4); break; + case DRM_COLOROP_CTM_3X3: + size = sizeof(struct drm_color_ctm); + break; default: /* should never get here */ return -EINVAL; diff --git a/drivers/gpu/drm/drm_colorop.c b/drivers/gpu/drm/drm_colorop.c index 462ffec42cdf..6bae6dc8e54b 100644 --- a/drivers/gpu/drm/drm_colorop.c +++ b/drivers/gpu/drm/drm_colorop.c @@ -107,7 +107,7 @@ int drm_colorop_init(struct drm_device *dev, struct drm_colorop *colorop, 0); /* data */ - if (type == DRM_COLOROP_CTM_3X4) { + if (type == DRM_COLOROP_CTM_3X4 || type == DRM_COLOROP_CTM_3X3) { prop = drm_property_create(dev, DRM_MODE_PROP_ATOMIC | DRM_MODE_PROP_BLOB, "DATA", 0); if (!prop) diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h index f16318f1785f..68696253867e 100644 --- a/include/uapi/drm/drm_mode.h +++ b/include/uapi/drm/drm_mode.h @@ -868,6 +868,7 @@ struct drm_color_lut { enum drm_colorop_type { DRM_COLOROP_1D_CURVE, + DRM_COLOROP_CTM_3X3, DRM_COLOROP_CTM_3X4, };