From: "Sharma, Shashank" <shashank.sharma@intel.com>
To: Emil Velikov <emil.l.velikov@gmail.com>
Cc: "Matheson, Annie J" <annie.j.matheson@intel.com>,
Robert Bradford <robert.bradford@intel.com>,
"Palleti, Avinash Reddy" <avinash.reddy.palleti@intel.com>,
"intel-gfx@lists.freedesktop.org"
<intel-gfx@lists.freedesktop.org>,
ML dri-devel <dri-devel@lists.freedesktop.org>,
"Mukherjee, Indranil" <indranil.mukherjee@intel.com>,
Jim Bish <jim.bish@intel.com>,
"Barnes, Jesse" <jesse.barnes@intel.com>,
"Smith, Gary K" <gary.k.smith@intel.com>,
Kausal Malladi <kausalmalladi@gmail.com>,
"Vetter, Daniel" <daniel.vetter@intel.com>,
kiran.s.kumar@intel.com
Subject: Re: [PATCH 21/22] drm/i915: BDW: Pipe level degamma correction
Date: Sat, 10 Oct 2015 11:01:15 +0530 [thread overview]
Message-ID: <5618A2A3.9080309@intel.com> (raw)
In-Reply-To: <CACvgo52Kw8Ai=AeXQZzpJq3NW3M5Mk8-OCFUaVYx652edqkJRw@mail.gmail.com>
Regards
Shashank
On 10/10/2015 5:19 AM, Emil Velikov wrote:
> Hi Shashank,
>
> On 9 October 2015 at 20:29, Shashank Sharma <shashank.sharma@intel.com> wrote:
>> BDW/SKL/BXT supports Degamma color correction feature, which
>> linearizes the non-linearity due to gamma encoded color values.
>> This will be applied before Color Transformation.
>>
>> This patch does the following:
>> 1. Adds the core function to program DeGamma correction values for
>> BDW/SKL/BXT platform
>> 2. Adds DeGamma correction macros/defines
>>
>> Signed-off-by: Shashank Sharma <shashank.sharma@intel.com>
>> Signed-off-by: Kausal Malladi <kausalmalladi@gmail.com>
>> ---
>> drivers/gpu/drm/i915/intel_color_manager.c | 59 ++++++++++++++++++++++++++++++
>> 1 file changed, 59 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_color_manager.c b/drivers/gpu/drm/i915/intel_color_manager.c
>> index 74f8fc3..e659382 100644
>> --- a/drivers/gpu/drm/i915/intel_color_manager.c
>> +++ b/drivers/gpu/drm/i915/intel_color_manager.c
>> @@ -273,6 +273,63 @@ static int bdw_set_gamma(struct drm_device *dev, struct drm_property_blob *blob,
>> return 0;
>> }
>>
>> +static int bdw_set_degamma(struct drm_device *dev,
>> + struct drm_property_blob *blob, struct drm_crtc *crtc)
>> +{
>> + enum pipe pipe;
>> + int num_samples, length;
>> + u32 index, mode;
>> + u32 pal_prec_index, pal_prec_data;
>> + struct drm_palette *degamma_data;
>> + struct drm_crtc_state *state = crtc->state;
>> + struct drm_i915_private *dev_priv = dev->dev_private;
>> + struct drm_r32g32b32 *correction_values = NULL;
>> +
>> + if (WARN_ON(!blob))
>> + return -EINVAL;
>> +
>> + degamma_data = (struct drm_palette *)blob->data;
>> + pipe = to_intel_crtc(crtc)->pipe;
>> + num_samples = degamma_data->num_samples;
>> +
>> + if (num_samples == GAMMA_DISABLE_VALS) {
>> + /* Disable degamma on Pipe */
>> + mode = I915_READ(GAMMA_MODE(pipe)) & ~GAMMA_MODE_MODE_MASK;
>> + I915_WRITE(GAMMA_MODE(pipe), mode | GAMMA_MODE_MODE_8BIT);
>> +
>> + state->palette_before_ctm_blob = NULL;
>> + DRM_DEBUG_DRIVER("Disabling degamma on Pipe %c\n",
>> + pipe_name(pipe));
>> + return 0;
>> + }
>> +
>> + if (num_samples != BDW_SPLITGAMMA_MAX_VALS) {
>> + DRM_ERROR("Invalid number of samples\n");
>> + return -EINVAL;
>> + }
>> +
> Why don't you use switch statement here ?
>
Same as CHV degamma. Degamma has only 3 conditions (enable/disable and
invalid), and we generally try to accommodate upto 3 condition within if
... else.
>> + length = num_samples * sizeof(struct drm_r32g32b32);
>> + mode = I915_READ(GAMMA_MODE(pipe));
>> + pal_prec_index = _PREC_PAL_INDEX(pipe);
>> + pal_prec_data = _PREC_PAL_DATA(pipe);
>> +
>> + correction_values = (struct drm_r32g32b32 *)°amma_data->lut;
>> + index = I915_READ(pal_prec_index);
>> + index |= BDW_INDEX_AUTO_INCREMENT | BDW_INDEX_SPLIT_MODE;
>> + I915_WRITE(pal_prec_index, index);
>> +
>> + bdw_write_10bit_gamma_precision(dev, correction_values,
>> + pal_prec_data, BDW_SPLITGAMMA_MAX_VALS);
>> +
>> + /* Enable DeGamma on Pipe */
>> + mode &= ~GAMMA_MODE_MODE_MASK;
>> + I915_WRITE(GAMMA_MODE(pipe), mode | GAMMA_MODE_MODE_SPLIT);
>> + DRM_DEBUG_DRIVER("DeGamma correction enabled on Pipe %c\n",
>> + pipe_name(pipe));
> Indentation seems funny here.
>
Yeah, every time time we try to publish a success story, pipe_name()
ruins it :). Will fix it.
> Regards,
> Emil
>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2015-10-10 5:31 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
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 [this message]
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=5618A2A3.9080309@intel.com \
--to=shashank.sharma@intel.com \
--cc=annie.j.matheson@intel.com \
--cc=avinash.reddy.palleti@intel.com \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=emil.l.velikov@gmail.com \
--cc=gary.k.smith@intel.com \
--cc=indranil.mukherjee@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jesse.barnes@intel.com \
--cc=jim.bish@intel.com \
--cc=kausalmalladi@gmail.com \
--cc=kiran.s.kumar@intel.com \
--cc=robert.bradford@intel.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