| Message ID | 20210601105218.29185-1-uma.shankar@intel.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | Add Support for Plane Color Lut and CSC features | expand |
On Tue, 1 Jun 2021 16:21:57 +0530 Uma Shankar <uma.shankar@intel.com> wrote: > This is how a typical display color hardware pipeline looks like: > +-------------------------------------------+ > | RAM | > | +------+ +---------+ +---------+ | > | | FB 1 | | FB 2 | | FB N | | > | +------+ +---------+ +---------+ | > +-------------------------------------------+ > | Plane Color Hardware Block | > +--------------------------------------------+ > | +---v-----+ +---v-------+ +---v------+ | > | | Plane A | | Plane B | | Plane N | | > | | DeGamma | | Degamma | | Degamma | | > | +---+-----+ +---+-------+ +---+------+ | > | | | | | > | +---v-----+ +---v-------+ +---v------+ | > | |Plane A | | Plane B | | Plane N | | > | |CSC/CTM | | CSC/CTM | | CSC/CTM | | > | +---+-----+ +----+------+ +----+-----+ | > | | | | | > | +---v-----+ +----v------+ +----v-----+ | > | | Plane A | | Plane B | | Plane N | | > | | Gamma | | Gamma | | Gamma | | > | +---+-----+ +----+------+ +----+-----+ | > | | | | | > +--------------------------------------------+ > +------v--------------v---------------v-------| > || || > || Pipe Blender || > +--------------------+------------------------+ > | | | > | +-----------v----------+ | > | | Pipe DeGamma | | > | | | | > | +-----------+----------+ | > | | Pipe Color | > | +-----------v----------+ Hardware | > | | Pipe CSC/CTM | | > | | | | > | +-----------+----------+ | > | | | > | +-----------v----------+ | > | | Pipe Gamma | | > | | | | > | +-----------+----------+ | > | | | > +---------------------------------------------+ > | > v > Pipe Output Hi, this is an excellent picture. I have long been wanting schematics like that in the DRM UAPI documentation. Another note on that: https://lists.freedesktop.org/archives/dri-devel/2021-May/307310.html But the schematic for DRM UAPI documentation needs to be written in terms of the abstract KMS pipeline with property names spelled out, like in what Ville sketched in that email. > This patch series adds properties for plane color features. It adds > properties for degamma used to linearize data and CSC used for gamut > conversion. It also includes Gamma support used to again non-linearize > data as per panel supported color space. These can be utilize by user > space to convert planes from one format to another, one color space to > another etc. This is very much welcome! There is also the thread: https://lists.freedesktop.org/archives/dri-devel/2021-May/306726.html Everything mentioned will interact with each other by changing what the abstract KMS pixel pipeline does. I think you and Harry should probably look at each others' suggestions and see how to fit them all into a single abstract KMS pipeline. People are adding new pieces into KMS left and right, and I fear we lose sight of how everything will actually work together when all KMS properties are supposed to be generic and potentially present simultaneously. This is why I would very much like to have that *whole* abstract KMS pipeline documented with *everything*. Otherwise it is coming really hard fast to figure out how generic userspace should use all these KMS properties together. Or if there cannot be a single abstract KMS pipeline, then sure, have multiple, as long as they are documented and how userspace will know which pipeline it is dealing with, and what things are mutually exclusive so we can avoid writing userspace code for combinations that will never exist. Thanks, pq > Userspace can take smart blending decisions and utilize these hardware > supported plane color features to get accurate color profile. The same > can help in consistent color quality from source to panel taking > advantage of advanced color features in hardware. > > These patches add the property interfaces and enable helper functions. > This series adds Intel's XE_LPD hw specific plane gamma feature. We > can build up and add other platform/hardware specific implementation > on top of this series. > > Credits: Special mention and credits to Ville Syrjala for coming up > with a design for this feature and inputs. This series is based on > his original design and idea. > > Note: Userspace support for this new UAPI will be done on Chrome. We > will notify the list once we have that ready for review. > > ToDo: State readout for this feature will be added next. > > Uma Shankar (21): > drm: Add Enhanced Gamma and color lut range attributes > drm: Add Plane Degamma Mode property > drm: Add Plane Degamma Lut property > drm/i915/xelpd: Define Degamma Lut range struct for HDR planes > drm/i915/xelpd: Add register definitions for Plane Degamma > drm/i915/xelpd: Enable plane color features > drm/i915/xelpd: Add color capabilities of SDR planes > drm/i915/xelpd: Program Plane Degamma Registers > drm/i915/xelpd: Add plane color check to glk_plane_color_ctl > drm/i915/xelpd: Initialize plane color features > drm/i915/xelpd: Load plane color luts from atomic flip > drm: Add Plane CTM property > drm: Add helper to attach Plane ctm property > drm/i915/xelpd: Define Plane CSC Registers > drm/i915/xelpd: Enable Plane CSC > drm: Add Plane Gamma Mode property > drm: Add Plane Gamma Lut property > drm/i915/xelpd: Define and Initialize Plane Gamma Lut range > drm/i915/xelpd: Add register definitions for Plane Gamma > drm/i915/xelpd: Program Plane Gamma Registers > drm/i915/xelpd: Enable plane gamma > > Documentation/gpu/drm-kms.rst | 90 +++ > drivers/gpu/drm/drm_atomic.c | 1 + > drivers/gpu/drm/drm_atomic_state_helper.c | 12 + > drivers/gpu/drm/drm_atomic_uapi.c | 38 ++ > drivers/gpu/drm/drm_color_mgmt.c | 177 +++++- > .../gpu/drm/i915/display/intel_atomic_plane.c | 6 + > .../gpu/drm/i915/display/intel_atomic_plane.h | 2 + > drivers/gpu/drm/i915/display/intel_color.c | 513 ++++++++++++++++++ > drivers/gpu/drm/i915/display/intel_color.h | 2 + > .../drm/i915/display/skl_universal_plane.c | 15 +- > drivers/gpu/drm/i915/i915_drv.h | 3 + > drivers/gpu/drm/i915/i915_reg.h | 176 +++++- > include/drm/drm_mode_object.h | 2 +- > include/drm/drm_plane.h | 81 +++ > include/uapi/drm/drm_mode.h | 58 ++ > 15 files changed, 1170 insertions(+), 6 deletions(-) >
> -----Original Message----- > From: Pekka Paalanen <ppaalanen@gmail.com> > Sent: Wednesday, June 2, 2021 2:59 PM > To: Shankar, Uma <uma.shankar@intel.com> > Cc: intel-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org; Modem, > Bhanuprakash <bhanuprakash.modem@intel.com>; Harry Wentland > <harry.wentland@amd.com> > Subject: Re: [PATCH 00/21] Add Support for Plane Color Lut and CSC features > > On Tue, 1 Jun 2021 16:21:57 +0530 > Uma Shankar <uma.shankar@intel.com> wrote: > > > This is how a typical display color hardware pipeline looks like: > > +-------------------------------------------+ > > | RAM | > > | +------+ +---------+ +---------+ | > > | | FB 1 | | FB 2 | | FB N | | > > | +------+ +---------+ +---------+ | > > +-------------------------------------------+ > > | Plane Color Hardware Block | > > +--------------------------------------------+ > > | +---v-----+ +---v-------+ +---v------+ | > > | | Plane A | | Plane B | | Plane N | | > > | | DeGamma | | Degamma | | Degamma | | > > | +---+-----+ +---+-------+ +---+------+ | > > | | | | | > > | +---v-----+ +---v-------+ +---v------+ | > > | |Plane A | | Plane B | | Plane N | | > > | |CSC/CTM | | CSC/CTM | | CSC/CTM | | > > | +---+-----+ +----+------+ +----+-----+ | > > | | | | | > > | +---v-----+ +----v------+ +----v-----+ | > > | | Plane A | | Plane B | | Plane N | | > > | | Gamma | | Gamma | | Gamma | | > > | +---+-----+ +----+------+ +----+-----+ | > > | | | | | > > +--------------------------------------------+ > > +------v--------------v---------------v-------| > > || || > > || Pipe Blender || > > +--------------------+------------------------+ > > | | | > > | +-----------v----------+ | > > | | Pipe DeGamma | | > > | | | | > > | +-----------+----------+ | > > | | Pipe Color | > > | +-----------v----------+ Hardware | > > | | Pipe CSC/CTM | | > > | | | | > > | +-----------+----------+ | > > | | | > > | +-----------v----------+ | > > | | Pipe Gamma | | > > | | | | > > | +-----------+----------+ | > > | | | > > +---------------------------------------------+ > > | > > v > > Pipe Output > > Hi, > > this is an excellent picture. I have long been wanting schematics like that in the DRM > UAPI documentation. Another note on that: > https://lists.freedesktop.org/archives/dri-devel/2021-May/307310.html > > But the schematic for DRM UAPI documentation needs to be written in terms of the > abstract KMS pipeline with property names spelled out, like in what Ville sketched in > that email. Sure Pekka, I can add that. > > This patch series adds properties for plane color features. It adds > > properties for degamma used to linearize data and CSC used for gamut > > conversion. It also includes Gamma support used to again non-linearize > > data as per panel supported color space. These can be utilize by user > > space to convert planes from one format to another, one color space to > > another etc. > > This is very much welcome! > > There is also the thread: > https://lists.freedesktop.org/archives/dri-devel/2021-May/306726.html > > Everything mentioned will interact with each other by changing what the abstract > KMS pixel pipeline does. I think you and Harry should probably look at each others' > suggestions and see how to fit them all into a single abstract KMS pipeline. > > People are adding new pieces into KMS left and right, and I fear we lose sight of how > everything will actually work together when all KMS properties are supposed to be > generic and potentially present simultaneously. This is why I would very much like to > have that *whole* abstract KMS pipeline documented with *everything*. Otherwise > it is coming really hard fast to figure out how generic userspace should use all these > KMS properties together. > > Or if there cannot be a single abstract KMS pipeline, then sure, have multiple, as long > as they are documented and how userspace will know which pipeline it is dealing > with, and what things are mutually exclusive so we can avoid writing userspace code > for combinations that will never exist. This is a good suggestion to have the whole pipeline and properties documented along with the exact usages. We may end with 2 properties almost doing similar work but needed due to underlying hardware, but we can get that properly documented and defined. I will discuss with Harry and Ville as well to define this. Regards, Uma Shankar > > Thanks, > pq > > > Userspace can take smart blending decisions and utilize these hardware > > supported plane color features to get accurate color profile. The same > > can help in consistent color quality from source to panel taking > > advantage of advanced color features in hardware. > > > > These patches add the property interfaces and enable helper functions. > > This series adds Intel's XE_LPD hw specific plane gamma feature. We > > can build up and add other platform/hardware specific implementation > > on top of this series. > > > > Credits: Special mention and credits to Ville Syrjala for coming up > > with a design for this feature and inputs. This series is based on his > > original design and idea. > > > > Note: Userspace support for this new UAPI will be done on Chrome. We > > will notify the list once we have that ready for review. > > > > ToDo: State readout for this feature will be added next. > > > > Uma Shankar (21): > > drm: Add Enhanced Gamma and color lut range attributes > > drm: Add Plane Degamma Mode property > > drm: Add Plane Degamma Lut property > > drm/i915/xelpd: Define Degamma Lut range struct for HDR planes > > drm/i915/xelpd: Add register definitions for Plane Degamma > > drm/i915/xelpd: Enable plane color features > > drm/i915/xelpd: Add color capabilities of SDR planes > > drm/i915/xelpd: Program Plane Degamma Registers > > drm/i915/xelpd: Add plane color check to glk_plane_color_ctl > > drm/i915/xelpd: Initialize plane color features > > drm/i915/xelpd: Load plane color luts from atomic flip > > drm: Add Plane CTM property > > drm: Add helper to attach Plane ctm property > > drm/i915/xelpd: Define Plane CSC Registers > > drm/i915/xelpd: Enable Plane CSC > > drm: Add Plane Gamma Mode property > > drm: Add Plane Gamma Lut property > > drm/i915/xelpd: Define and Initialize Plane Gamma Lut range > > drm/i915/xelpd: Add register definitions for Plane Gamma > > drm/i915/xelpd: Program Plane Gamma Registers > > drm/i915/xelpd: Enable plane gamma > > > > Documentation/gpu/drm-kms.rst | 90 +++ > > drivers/gpu/drm/drm_atomic.c | 1 + > > drivers/gpu/drm/drm_atomic_state_helper.c | 12 + > > drivers/gpu/drm/drm_atomic_uapi.c | 38 ++ > > drivers/gpu/drm/drm_color_mgmt.c | 177 +++++- > > .../gpu/drm/i915/display/intel_atomic_plane.c | 6 + > > .../gpu/drm/i915/display/intel_atomic_plane.h | 2 + > > drivers/gpu/drm/i915/display/intel_color.c | 513 ++++++++++++++++++ > > drivers/gpu/drm/i915/display/intel_color.h | 2 + > > .../drm/i915/display/skl_universal_plane.c | 15 +- > > drivers/gpu/drm/i915/i915_drv.h | 3 + > > drivers/gpu/drm/i915/i915_reg.h | 176 +++++- > > include/drm/drm_mode_object.h | 2 +- > > include/drm/drm_plane.h | 81 +++ > > include/uapi/drm/drm_mode.h | 58 ++ > > 15 files changed, 1170 insertions(+), 6 deletions(-) > >
On 2021-06-02 4:22 p.m., Shankar, Uma wrote: > > >> -----Original Message----- >> From: Pekka Paalanen <ppaalanen@gmail.com> >> Sent: Wednesday, June 2, 2021 2:59 PM >> To: Shankar, Uma <uma.shankar@intel.com> >> Cc: intel-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org; Modem, >> Bhanuprakash <bhanuprakash.modem@intel.com>; Harry Wentland >> <harry.wentland@amd.com> >> Subject: Re: [PATCH 00/21] Add Support for Plane Color Lut and CSC features >> >> On Tue, 1 Jun 2021 16:21:57 +0530 >> Uma Shankar <uma.shankar@intel.com> wrote: >> >>> This is how a typical display color hardware pipeline looks like: >>> +-------------------------------------------+ >>> | RAM | >>> | +------+ +---------+ +---------+ | >>> | | FB 1 | | FB 2 | | FB N | | >>> | +------+ +---------+ +---------+ | >>> +-------------------------------------------+ >>> | Plane Color Hardware Block | >>> +--------------------------------------------+ >>> | +---v-----+ +---v-------+ +---v------+ | >>> | | Plane A | | Plane B | | Plane N | | >>> | | DeGamma | | Degamma | | Degamma | | >>> | +---+-----+ +---+-------+ +---+------+ | >>> | | | | | >>> | +---v-----+ +---v-------+ +---v------+ | >>> | |Plane A | | Plane B | | Plane N | | >>> | |CSC/CTM | | CSC/CTM | | CSC/CTM | | >>> | +---+-----+ +----+------+ +----+-----+ | >>> | | | | | >>> | +---v-----+ +----v------+ +----v-----+ | >>> | | Plane A | | Plane B | | Plane N | | >>> | | Gamma | | Gamma | | Gamma | | >>> | +---+-----+ +----+------+ +----+-----+ | >>> | | | | | >>> +--------------------------------------------+ >>> +------v--------------v---------------v-------| >>> || || >>> || Pipe Blender || >>> +--------------------+------------------------+ >>> | | | >>> | +-----------v----------+ | >>> | | Pipe DeGamma | | >>> | | | | >>> | +-----------+----------+ | >>> | | Pipe Color | >>> | +-----------v----------+ Hardware | >>> | | Pipe CSC/CTM | | >>> | | | | >>> | +-----------+----------+ | >>> | | | >>> | +-----------v----------+ | >>> | | Pipe Gamma | | >>> | | | | >>> | +-----------+----------+ | >>> | | | >>> +---------------------------------------------+ >>> | >>> v >>> Pipe Output >> >> Hi, >> >> this is an excellent picture. I have long been wanting schematics like that in the DRM >> UAPI documentation. Another note on that: >> https://lists.freedesktop.org/archives/dri-devel/2021-May/307310.html>>> >> But the schematic for DRM UAPI documentation needs to be written in terms of the >> abstract KMS pipeline with property names spelled out, like in what Ville sketched in >> that email. > > Sure Pekka, I can add that. > >>> This patch series adds properties for plane color features. It adds >>> properties for degamma used to linearize data and CSC used for gamut >>> conversion. It also includes Gamma support used to again non-linearize >>> data as per panel supported color space. These can be utilize by user >>> space to convert planes from one format to another, one color space to >>> another etc. >> >> This is very much welcome! >> >> There is also the thread: >> https://lists.freedesktop.org/archives/dri-devel/2021-May/306726.html>>> >> Everything mentioned will interact with each other by changing what the abstract >> KMS pixel pipeline does. I think you and Harry should probably look at each others' >> suggestions and see how to fit them all into a single abstract KMS pipeline. >> >> People are adding new pieces into KMS left and right, and I fear we lose sight of how >> everything will actually work together when all KMS properties are supposed to be >> generic and potentially present simultaneously. This is why I would very much like to >> have that *whole* abstract KMS pipeline documented with *everything*. Otherwise >> it is coming really hard fast to figure out how generic userspace should use all these >> KMS properties together. >> >> Or if there cannot be a single abstract KMS pipeline, then sure, have multiple, as long >> as they are documented and how userspace will know which pipeline it is dealing >> with, and what things are mutually exclusive so we can avoid writing userspace code >> for combinations that will never exist. > > This is a good suggestion to have the whole pipeline and properties documented along with > the exact usages. We may end with 2 properties almost doing similar work but needed due to > underlying hardware, but we can get that properly documented and defined. > > I will discuss with Harry and Ville as well to define this. > Just wanted to let you know that I've seen and read through both of Shankar's patchsets and had some thoughts but haven't found the time to respond. I will respond soon. I very much agree with Pekka. We need to make sure this all plays well together and is well documented. Maybe a library to deal with DRM KMS color management/HDR would even be helpful. Not sure yet how I feel about that. Harry > Regards, > Uma Shankar >> >> Thanks, >> pq >> >>> Userspace can take smart blending decisions and utilize these hardware >>> supported plane color features to get accurate color profile. The same >>> can help in consistent color quality from source to panel taking >>> advantage of advanced color features in hardware. >>> >>> These patches add the property interfaces and enable helper functions. >>> This series adds Intel's XE_LPD hw specific plane gamma feature. We >>> can build up and add other platform/hardware specific implementation >>> on top of this series. >>> >>> Credits: Special mention and credits to Ville Syrjala for coming up >>> with a design for this feature and inputs. This series is based on his >>> original design and idea. >>> >>> Note: Userspace support for this new UAPI will be done on Chrome. We >>> will notify the list once we have that ready for review. >>> >>> ToDo: State readout for this feature will be added next. >>> >>> Uma Shankar (21): >>> drm: Add Enhanced Gamma and color lut range attributes >>> drm: Add Plane Degamma Mode property >>> drm: Add Plane Degamma Lut property >>> drm/i915/xelpd: Define Degamma Lut range struct for HDR planes >>> drm/i915/xelpd: Add register definitions for Plane Degamma >>> drm/i915/xelpd: Enable plane color features >>> drm/i915/xelpd: Add color capabilities of SDR planes >>> drm/i915/xelpd: Program Plane Degamma Registers >>> drm/i915/xelpd: Add plane color check to glk_plane_color_ctl >>> drm/i915/xelpd: Initialize plane color features >>> drm/i915/xelpd: Load plane color luts from atomic flip >>> drm: Add Plane CTM property >>> drm: Add helper to attach Plane ctm property >>> drm/i915/xelpd: Define Plane CSC Registers >>> drm/i915/xelpd: Enable Plane CSC >>> drm: Add Plane Gamma Mode property >>> drm: Add Plane Gamma Lut property >>> drm/i915/xelpd: Define and Initialize Plane Gamma Lut range >>> drm/i915/xelpd: Add register definitions for Plane Gamma >>> drm/i915/xelpd: Program Plane Gamma Registers >>> drm/i915/xelpd: Enable plane gamma >>> >>> Documentation/gpu/drm-kms.rst | 90 +++ >>> drivers/gpu/drm/drm_atomic.c | 1 + >>> drivers/gpu/drm/drm_atomic_state_helper.c | 12 + >>> drivers/gpu/drm/drm_atomic_uapi.c | 38 ++ >>> drivers/gpu/drm/drm_color_mgmt.c | 177 +++++- >>> .../gpu/drm/i915/display/intel_atomic_plane.c | 6 + >>> .../gpu/drm/i915/display/intel_atomic_plane.h | 2 + >>> drivers/gpu/drm/i915/display/intel_color.c | 513 ++++++++++++++++++ >>> drivers/gpu/drm/i915/display/intel_color.h | 2 + >>> .../drm/i915/display/skl_universal_plane.c | 15 +- >>> drivers/gpu/drm/i915/i915_drv.h | 3 + >>> drivers/gpu/drm/i915/i915_reg.h | 176 +++++- >>> include/drm/drm_mode_object.h | 2 +- >>> include/drm/drm_plane.h | 81 +++ >>> include/uapi/drm/drm_mode.h | 58 ++ >>> 15 files changed, 1170 insertions(+), 6 deletions(-) >>> >
On Wed, 2 Jun 2021 19:42:19 -0400 Harry Wentland <harry.wentland@amd.com> wrote: > On 2021-06-02 4:22 p.m., Shankar, Uma wrote: > > > > > >> -----Original Message----- > >> From: Pekka Paalanen <ppaalanen@gmail.com> > >> Sent: Wednesday, June 2, 2021 2:59 PM > >> To: Shankar, Uma <uma.shankar@intel.com> > >> Cc: intel-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org; Modem, > >> Bhanuprakash <bhanuprakash.modem@intel.com>; Harry Wentland > >> <harry.wentland@amd.com> > >> Subject: Re: [PATCH 00/21] Add Support for Plane Color Lut and CSC features > >> > >> On Tue, 1 Jun 2021 16:21:57 +0530 > >> Uma Shankar <uma.shankar@intel.com> wrote: > >> > >>> This is how a typical display color hardware pipeline looks like: ... > >>> This patch series adds properties for plane color features. It adds > >>> properties for degamma used to linearize data and CSC used for gamut > >>> conversion. It also includes Gamma support used to again non-linearize > >>> data as per panel supported color space. These can be utilize by user > >>> space to convert planes from one format to another, one color space to > >>> another etc. > >> > >> This is very much welcome! > >> > >> There is also the thread: > >> https://lists.freedesktop.org/archives/dri-devel/2021-May/306726.html>>> > >> Everything mentioned will interact with each other by changing what the abstract > >> KMS pixel pipeline does. I think you and Harry should probably look at each others' > >> suggestions and see how to fit them all into a single abstract KMS pipeline. > >> > >> People are adding new pieces into KMS left and right, and I fear we lose sight of how > >> everything will actually work together when all KMS properties are supposed to be > >> generic and potentially present simultaneously. This is why I would very much like to > >> have that *whole* abstract KMS pipeline documented with *everything*. Otherwise > >> it is coming really hard fast to figure out how generic userspace should use all these > >> KMS properties together. > >> > >> Or if there cannot be a single abstract KMS pipeline, then sure, have multiple, as long > >> as they are documented and how userspace will know which pipeline it is dealing > >> with, and what things are mutually exclusive so we can avoid writing userspace code > >> for combinations that will never exist. > > > > This is a good suggestion to have the whole pipeline and properties documented along with > > the exact usages. We may end with 2 properties almost doing similar work but needed due to > > underlying hardware, but we can get that properly documented and defined. > > > > I will discuss with Harry and Ville as well to define this. > > > > Just wanted to let you know that I've seen and read through both of Shankar's patchsets > and had some thoughts but haven't found the time to respond. I will respond soon. Hi Harry, awesome! > I very much agree with Pekka. We need to make sure this all plays well together and is > well documented. Maybe a library to deal with DRM KMS color management/HDR would even > be helpful. Not sure yet how I feel about that. That is an excellent question. While I am working on Weston CM&HDR, I already have issues with how to represent the color related transformations. These new hardware features exposed here are nothing I have prepared for, and would probably need changes to accommodate. The main Weston roadmap is drafted in https://gitlab.freedesktop.org/wayland/weston/-/issues/467 The MR that introduces the concept of a color transformation, and also the whole beginnings of color management, is https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/582 In that MR, there is a patch introducing struct weston_color_transform: https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/582/diffs?commit_id=cffbf7c6b2faf7391b73ff9202774f660343bd34#ba0b86259533d5000d81c9c88109c9010eb0f641_0_77 The design idea there is that libweston shall have what I call "color manager" module. That module handles all the policy decisions about color, it uses a CMM (Little CMS 2 in this case) for all the color profile computations, and based on all information it has available from display EDID, ICC profile files, Wayland clients via the CM&HDR protocol extension and more, it will ultimately produce weston_color_transform objects. weston_color_transform is a complete description of how to map a pixel in one color model/space/encoding into another, maybe with user preferred tuning/tone-mapping. E.g. from client content to the output's blending space (output space but light-linear), or from output's blending space to output's framebuffer space or maybe even monitor wire space. The mapping described by weston_color_transform shall be implemented by libweston's GL-renderer or by the DRM-backend using KMS properties, whatever works for each case. So the description cannot be opaque, it has to map to GLSL shaders (easy) and KMS properties (???). Now the problem is, what should weston_color_transform look like? The current design has two steps in a color transform: - Transfer function: identity, the traditional set of three 1D LUTs, or something else. - Color mapping: identity, a 3D LUT, or something else. "Something else" is a placeholder for whatever we want to have, but the problem in adding new types of transfer function or color mapping representations (e.g. the fancy new GAMMA_MODEs) is how will the color manager create the parameters for those? If we have ICC profiles as the original data, then we are probably limited to what LCMS2 can produce. The issue with ICC profiles is that they may contain 3D LUTs themselves, so not what I would call a parametric model. OTOH, if we have, say, enumerated operations defined by various HDR standards, we have to code those ourselves and then producing whatever fancy representation is less of a problem. Maybe that is how it has to be. If the color transformations are defined by ICC profiles, we might be stuck with old-school KMS color properties, but HDR stuff that doesn't rely on ICC can use the fancier KMS properties. I'm sure interesting questions will arise when e.g. you have the monitor in HDR mode, described with standard HDR terms, and then you have application content described with an ICC profile (maybe SDR, maybe not). We can always get a 3D LUT out of LCMS2, so theoretically it would be possible to get a huge LUT and then optimise whatever parameterised model you have to that data set. But I worry that might be too costly to do in-flight, at least in a way that blocks the compositor. Maybe do what I hear shader compilers do: produce an unoptimal model fast, then compute an optimised model asynchronously and replace when ready. And disk cache(?). A library probably makes sense in the long run, but for now, I would have no idea at all what it should look like. Thanks, pq
On 2021-06-03 10:47, Pekka Paalanen wrote: > On Wed, 2 Jun 2021 19:42:19 -0400 > Harry Wentland <harry.wentland@amd.com> wrote: > >> On 2021-06-02 4:22 p.m., Shankar, Uma wrote: >> > >> > >> >> -----Original Message----- >> >> From: Pekka Paalanen <ppaalanen@gmail.com> >> >> Sent: Wednesday, June 2, 2021 2:59 PM >> >> To: Shankar, Uma <uma.shankar@intel.com> >> >> Cc: intel-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org; Modem, >> >> Bhanuprakash <bhanuprakash.modem@intel.com>; Harry Wentland >> >> <harry.wentland@amd.com> >> >> Subject: Re: [PATCH 00/21] Add Support for Plane Color Lut and CSC features >> >> >> >> On Tue, 1 Jun 2021 16:21:57 +0530 >> >> Uma Shankar <uma.shankar@intel.com> wrote: >> >> >> >>> This is how a typical display color hardware pipeline looks like: > > ... > >> >>> This patch series adds properties for plane color features. It adds >> >>> properties for degamma used to linearize data and CSC used for gamut >> >>> conversion. It also includes Gamma support used to again non-linearize >> >>> data as per panel supported color space. These can be utilize by user >> >>> space to convert planes from one format to another, one color space to >> >>> another etc. >> >> >> >> This is very much welcome! >> >> >> >> There is also the thread: >> >> https://lists.freedesktop.org/archives/dri-devel/2021-May/306726.html>>> >> >> Everything mentioned will interact with each other by changing what the abstract >> >> KMS pixel pipeline does. I think you and Harry should probably look at each others' >> >> suggestions and see how to fit them all into a single abstract KMS pipeline. >> >> >> >> People are adding new pieces into KMS left and right, and I fear we lose sight of how >> >> everything will actually work together when all KMS properties are supposed to be >> >> generic and potentially present simultaneously. This is why I would very much like to >> >> have that *whole* abstract KMS pipeline documented with *everything*. Otherwise >> >> it is coming really hard fast to figure out how generic userspace should use all these >> >> KMS properties together. >> >> >> >> Or if there cannot be a single abstract KMS pipeline, then sure, have multiple, as long >> >> as they are documented and how userspace will know which pipeline it is dealing >> >> with, and what things are mutually exclusive so we can avoid writing userspace code >> >> for combinations that will never exist. >> > >> > This is a good suggestion to have the whole pipeline and properties documented along with >> > the exact usages. We may end with 2 properties almost doing similar work but needed due to >> > underlying hardware, but we can get that properly documented and defined. >> > >> > I will discuss with Harry and Ville as well to define this. >> > >> >> Just wanted to let you know that I've seen and read through both of >> Shankar's patchsets >> and had some thoughts but haven't found the time to respond. I will >> respond soon. > > Hi Harry, > > awesome! > >> I very much agree with Pekka. We need to make sure this all plays well >> together and is >> well documented. Maybe a library to deal with DRM KMS color >> management/HDR would even >> be helpful. Not sure yet how I feel about that. > > That is an excellent question. While I am working on Weston CM&HDR, I > already have issues with how to represent the color related > transformations. These new hardware features exposed here are nothing I > have prepared for, and would probably need changes to accommodate. > > The main Weston roadmap is drafted in > https://gitlab.freedesktop.org/wayland/weston/-/issues/467 > > The MR that introduces the concept of a color transformation, and also > the whole beginnings of color management, is > https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/582 > > In that MR, there is a patch introducing struct weston_color_transform: > https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/582/diffs?commit_id=cffbf7c6b2faf7391b73ff9202774f660343bd34#ba0b86259533d5000d81c9c88109c9010eb0f641_0_77 > > The design idea there is that libweston shall have what I call "color > manager" module. That module handles all the policy decisions about > color, it uses a CMM (Little CMS 2 in this case) for all the color > profile computations, and based on all information it has available > from display EDID, ICC profile files, Wayland clients via the CM&HDR > protocol extension and more, it will ultimately produce > weston_color_transform objects. > > weston_color_transform is a complete description of how to map a pixel > in one color model/space/encoding into another, maybe with user > preferred tuning/tone-mapping. E.g. from client content to the output's > blending space (output space but light-linear), or from output's > blending space to output's framebuffer space or maybe even monitor wire > space. > > The mapping described by weston_color_transform shall be implemented by > libweston's GL-renderer or by the DRM-backend using KMS properties, > whatever works for each case. So the description cannot be opaque, it > has to map to GLSL shaders (easy) and KMS properties (???). > > Now the problem is, what should weston_color_transform look like? > > The current design has two steps in a color transform: > - Transfer function: identity, the traditional set of three 1D LUTs, or > something else. > - Color mapping: identity, a 3D LUT, or something else. > > "Something else" is a placeholder for whatever we want to have, but the > problem in adding new types of transfer function or color mapping > representations (e.g. the fancy new GAMMA_MODEs) is how will the color > manager create the parameters for those? I think the weston_color_transform is going a bit in the wrong direction. While the 3D LUT can describe everything if it has enough precision it indeed makes sense to apply a transform before to get the required precision down. It doesn't have to be a TF though and we really don't care what it is as long as in the end the content is in the correct color space and dynamic range. This might be enough to get something off the ground right now though. In the long run however it probably makes more sense to convert the color transform to a complete pipeline of enumerated, parametric and numerical elements together with some helpers to lower (enumerated > parametric > numerical) and fuse elements (to the point that you can always convert the pipeline to a 3D LUT). The color manager ideally should provide a pipeline with the highest abstraction and avoid fusing elements if it would result in a lose of information. This is a lot more complex but it also gives us much better chances of finding a way to offload the transform. AFAIR lcms uses such a model and gives you access to the pipeline. If we want to be independent of lcms we would need our own descriptions and possibly lower some lcms elements to our own stuff. I'm also not sure how good lcms is at retaining the high level description if possible. > If we have ICC profiles as the original data, then we are probably > limited to what LCMS2 can produce. The issue with ICC profiles is that > they may contain 3D LUTs themselves, so not what I would call a > parametric model. OTOH, if we have, say, enumerated operations defined > by various HDR standards, we have to code those ourselves and then > producing whatever fancy representation is less of a problem. > > Maybe that is how it has to be. If the color transformations are > defined by ICC profiles, we might be stuck with old-school KMS color > properties, but HDR stuff that doesn't rely on ICC can use the fancier > KMS properties. I'm sure interesting questions will arise when e.g. you > have the monitor in HDR mode, described with standard HDR terms, and > then you have application content described with an ICC profile (maybe > SDR, maybe not). > > We can always get a 3D LUT out of LCMS2, so theoretically it would be > possible to get a huge LUT and then optimise whatever parameterised > model you have to that data set. But I worry that might be too costly > to do in-flight, at least in a way that blocks the compositor. Maybe do > what I hear shader compilers do: produce an unoptimal model fast, then > compute an optimised model asynchronously and replace when ready. And > disk cache(?). > > A library probably makes sense in the long run, but for now, I would > have no idea at all what it should look like. > > > Thanks, > pq
On Thu, 03 Jun 2021 14:30:41 +0200 Sebastian Wick <sebastian@sebastianwick.net> wrote: > On 2021-06-03 10:47, Pekka Paalanen wrote: > > On Wed, 2 Jun 2021 19:42:19 -0400 > > Harry Wentland <harry.wentland@amd.com> wrote: > > > >> On 2021-06-02 4:22 p.m., Shankar, Uma wrote: > >> > > >> > > >> >> -----Original Message----- > >> >> From: Pekka Paalanen <ppaalanen@gmail.com> > >> >> Sent: Wednesday, June 2, 2021 2:59 PM > >> >> To: Shankar, Uma <uma.shankar@intel.com> > >> >> Cc: intel-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org; Modem, > >> >> Bhanuprakash <bhanuprakash.modem@intel.com>; Harry Wentland > >> >> <harry.wentland@amd.com> > >> >> Subject: Re: [PATCH 00/21] Add Support for Plane Color Lut and CSC features > >> >> > >> >> On Tue, 1 Jun 2021 16:21:57 +0530 > >> >> Uma Shankar <uma.shankar@intel.com> wrote: > >> >> > >> >>> This is how a typical display color hardware pipeline looks like: > > > > ... > > > >> >>> This patch series adds properties for plane color features. It adds > >> >>> properties for degamma used to linearize data and CSC used for gamut > >> >>> conversion. It also includes Gamma support used to again non-linearize > >> >>> data as per panel supported color space. These can be utilize by user > >> >>> space to convert planes from one format to another, one color space to > >> >>> another etc. > >> >> > >> >> This is very much welcome! > >> >> > >> >> There is also the thread: > >> >> https://lists.freedesktop.org/archives/dri-devel/2021-May/306726.html>>> > >> >> Everything mentioned will interact with each other by changing what the abstract > >> >> KMS pixel pipeline does. I think you and Harry should probably look at each others' > >> >> suggestions and see how to fit them all into a single abstract KMS pipeline. > >> >> > >> >> People are adding new pieces into KMS left and right, and I fear we lose sight of how > >> >> everything will actually work together when all KMS properties are supposed to be > >> >> generic and potentially present simultaneously. This is why I would very much like to > >> >> have that *whole* abstract KMS pipeline documented with *everything*. Otherwise > >> >> it is coming really hard fast to figure out how generic userspace should use all these > >> >> KMS properties together. > >> >> > >> >> Or if there cannot be a single abstract KMS pipeline, then sure, have multiple, as long > >> >> as they are documented and how userspace will know which pipeline it is dealing > >> >> with, and what things are mutually exclusive so we can avoid writing userspace code > >> >> for combinations that will never exist. > >> > > >> > This is a good suggestion to have the whole pipeline and properties documented along with > >> > the exact usages. We may end with 2 properties almost doing similar work but needed due to > >> > underlying hardware, but we can get that properly documented and defined. > >> > > >> > I will discuss with Harry and Ville as well to define this. > >> > > >> > >> Just wanted to let you know that I've seen and read through both of > >> Shankar's patchsets > >> and had some thoughts but haven't found the time to respond. I will > >> respond soon. > > > > Hi Harry, > > > > awesome! > > > >> I very much agree with Pekka. We need to make sure this all plays well > >> together and is > >> well documented. Maybe a library to deal with DRM KMS color > >> management/HDR would even > >> be helpful. Not sure yet how I feel about that. > > > > That is an excellent question. While I am working on Weston CM&HDR, I > > already have issues with how to represent the color related > > transformations. These new hardware features exposed here are nothing I > > have prepared for, and would probably need changes to accommodate. > > > > The main Weston roadmap is drafted in > > https://gitlab.freedesktop.org/wayland/weston/-/issues/467 > > > > The MR that introduces the concept of a color transformation, and also > > the whole beginnings of color management, is > > https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/582 > > > > In that MR, there is a patch introducing struct weston_color_transform: > > https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/582/diffs?commit_id=cffbf7c6b2faf7391b73ff9202774f660343bd34#ba0b86259533d5000d81c9c88109c9010eb0f641_0_77 > > > > The design idea there is that libweston shall have what I call "color > > manager" module. That module handles all the policy decisions about > > color, it uses a CMM (Little CMS 2 in this case) for all the color > > profile computations, and based on all information it has available > > from display EDID, ICC profile files, Wayland clients via the CM&HDR > > protocol extension and more, it will ultimately produce > > weston_color_transform objects. > > > > weston_color_transform is a complete description of how to map a pixel > > in one color model/space/encoding into another, maybe with user > > preferred tuning/tone-mapping. E.g. from client content to the output's > > blending space (output space but light-linear), or from output's > > blending space to output's framebuffer space or maybe even monitor wire > > space. > > > > The mapping described by weston_color_transform shall be implemented by > > libweston's GL-renderer or by the DRM-backend using KMS properties, > > whatever works for each case. So the description cannot be opaque, it > > has to map to GLSL shaders (easy) and KMS properties (???). > > > > Now the problem is, what should weston_color_transform look like? > > > > The current design has two steps in a color transform: > > - Transfer function: identity, the traditional set of three 1D LUTs, or > > something else. > > - Color mapping: identity, a 3D LUT, or something else. > > > > "Something else" is a placeholder for whatever we want to have, but the > > problem in adding new types of transfer function or color mapping > > representations (e.g. the fancy new GAMMA_MODEs) is how will the color > > manager create the parameters for those? > > I think the weston_color_transform is going a bit in the wrong > direction. While the 3D LUT can describe everything if it has enough > precision it indeed makes sense to apply a transform before to get the > required precision down. It doesn't have to be a TF though and we really > don't care what it is as long as in the end the content is in the > correct color space and dynamic range. This might be enough to get > something off the ground right now though. Ok, please leave these comments in https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/582 and propose something? A new name for what I now called "transfer function"? It is desperately needing comments. > In the long run however it probably makes more sense to convert the > color transform to a complete pipeline of enumerated, parametric and > numerical elements together with some helpers to lower (enumerated > > parametric > numerical) and fuse elements (to the point that you can > always convert the pipeline to a 3D LUT). The color manager ideally > should provide a pipeline with the highest abstraction and avoid fusing > elements if it would result in a lose of information. This is a lot more > complex but it also gives us much better chances of finding a way to > offload the transform. > > AFAIR lcms uses such a model and gives you access to the pipeline. If we > want to be independent of lcms we would need our own descriptions and > possibly lower some lcms elements to our own stuff. I'm also not sure > how good lcms is at retaining the high level description if possible. Yes, I think LCMS and even ICC use such a model. Access to the pipeline in LCMS I don't know about yet. You can construct, but inspect? I also think you can plug custom code in LCMS into the pipeline, so it can be totally arbitrary and also opaque. Using our own description is what I'm doing, since I am keeping LCMS contained in the color manager plugin. Lowering that into what can fit in KMS properties though is a huge problem. It can reduce precision, and how much precision are you good to lose? That's a policy decision, and I'd like to contain policy in color manager. I would rather model weston_color_transform based on what KMS can do than based on what CMM can do. That way the hard problems are left for the color manager, while the rest of libweston can just implement the model directly as much as it fits e.g. in KMS. Thanks, pq
This is how a typical display color hardware pipeline looks like: +-------------------------------------------+ | RAM | | +------+ +---------+ +---------+ | | | FB 1 | | FB 2 | | FB N | | | +------+ +---------+ +---------+ | +-------------------------------------------+ | Plane Color Hardware Block | +--------------------------------------------+ | +---v-----+ +---v-------+ +---v------+ | | | Plane A | | Plane B | | Plane N | | | | DeGamma | | Degamma | | Degamma | | | +---+-----+ +---+-------+ +---+------+ | | | | | | | +---v-----+ +---v-------+ +---v------+ | | |Plane A | | Plane B | | Plane N | | | |CSC/CTM | | CSC/CTM | | CSC/CTM | | | +---+-----+ +----+------+ +----+-----+ | | | | | | | +---v-----+ +----v------+ +----v-----+ | | | Plane A | | Plane B | | Plane N | | | | Gamma | | Gamma | | Gamma | | | +---+-----+ +----+------+ +----+-----+ | | | | | | +--------------------------------------------+ +------v--------------v---------------v-------| || || || Pipe Blender || +--------------------+------------------------+ | | | | +-----------v----------+ | | | Pipe DeGamma | | | | | | | +-----------+----------+ | | | Pipe Color | | +-----------v----------+ Hardware | | | Pipe CSC/CTM | | | | | | | +-----------+----------+ | | | | | +-----------v----------+ | | | Pipe Gamma | | | | | | | +-----------+----------+ | | | | +---------------------------------------------+ | v Pipe Output This patch series adds properties for plane color features. It adds properties for degamma used to linearize data and CSC used for gamut conversion. It also includes Gamma support used to again non-linearize data as per panel supported color space. These can be utilize by user space to convert planes from one format to another, one color space to another etc. Userspace can take smart blending decisions and utilize these hardware supported plane color features to get accurate color profile. The same can help in consistent color quality from source to panel taking advantage of advanced color features in hardware. These patches add the property interfaces and enable helper functions. This series adds Intel's XE_LPD hw specific plane gamma feature. We can build up and add other platform/hardware specific implementation on top of this series. Credits: Special mention and credits to Ville Syrjala for coming up with a design for this feature and inputs. This series is based on his original design and idea. Note: Userspace support for this new UAPI will be done on Chrome. We will notify the list once we have that ready for review. ToDo: State readout for this feature will be added next. Uma Shankar (21): drm: Add Enhanced Gamma and color lut range attributes drm: Add Plane Degamma Mode property drm: Add Plane Degamma Lut property drm/i915/xelpd: Define Degamma Lut range struct for HDR planes drm/i915/xelpd: Add register definitions for Plane Degamma drm/i915/xelpd: Enable plane color features drm/i915/xelpd: Add color capabilities of SDR planes drm/i915/xelpd: Program Plane Degamma Registers drm/i915/xelpd: Add plane color check to glk_plane_color_ctl drm/i915/xelpd: Initialize plane color features drm/i915/xelpd: Load plane color luts from atomic flip drm: Add Plane CTM property drm: Add helper to attach Plane ctm property drm/i915/xelpd: Define Plane CSC Registers drm/i915/xelpd: Enable Plane CSC drm: Add Plane Gamma Mode property drm: Add Plane Gamma Lut property drm/i915/xelpd: Define and Initialize Plane Gamma Lut range drm/i915/xelpd: Add register definitions for Plane Gamma drm/i915/xelpd: Program Plane Gamma Registers drm/i915/xelpd: Enable plane gamma Documentation/gpu/drm-kms.rst | 90 +++ drivers/gpu/drm/drm_atomic.c | 1 + drivers/gpu/drm/drm_atomic_state_helper.c | 12 + drivers/gpu/drm/drm_atomic_uapi.c | 38 ++ drivers/gpu/drm/drm_color_mgmt.c | 177 +++++- .../gpu/drm/i915/display/intel_atomic_plane.c | 6 + .../gpu/drm/i915/display/intel_atomic_plane.h | 2 + drivers/gpu/drm/i915/display/intel_color.c | 513 ++++++++++++++++++ drivers/gpu/drm/i915/display/intel_color.h | 2 + .../drm/i915/display/skl_universal_plane.c | 15 +- drivers/gpu/drm/i915/i915_drv.h | 3 + drivers/gpu/drm/i915/i915_reg.h | 176 +++++- include/drm/drm_mode_object.h | 2 +- include/drm/drm_plane.h | 81 +++ include/uapi/drm/drm_mode.h | 58 ++ 15 files changed, 1170 insertions(+), 6 deletions(-)