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 v6 09/23] drm/i915: Create color management files
Date: Fri, 16 Oct 2015 19:58:57 +0530 [thread overview]
Message-ID: <1445005751-14918-10-git-send-email-shashank.sharma@intel.com> (raw)
In-Reply-To: <1445005751-14918-1-git-send-email-shashank.sharma@intel.com>
This patch create new files intel_color_manager.c which
will contain the core color correction code for I915 driver
and its header intel_color_manager.h
The per color property patches coming up in this patch series
will fill the appropriate functions in this file.
Signed-off-by: Shashank Sharma <shashank.sharma@intel.com>
Signed-off-by: Kausal Malladi <kausalmalladi@gmail.com>
---
drivers/gpu/drm/i915/Makefile | 3 +-
drivers/gpu/drm/i915/intel_color_manager.c | 33 ++++++++++++++++++++
drivers/gpu/drm/i915/intel_color_manager.h | 50 ++++++++++++++++++++++++++++++
drivers/gpu/drm/i915/intel_drv.h | 3 ++
4 files changed, 88 insertions(+), 1 deletion(-)
create mode 100644 drivers/gpu/drm/i915/intel_color_manager.c
create mode 100644 drivers/gpu/drm/i915/intel_color_manager.h
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index 44d290a..56caf9e 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -64,7 +64,8 @@ i915-y += intel_audio.o \
intel_overlay.o \
intel_psr.o \
intel_sideband.o \
- intel_sprite.o
+ intel_sprite.o \
+ intel_color_manager.o
i915-$(CONFIG_ACPI) += intel_acpi.o intel_opregion.o
i915-$(CONFIG_DRM_FBDEV_EMULATION) += intel_fbdev.o
diff --git a/drivers/gpu/drm/i915/intel_color_manager.c b/drivers/gpu/drm/i915/intel_color_manager.c
new file mode 100644
index 0000000..b03ee94
--- /dev/null
+++ b/drivers/gpu/drm/i915/intel_color_manager.c
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2015 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ * Shashank Sharma <shashank.sharma@intel.com>
+ * Kausal Malladi <Kausal.Malladi@intel.com>
+ */
+
+#include "intel_color_manager.h"
+
+void intel_attach_color_properties_to_crtc(struct drm_device *dev,
+ struct drm_crtc *crtc)
+{
+}
diff --git a/drivers/gpu/drm/i915/intel_color_manager.h b/drivers/gpu/drm/i915/intel_color_manager.h
new file mode 100644
index 0000000..eec52a7
--- /dev/null
+++ b/drivers/gpu/drm/i915/intel_color_manager.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2015 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ * Shashank Sharma <shashank.sharma@intel.com>
+ * Kausal Malladi <Kausal.Malladi@intel.com>
+ */
+#include <drm/drmP.h>
+#include <drm/drm_crtc_helper.h>
+#include "i915_drv.h"
+
+/* Color management bit utilities */
+#define GET_BIT_MASK(n) ((1 << n) - 1)
+
+/* Read bits of a word from bit no. 'start'(lsb) till 'n' bits */
+#define GET_BITS(x, start, nbits) ((x >> start) & GET_BIT_MASK(nbits))
+
+/* Round off by adding 1 to the immediate lower bit */
+#define GET_BITS_ROUNDOFF(x, start, nbits) \
+ ((GET_BITS(x, start, (nbits + 1)) + 1) >> 1)
+
+/* Clear bits of a word from bit no. 'start' till nbits */
+#define CLEAR_BITS(x, start, nbits) ( \
+ x &= ~((GET_BIT_MASK(nbits) << start)))
+
+/* Write bit_pattern of no_bits bits in a target word */
+#define SET_BITS(target, bit_pattern, start_bit, no_bits) \
+ do { \
+ CLEAR_BITS(target, start_bit, no_bits); \
+ target |= (bit_pattern << start_bit); \
+ } while (0)
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 0598932..2e4e97d 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1477,4 +1477,7 @@ void intel_plane_destroy_state(struct drm_plane *plane,
struct drm_plane_state *state);
extern const struct drm_plane_helper_funcs intel_plane_helper_funcs;
+/* intel_color_manager.c */
+void intel_attach_color_properties_to_crtc(struct drm_device *dev,
+ struct drm_crtc *crtc);
#endif /* __INTEL_DRV_H__ */
--
1.9.1
_______________________________________________
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-16 14:28 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-16 14:28 [PATCH v6 00/23] Color Management for DRM framework Shashank Sharma
2015-10-16 14:28 ` [PATCH v6 01/23] drm: Create Color Management DRM properties Shashank Sharma
2015-10-16 14:28 ` [PATCH v6 02/23] drm: Create Color Management query properties Shashank Sharma
2015-10-16 14:28 ` [PATCH v6 03/23] drm: Add color correction blobs in CRTC state Shashank Sharma
2015-10-16 14:28 ` [PATCH v6 04/23] drm: Add set property support for color manager Shashank Sharma
2015-10-16 14:28 ` [PATCH v6 05/23] drm: Add get " Shashank Sharma
2015-10-16 14:28 ` [PATCH v6 06/23] drm: Add drm structures for palette color property Shashank Sharma
2015-10-16 14:28 ` [PATCH v6 07/23] drm: Add structure for CTM " Shashank Sharma
2015-10-16 14:28 ` [PATCH v6 08/23] drm/i915: Add set property interface for CRTC Shashank Sharma
2015-10-16 14:28 ` Shashank Sharma [this message]
2015-10-16 14:28 ` [PATCH v6 10/23] drm/i915: Register color correction capabilities Shashank Sharma
2015-10-16 14:28 ` [PATCH v6 11/23] drm/i915: CHV: Load gamma color correction values Shashank Sharma
2015-10-16 14:29 ` [PATCH v6 12/23] drm/i915: CHV: Load degamma " Shashank Sharma
2015-10-16 14:29 ` [PATCH v6 13/23] drm/i915: CHV: Pipe level Gamma correction Shashank Sharma
2015-10-16 14:29 ` [PATCH v6 14/23] drm/i915: CHV: Pipe level degamma correction Shashank Sharma
2015-10-19 18:08 ` Smith, Gary K
2015-10-19 18:54 ` Daniel Vetter
2015-10-19 20:39 ` Bish, Jim
2015-10-19 21:57 ` [Intel-gfx] " Daniel Vetter
2015-10-19 22:23 ` Smith, Gary K
2015-10-19 22:27 ` Smith, Gary K
2015-10-19 23:48 ` [Intel-gfx] " Matheson, Annie J
2015-10-20 4:09 ` Sharma, Shashank
2015-10-20 7:27 ` Daniel Vetter
2015-10-20 8:15 ` [Intel-gfx] " Sharma, Shashank
2015-10-20 12:11 ` Sharma, Shashank
2015-10-16 14:29 ` [PATCH v6 15/23] drm/i915: CHV: Pipe level CSC correction Shashank Sharma
2015-10-16 14:29 ` [PATCH v6 16/23] drm/i915: Commit color correction to CRTC Shashank Sharma
2015-10-16 14:29 ` [PATCH v6 17/23] drm/i915: Attach color properties " Shashank Sharma
2015-10-16 14:29 ` [PATCH v6 18/23] drm/i915: BDW: Load gamma correction values Shashank Sharma
2015-10-16 14:29 ` [PATCH v6 19/23] drm/i915: BDW: Pipe level Gamma correction Shashank Sharma
2015-10-16 14:29 ` [PATCH v6 20/23] drm/i915: BDW: Load degamma correction values Shashank Sharma
2015-10-16 14:29 ` [PATCH v6 21/23] drm/i915: BDW: Pipe level degamma correction Shashank Sharma
2015-10-16 14:29 ` [PATCH v6 22/23] drm/i915: BDW: Pipe level CSC correction Shashank Sharma
2015-10-16 14:29 ` [PATCH v6 23/23] drm/i915: disable plane gamma 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=1445005751-14918-10-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox