From: "Sharma, Shashank" <shashank.sharma@intel.com>
To: Emil Velikov <emil.l.velikov@gmail.com>
Cc: "Matheson, Annie J" <annie.j.matheson@intel.com>,
"intel-gfx@lists.freedesktop.org"
<intel-gfx@lists.freedesktop.org>,
ML dri-devel <dri-devel@lists.freedesktop.org>,
"Barnes, Jesse" <jesse.barnes@intel.com>,
Kausal Malladi <kausalmalladi@gmail.com>,
"Vetter, Daniel" <daniel.vetter@intel.com>
Subject: Re: [PATCH 10/22] drm/i915: Register color correction capabilities
Date: Sat, 10 Oct 2015 10:31:56 +0530 [thread overview]
Message-ID: <56189BC4.30004@intel.com> (raw)
In-Reply-To: <CACvgo53pfPOvPqcR=21UQE2kcoQrp-w09hBXnh8eThod_D-1MQ@mail.gmail.com>
Regards
Shashank
On 10/10/2015 3:51 AM, Emil Velikov wrote:
> Hi Shashank,
>
> On 9 October 2015 at 20:29, Shashank Sharma <shashank.sharma@intel.com> wrote:
>> From DRM color management:
>> ============================
>> DRM color manager supports these color properties:
>> 1. "ctm": Color transformation matrix property, where a
>> color transformation matrix of 9 correction values gets
>> applied as correction.
>> 2. "palette_before_ctm": for corrections which get applied
>> beore color transformation matrix correction.
>> 3. "palette_after_ctm": for corrections which get applied
>> after color transformation matrix correction.
>>
>> These color correction capabilities may differ per platform, supporting
>> various different no. of correction coefficients. So DRM color manager
>> support few properties using which a user space can query the platform's
>> capability, and prepare color correction accordingly.
>> These query properties are:
>> 1. cm_coeff_after_ctm_property
>> 2. cm_coeff_before_ctm_property
>> (CTM is fix to 9 coefficients across industry)
>>
>> Now, Intel color manager registers:
>> ======================================
>> 1. Gamma correction property as "palette_after_ctm" property
>> 2. Degamma correction capability as "palette_bafore_ctm" property
>> capability as "palette_after_ctm" DRM color property hook.
>> 3. CSC as "ctm" property.
>>
>> So finally, This patch does the following:
>> 1. Add a function which loads the platform's color correction
>> capabilities in the cm_crtc_palette_capabilities_property structure.
>> 2. Attaches the cm_crtc_palette_capabilities_property to every CRTC
>> getting initiaized.
>> 3. Adds two new parameters "num_samples_after_ctm" and
>> "num_samples_before_ctm" in intel_device_info as gamma and
>> degamma coefficients vary per platform basis.
>>
>> Signed-off-by: Shashank Sharma <shashank.sharma@intel.com>
>> Signed-off-by: Kausal Malladi <kausalmalladi@gmail.com>
>> ---
>> drivers/gpu/drm/i915/i915_drv.h | 2 ++
>> drivers/gpu/drm/i915/intel_color_manager.c | 33 +++++++++++++++++++++++++++++-
>> 2 files changed, 34 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
>> index ad37b25..8bf1d6f 100644
>> --- a/drivers/gpu/drm/i915/i915_drv.h
>> +++ b/drivers/gpu/drm/i915/i915_drv.h
>> @@ -798,6 +798,8 @@ struct intel_device_info {
>> u8 num_sprites[I915_MAX_PIPES];
>> u8 gen;
>> u8 ring_mask; /* Rings supported by the HW */
>> + u16 num_samples_after_ctm;
>> + u16 num_samples_before_ctm;
>> DEV_INFO_FOR_EACH_FLAG(DEFINE_FLAG, SEP_SEMICOLON);
>> /* Register offsets for the various display pipes and transcoders */
>> int pipe_offsets[I915_MAX_TRANSCODERS];
>> diff --git a/drivers/gpu/drm/i915/intel_color_manager.c b/drivers/gpu/drm/i915/intel_color_manager.c
>> index 7357d99..e466748 100644
>> --- a/drivers/gpu/drm/i915/intel_color_manager.c
>> +++ b/drivers/gpu/drm/i915/intel_color_manager.c
>> @@ -28,6 +28,37 @@
>> #include "intel_color_manager.h"
>>
>> void intel_attach_color_properties_to_crtc(struct drm_device *dev,
>> - struct drm_mode_object *mode_obj)
>> + struct drm_crtc *crtc)
>> {
>> + struct drm_mode_config *config = &dev->mode_config;
>> + struct drm_mode_object *mode_obj = &crtc->base;
>> +
>> + /*
>> + * Register:
>> + * =========
>> + * Gamma correction as palette_after_ctm property
>> + * Degamma correction as palette_before_ctm property
>> + *
>> + * Load:
>> + * =====
>> + * no. of coefficients supported on this platform for gamma
>> + * and degamma with the query properties. A user
>> + * space agent should read these query property, and prepare
>> + * the color correction values accordingly. Its expected from the
>> + * driver to load the right number of coefficients during the init
>> + * phase.
>> + */
>> + if (config->cm_coeff_after_ctm_property) {
>> + drm_object_attach_property(mode_obj,
>> + config->cm_coeff_after_ctm_property,
>> + INTEL_INFO(dev)->num_samples_after_ctm);
>> + DRM_DEBUG_DRIVER("Gamma query property initialized\n");
>> + }
>> +
>> + if (config->cm_coeff_before_ctm_property) {
>> + drm_object_attach_property(mode_obj,
>> + config->cm_coeff_before_ctm_property,
>> + INTEL_INFO(dev)->num_samples_before_ctm);
>> + DRM_DEBUG_DRIVER("Degamma query property initialized\n");
>> + }
> Shouldn't this commit be squashed with the previous ? You're also
> missing the function declaration.
>
Please see the history of the review comments, initially this patch was
like as you suggested. But one of the previous review comments,
suggested to split that into two, as it was 'overdoing' stuff. So I had
split it into two separate ones, so I think this is ok :)
Also, one of the previous review comments was to call this function only
when the whole framework is in place, so that it would look like we are
enabling, when we have stuff ready. So this is just the body of the
function, and definition is coming up in next patch, where this function
is being called from intel_crtc_init (patch 17/22 to be specific).
> Regards,
> Emil
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2015-10-10 5:01 UTC|newest]
Thread overview: 77+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-09 19:28 [PATCH 00/22] Color Management for DRM Shashank Sharma
2015-10-09 19:28 ` [PATCH 01/22] drm: Create Color Management DRM properties Shashank Sharma
2015-10-09 19:48 ` kbuild test robot
2015-10-09 19:28 ` [PATCH 02/22] drm: Create Color Management query properties Shashank Sharma
2015-10-09 20:05 ` [Intel-gfx] " kbuild test robot
2015-10-09 19:28 ` [PATCH 03/22] drm: Add color correction blobs in CRTC state Shashank Sharma
2015-10-09 20:21 ` kbuild test robot
2015-10-09 22:23 ` Emil Velikov
2015-10-10 4:48 ` Sharma, Shashank
2015-10-09 19:28 ` [PATCH 04/22] drm: Add set property support for color manager Shashank Sharma
2015-10-09 20:39 ` kbuild test robot
2015-10-09 22:25 ` Emil Velikov
2015-10-10 4:50 ` Sharma, Shashank
2015-10-09 19:28 ` [PATCH 05/22] drm: Add get " Shashank Sharma
2015-10-09 19:28 ` [PATCH 06/22] drm: Add drm structures for palette color property Shashank Sharma
2015-10-09 19:28 ` [PATCH 07/22] drm: Add structure to set/get a CTM " Shashank Sharma
2015-10-09 19:28 ` [PATCH 08/22] drm/i915: Add set property interface for CRTC Shashank Sharma
2015-10-09 19:28 ` [PATCH 09/22] drm/i915: Create color management files Shashank Sharma
2015-10-09 22:47 ` Emil Velikov
2015-10-10 4:55 ` Sharma, Shashank
2015-10-13 12:59 ` Emil Velikov
2015-10-13 13:33 ` Sharma, Shashank
2015-10-09 19:29 ` [PATCH 10/22] drm/i915: Register color correction capabilities Shashank Sharma
2015-10-09 22:21 ` Emil Velikov
2015-10-10 5:01 ` Sharma, Shashank [this message]
2015-10-13 13:03 ` Emil Velikov
2015-10-13 13:36 ` Sharma, Shashank
2015-10-13 13:53 ` Emil Velikov
2015-10-13 14:01 ` Sharma, Shashank
2015-10-09 19:29 ` [PATCH 11/22] drm/i915: CHV: Load gamma color correction values Shashank Sharma
2015-10-09 19:29 ` [PATCH 12/22] drm/i915: CHV: Load degamma " Shashank Sharma
2015-10-09 19:29 ` [PATCH 13/22] drm/i915: CHV: Pipe level Gamma correction Shashank Sharma
2015-10-09 23:07 ` Emil Velikov
2015-10-10 5:09 ` Sharma, Shashank
2015-10-13 13:08 ` Emil Velikov
2015-10-13 13:40 ` Sharma, Shashank
2015-10-13 13:59 ` Emil Velikov
2015-10-13 14:04 ` Sharma, Shashank
2015-10-09 19:29 ` [PATCH 14/22] drm/i915: CHV: Pipe level degamma correction Shashank Sharma
2015-10-09 23:11 ` Emil Velikov
2015-10-10 5:13 ` Sharma, Shashank
2015-10-09 19:29 ` [PATCH 15/22] drm/i915: CHV: Pipe level CSC correction Shashank Sharma
2015-10-09 23:43 ` Emil Velikov
2015-10-10 5:26 ` Sharma, Shashank
2015-10-13 13:33 ` Emil Velikov
2015-10-13 13:49 ` Sharma, Shashank
2015-10-09 19:29 ` [PATCH 16/22] drm/i915: Commit color correction to CRTC Shashank Sharma
2015-10-09 23:24 ` Emil Velikov
2015-10-10 5:20 ` Sharma, Shashank
2015-10-13 13:17 ` Emil Velikov
2015-10-13 13:44 ` Sharma, Shashank
2015-10-09 19:29 ` [PATCH 17/22] drm/i915: Attach color properties " Shashank Sharma
2015-10-09 23:45 ` Emil Velikov
2015-10-10 5:28 ` Sharma, Shashank
2015-10-09 19:29 ` [PATCH 18/22] drm/i915: BDW: Load gamma correction values Shashank Sharma
2015-10-09 19:29 ` [PATCH 19/22] drm/i915: BDW: Pipe level Gamma correction Shashank Sharma
2015-10-09 23:39 ` Emil Velikov
2015-10-10 5:21 ` Sharma, Shashank
2015-10-13 13:23 ` Emil Velikov
2015-10-13 13:46 ` Sharma, Shashank
2015-10-12 18:09 ` Rob Bradford
2015-10-13 10:56 ` Sharma, Shashank
2015-10-09 19:29 ` [PATCH 20/22] drm/i915: BDW: Load degamma correction values Shashank Sharma
2015-10-12 18:13 ` Rob Bradford
2015-10-13 10:59 ` Sharma, Shashank
2015-10-09 19:29 ` [PATCH 21/22] drm/i915: BDW: Pipe level degamma correction Shashank Sharma
2015-10-09 23:49 ` Emil Velikov
2015-10-10 5:31 ` Sharma, Shashank
2015-10-13 13:39 ` Emil Velikov
2015-10-12 18:08 ` Rob Bradford
2015-10-13 10:51 ` Sharma, Shashank
2015-10-09 19:29 ` [PATCH 22/22] drm/i915: BDW: Pipe level CSC correction Shashank Sharma
2015-10-09 23:54 ` Emil Velikov
2015-10-10 5:34 ` Sharma, Shashank
2015-10-13 13:45 ` Emil Velikov
2015-10-13 13:52 ` Sharma, Shashank
2015-10-12 16:49 ` Rob Bradford
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56189BC4.30004@intel.com \
--to=shashank.sharma@intel.com \
--cc=annie.j.matheson@intel.com \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=emil.l.velikov@gmail.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jesse.barnes@intel.com \
--cc=kausalmalladi@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox