All of 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
Subject: [PATCH v7 04/25] drm: Add set property support for color manager
Date: Tue, 20 Oct 2015 18:04:31 +0530	[thread overview]
Message-ID: <1445344492-8296-5-git-send-email-shashank.sharma@intel.com> (raw)
In-Reply-To: <1445344492-8296-1-git-send-email-shashank.sharma@intel.com>

As per DRM color manager design, if a userspace wants to set a correction
blob, it prepares it and sends the blob_id to kernel via set_property
call. DRM framework takes this blob_id, gets the blob, and saves it
in the CRTC state, so that, during the atomic_commit, the color correction
values from the blob can referred and applied on display controller
registers.

This patch adds this set_property support for color correction blobs
in drm framework.

Signed-off-by: Shashank Sharma <shashank.sharma@intel.com>
Signed-off-by: Kausal malladi <kausalmalladi@gmail.com>
---
 drivers/gpu/drm/drm_atomic.c | 53 ++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 51 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index 7bb3845..12a34e9 100644
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -390,6 +390,38 @@ int drm_atomic_set_mode_prop_for_crtc(struct drm_crtc_state *state,
 EXPORT_SYMBOL(drm_atomic_set_mode_prop_for_crtc);
 
 /**
+ * drm_atomic_crtc_set_blob - find and set a blob
+ * @state_blob: reference pointer to the color blob in the crtc_state
+ * @blob_id: blob_id coming from set_property() call
+ *
+ * Set a color correction blob (originating from a set blob property) on the
+ * desired CRTC state. This function will take reference of the blob property
+ * in the CRTC state, finds the blob based on blob_id (which comes from
+ * set_property call) and set the blob at the proper place.
+ *
+ * RETURNS:
+ * Zero on success, error code on failure.
+ */
+static int drm_atomic_crtc_set_blob(struct drm_device *dev,
+	struct drm_property_blob **state_blob, uint32_t blob_id)
+{
+	struct drm_property_blob *blob;
+
+	blob = drm_property_lookup_blob(dev, blob_id);
+	if (!blob) {
+		DRM_DEBUG_KMS("Invalid Blob ID\n");
+		return -EINVAL;
+	}
+
+	if (*state_blob)
+		drm_property_unreference_blob(*state_blob);
+
+	/* Attach the blob to be committed in state */
+	*state_blob = blob;
+	return 0;
+}
+
+/**
  * drm_atomic_crtc_set_property - set property on CRTC
  * @crtc: the drm CRTC to set a property on
  * @state: the state object to update with the new property value
@@ -422,8 +454,25 @@ int drm_atomic_crtc_set_property(struct drm_crtc *crtc,
 		if (mode)
 			drm_property_unreference_blob(mode);
 		return ret;
-	}
-	else if (crtc->funcs->atomic_set_property)
+	} else if (property == config->cm_palette_after_ctm_property) {
+		ret = drm_atomic_crtc_set_blob(dev,
+				&state->palette_after_ctm_blob, val);
+		if (ret)
+			DRM_ERROR("Failed to load blob palette_after_ctm\n");
+		return ret;
+	} else if (property == config->cm_palette_before_ctm_property) {
+		ret = drm_atomic_crtc_set_blob(dev,
+				&state->palette_before_ctm_blob, val);
+		if (ret)
+			DRM_ERROR("Failed to load blob palette_before_ctm\n");
+		return ret;
+	} else if (property == config->cm_ctm_property) {
+		ret = drm_atomic_crtc_set_blob(dev,
+				&state->ctm_blob, val);
+		if (ret)
+			DRM_ERROR("Failed to load blob ctm\n");
+		return ret;
+	} else if (crtc->funcs->atomic_set_property)
 		return crtc->funcs->atomic_set_property(crtc, state, property, val);
 	else
 		return -EINVAL;
-- 
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-20 12:34 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-20 12:34 [PATCH v7 00/25] Color Management for DRM framework Shashank Sharma
2015-10-20 12:34 ` [PATCH v7 01/25] drm: Create Color Management DRM properties Shashank Sharma
2015-10-20 12:34 ` [PATCH v7 02/25] drm: Create Color Management query properties Shashank Sharma
2015-10-20 12:34 ` [PATCH v7 03/25] drm: Add color correction blobs in CRTC state Shashank Sharma
2015-10-20 12:34 ` Shashank Sharma [this message]
2015-10-20 12:34 ` [PATCH v7 05/25] drm: Add get property support for color manager Shashank Sharma
2015-10-20 12:34 ` [PATCH v7 06/25] drm: Add drm structures for palette color property Shashank Sharma
2015-10-20 12:34 ` [PATCH v7 07/25] drm: Add structure for CTM " Shashank Sharma
2015-10-20 12:34 ` [PATCH v7 08/25] drm: Add color correction state flag Shashank Sharma
2015-10-20 13:58   ` [Intel-gfx] " kbuild test robot
2015-10-29 15:42     ` FW: " Sharma, Shashank
2015-10-30  9:54       ` Jani Nikula
2015-10-20 12:34 ` [PATCH v7 09/25] drm/i915: Add set property interface for CRTC Shashank Sharma
2015-10-20 12:34 ` [PATCH v7 10/25] drm/i915: Create color management files Shashank Sharma
2015-10-20 12:34 ` [PATCH v7 11/25] drm/i915: Register color correction capabilities Shashank Sharma
2015-10-21 23:19   ` Bish, Jim
2015-10-22  7:19     ` Daniel Vetter
2015-10-22 12:05     ` Rob Bradford
2015-10-26  3:59       ` Sharma, Shashank
2015-10-20 12:34 ` [PATCH v7 12/25] drm/i915: CHV: Load gamma color correction values Shashank Sharma
2015-10-20 12:34 ` [PATCH v7 13/25] drm/i915: CHV: Load degamma " Shashank Sharma
2015-10-20 12:34 ` [PATCH v7 14/25] drm/i915: CHV: Pipe level Gamma correction Shashank Sharma
2015-10-20 12:34 ` [PATCH v7 15/25] drm/i915: CHV: Pipe level degamma correction Shashank Sharma
2015-10-20 12:34 ` [PATCH v7 16/25] drm/i915: CHV: Pipe level CSC correction Shashank Sharma
2015-10-20 12:34 ` [PATCH v7 17/25] drm/i915: Commit color correction to CRTC Shashank Sharma
2015-10-20 12:34 ` [PATCH v7 18/25] drm/i915: Attach color properties " Shashank Sharma
2015-10-20 12:34 ` [PATCH v7 19/25] drm/i915: BDW: Load gamma correction values Shashank Sharma
2015-10-20 12:34 ` [PATCH v7 20/25] drm/i915: BDW: Pipe level Gamma correction Shashank Sharma
2015-10-20 12:34 ` [PATCH v7 21/25] drm/i915: BDW: Load degamma correction values Shashank Sharma
2015-10-20 12:34 ` [PATCH v7 22/25] drm/i915: BDW: Pipe level degamma correction Shashank Sharma
2015-10-20 12:34 ` [PATCH v7 23/25] drm/i915: BDW: Pipe level CSC correction Shashank Sharma
2015-10-20 12:34 ` [PATCH v7 24/25] drm/i915: disable plane gamma Shashank Sharma
2015-10-20 12:34 ` [PATCH v7 25/25] drm/i915: Commit color correction only when needed 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=1445344492-8296-5-git-send-email-shashank.sharma@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=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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.