dri-devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Shashank Sharma <shashank.sharma@intel.com>
To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org,
	emil.l.velikov@gmail.com, matthew.d.roper@intel.com,
	robert.bradford@intel.com, jim.bish@intel.com
Cc: annie.j.matheson@intel.com, kausalmalladi@gmail.com,
	daniel.vetter@intel.com, =gary.k.smith@intel.com
Subject: [PATCH v5 10/22] drm/i915: Register color correction capabilities
Date: Tue, 13 Oct 2015 18:09:45 +0530	[thread overview]
Message-ID: <1444739997-24831-11-git-send-email-shashank.sharma@intel.com> (raw)
In-Reply-To: <1444739997-24831-1-git-send-email-shashank.sharma@intel.com>

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 bf14096..6044e5c 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -785,6 +785,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");
+	}
 }
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2015-10-13 12:39 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-13 12:39 [PATCH v5 00/22] Color Management for DRM Shashank Sharma
2015-10-13 12:39 ` [PATCH v5 01/22] drm: Create Color Management DRM properties Shashank Sharma
2015-10-13 12:39 ` [PATCH v5 02/22] drm: Create Color Management query properties Shashank Sharma
2015-10-13 12:39 ` [PATCH v5 03/22] drm: Add color correction blobs in CRTC state Shashank Sharma
2015-10-13 12:39 ` [PATCH v5 04/22] drm: Add set property support for color manager Shashank Sharma
2015-10-13 12:39 ` [PATCH v5 05/22] drm: Add get " Shashank Sharma
2015-10-13 12:39 ` [PATCH v5 06/22] drm: Add drm structures for palette color property Shashank Sharma
2015-10-13 12:39 ` [PATCH v5 07/22] drm: Add structure to set/get a CTM " Shashank Sharma
2015-10-13 12:39 ` [PATCH v5 08/22] drm/i915: Add set property interface for CRTC Shashank Sharma
2015-10-13 12:39 ` [PATCH v5 09/22] drm/i915: Create color management files Shashank Sharma
2015-10-13 12:39 ` Shashank Sharma [this message]
2015-10-13 12:39 ` [PATCH v5 11/22] drm/i915: CHV: Load gamma color correction values Shashank Sharma
2015-10-13 12:39 ` [PATCH v5 12/22] drm/i915: CHV: Load degamma " Shashank Sharma
2015-10-13 12:39 ` [PATCH v5 13/22] drm/i915: CHV: Pipe level Gamma correction Shashank Sharma
2015-10-13 12:39 ` [PATCH v5 14/22] drm/i915: CHV: Pipe level degamma correction Shashank Sharma
2015-10-13 12:39 ` [PATCH v5 15/22] drm/i915: CHV: Pipe level CSC correction Shashank Sharma
2015-10-13 12:39 ` [PATCH v5 16/22] drm/i915: Commit color correction to CRTC Shashank Sharma
2015-10-13 12:39 ` [PATCH v5 17/22] drm/i915: Attach color properties " Shashank Sharma
2015-10-13 12:39 ` [PATCH v5 18/22] drm/i915: BDW: Load gamma correction values Shashank Sharma
2015-10-13 12:39 ` [PATCH v5 19/22] drm/i915: BDW: Pipe level Gamma correction Shashank Sharma
2015-10-13 12:39 ` [PATCH v5 20/22] drm/i915: BDW: Load degamma correction values Shashank Sharma
2015-10-13 12:39 ` [PATCH v5 21/22] drm/i915: BDW: Pipe level degamma correction Shashank Sharma
2015-10-13 12:39 ` [PATCH v5 22/22] drm/i915: BDW: Pipe level CSC correction Shashank Sharma

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=1444739997-24831-11-git-send-email-shashank.sharma@intel.com \
    --to=shashank.sharma@intel.com \
    --cc==gary.k.smith@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=jim.bish@intel.com \
    --cc=kausalmalladi@gmail.com \
    --cc=matthew.d.roper@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