drm: Extract drm_color_mgmt.[hc] (f1e2f66c) · Commits · 戴 / test

drivers/gpu/drm/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@ drm-y := drm_auth.o drm_bufs.o drm_cache.o \
		drm_modeset_lock.o drm_atomic.o drm_bridge.o \
		drm_framebuffer.o drm_connector.o drm_blend.o \
		drm_encoder.o drm_mode_object.o drm_property.o \
		drm_plane.o
		drm_plane.o drm_color_mgmt.o

		drm-$(CONFIG_COMPAT) += drm_ioc32.o
		drm-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_gem_cma_helper.o

drivers/gpu/drm/drm_color_mgmt.c

0 → 100644

+248 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2016 Intel Corporation
		*
		* Permission to use, copy, modify, distribute, and sell this software and its
		* documentation for any purpose is hereby granted without fee, provided that
		* the above copyright notice appear in all copies and that both that copyright
		* notice and this permission notice appear in supporting documentation, and
		* that the name of the copyright holders not be used in advertising or
		* publicity pertaining to distribution of the software without specific,
		* written prior permission. The copyright holders make no representations
		* about the suitability of this software for any purpose. It is provided "as
		* is" without express or implied warranty.
		*
		* THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
		* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
		* EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
		* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
		* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
		* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
		* OF THIS SOFTWARE.
		*/

		#include <drm/drmP.h>
		#include <drm/drm_crtc.h>
		#include <drm/drm_color_mgmt.h>

		#include "drm_crtc_internal.h"


		/**
		* drm_crtc_enable_color_mgmt - enable color management properties
		* @crtc: DRM CRTC
		* @degamma_lut_size: the size of the degamma lut (before CSC)
		* @has_ctm: whether to attach ctm_property for CSC matrix
		* @gamma_lut_size: the size of the gamma lut (after CSC)
		*
		* This function lets the driver enable the color correction
		* properties on a CRTC. This includes 3 degamma, csc and gamma
		* properties that userspace can set and 2 size properties to inform
		* the userspace of the lut sizes. Each of the properties are
		* optional. The gamma and degamma properties are only attached if
		* their size is not 0 and ctm_property is only attached if has_ctm is
		* true.
		*/
		void drm_crtc_enable_color_mgmt(struct drm_crtc *crtc,
		uint degamma_lut_size,
		bool has_ctm,
		uint gamma_lut_size)
		{
		struct drm_device *dev = crtc->dev;
		struct drm_mode_config *config = &dev->mode_config;

		if (degamma_lut_size) {
		drm_object_attach_property(&crtc->base,
		config->degamma_lut_property, 0);
		drm_object_attach_property(&crtc->base,
		config->degamma_lut_size_property,
		degamma_lut_size);
		}

		if (has_ctm)
		drm_object_attach_property(&crtc->base,
		config->ctm_property, 0);

		if (gamma_lut_size) {
		drm_object_attach_property(&crtc->base,
		config->gamma_lut_property, 0);
		drm_object_attach_property(&crtc->base,
		config->gamma_lut_size_property,
		gamma_lut_size);
		}
		}
		EXPORT_SYMBOL(drm_crtc_enable_color_mgmt);

		/**
		* drm_mode_crtc_set_gamma_size - set the gamma table size
		* @crtc: CRTC to set the gamma table size for
		* @gamma_size: size of the gamma table
		*
		* Drivers which support gamma tables should set this to the supported gamma
		* table size when initializing the CRTC. Currently the drm core only supports a
		* fixed gamma table size.
		*
		* Returns:
		* Zero on success, negative errno on failure.
		*/
		int drm_mode_crtc_set_gamma_size(struct drm_crtc *crtc,
		int gamma_size)
		{
		uint16_t r_base, g_base, *b_base;
		int i;

		crtc->gamma_size = gamma_size;

		crtc->gamma_store = kcalloc(gamma_size, sizeof(uint16_t) * 3,
		GFP_KERNEL);
		if (!crtc->gamma_store) {
		crtc->gamma_size = 0;
		return -ENOMEM;
		}

		r_base = crtc->gamma_store;
		g_base = r_base + gamma_size;
		b_base = g_base + gamma_size;
		for (i = 0; i < gamma_size; i++) {
		r_base[i] = i << 8;
		g_base[i] = i << 8;
		b_base[i] = i << 8;
		}


		return 0;
		}
		EXPORT_SYMBOL(drm_mode_crtc_set_gamma_size);

		/**
		* drm_mode_gamma_set_ioctl - set the gamma table
		* @dev: DRM device
		* @data: ioctl data
		* @file_priv: DRM file info
		*
		* Set the gamma table of a CRTC to the one passed in by the user. Userspace can
		* inquire the required gamma table size through drm_mode_gamma_get_ioctl.
		*
		* Called by the user via ioctl.
		*
		* Returns:
		* Zero on success, negative errno on failure.
		*/
		int drm_mode_gamma_set_ioctl(struct drm_device *dev,
		void data, struct drm_file file_priv)
		{
		struct drm_mode_crtc_lut *crtc_lut = data;
		struct drm_crtc *crtc;
		void r_base, g_base, *b_base;
		int size;
		int ret = 0;

		if (!drm_core_check_feature(dev, DRIVER_MODESET))
		return -EINVAL;

		drm_modeset_lock_all(dev);
		crtc = drm_crtc_find(dev, crtc_lut->crtc_id);
		if (!crtc) {
		ret = -ENOENT;
		goto out;
		}

		if (crtc->funcs->gamma_set == NULL) {
		ret = -ENOSYS;
		goto out;
		}

		/* memcpy into gamma store */
		if (crtc_lut->gamma_size != crtc->gamma_size) {
		ret = -EINVAL;
		goto out;
		}

		size = crtc_lut->gamma_size * (sizeof(uint16_t));
		r_base = crtc->gamma_store;
		if (copy_from_user(r_base, (void __user *)(unsigned long)crtc_lut->red, size)) {
		ret = -EFAULT;
		goto out;
		}

		g_base = r_base + size;
		if (copy_from_user(g_base, (void __user *)(unsigned long)crtc_lut->green, size)) {
		ret = -EFAULT;
		goto out;
		}

		b_base = g_base + size;
		if (copy_from_user(b_base, (void __user *)(unsigned long)crtc_lut->blue, size)) {
		ret = -EFAULT;
		goto out;
		}

		ret = crtc->funcs->gamma_set(crtc, r_base, g_base, b_base, crtc->gamma_size);

		out:
		drm_modeset_unlock_all(dev);
		return ret;

		}

		/**
		* drm_mode_gamma_get_ioctl - get the gamma table
		* @dev: DRM device
		* @data: ioctl data
		* @file_priv: DRM file info
		*
		* Copy the current gamma table into the storage provided. This also provides
		* the gamma table size the driver expects, which can be used to size the
		* allocated storage.
		*
		* Called by the user via ioctl.
		*
		* Returns:
		* Zero on success, negative errno on failure.
		*/
		int drm_mode_gamma_get_ioctl(struct drm_device *dev,
		void data, struct drm_file file_priv)
		{
		struct drm_mode_crtc_lut *crtc_lut = data;
		struct drm_crtc *crtc;
		void r_base, g_base, *b_base;
		int size;
		int ret = 0;

		if (!drm_core_check_feature(dev, DRIVER_MODESET))
		return -EINVAL;

		drm_modeset_lock_all(dev);
		crtc = drm_crtc_find(dev, crtc_lut->crtc_id);
		if (!crtc) {
		ret = -ENOENT;
		goto out;
		}

		/* memcpy into gamma store */
		if (crtc_lut->gamma_size != crtc->gamma_size) {
		ret = -EINVAL;
		goto out;
		}

		size = crtc_lut->gamma_size * (sizeof(uint16_t));
		r_base = crtc->gamma_store;
		if (copy_to_user((void __user *)(unsigned long)crtc_lut->red, r_base, size)) {
		ret = -EFAULT;
		goto out;
		}

		g_base = r_base + size;
		if (copy_to_user((void __user *)(unsigned long)crtc_lut->green, g_base, size)) {
		ret = -EFAULT;
		goto out;
		}

		b_base = g_base + size;
		if (copy_to_user((void __user *)(unsigned long)crtc_lut->blue, b_base, size)) {
		ret = -EFAULT;
		goto out;
		}
		out:
		drm_modeset_unlock_all(dev);
		return ret;
		}

drivers/gpu/drm/drm_crtc.c

+0 −220

Original line number	Diff line number	Diff line
		@@ -903,181 +903,6 @@ int drm_mode_crtc_set_obj_prop(struct drm_mode_object *obj,
		return ret;
		}

		/**
		* drm_mode_crtc_set_gamma_size - set the gamma table size
		* @crtc: CRTC to set the gamma table size for
		* @gamma_size: size of the gamma table
		*
		* Drivers which support gamma tables should set this to the supported gamma
		* table size when initializing the CRTC. Currently the drm core only supports a
		* fixed gamma table size.
		*
		* Returns:
		* Zero on success, negative errno on failure.
		*/
		int drm_mode_crtc_set_gamma_size(struct drm_crtc *crtc,
		int gamma_size)
		{
		uint16_t r_base, g_base, *b_base;
		int i;

		crtc->gamma_size = gamma_size;

		crtc->gamma_store = kcalloc(gamma_size, sizeof(uint16_t) * 3,
		GFP_KERNEL);
		if (!crtc->gamma_store) {
		crtc->gamma_size = 0;
		return -ENOMEM;
		}

		r_base = crtc->gamma_store;
		g_base = r_base + gamma_size;
		b_base = g_base + gamma_size;
		for (i = 0; i < gamma_size; i++) {
		r_base[i] = i << 8;
		g_base[i] = i << 8;
		b_base[i] = i << 8;
		}


		return 0;
		}
		EXPORT_SYMBOL(drm_mode_crtc_set_gamma_size);

		/**
		* drm_mode_gamma_set_ioctl - set the gamma table
		* @dev: DRM device
		* @data: ioctl data
		* @file_priv: DRM file info
		*
		* Set the gamma table of a CRTC to the one passed in by the user. Userspace can
		* inquire the required gamma table size through drm_mode_gamma_get_ioctl.
		*
		* Called by the user via ioctl.
		*
		* Returns:
		* Zero on success, negative errno on failure.
		*/
		int drm_mode_gamma_set_ioctl(struct drm_device *dev,
		void data, struct drm_file file_priv)
		{
		struct drm_mode_crtc_lut *crtc_lut = data;
		struct drm_crtc *crtc;
		void r_base, g_base, *b_base;
		int size;
		int ret = 0;

		if (!drm_core_check_feature(dev, DRIVER_MODESET))
		return -EINVAL;

		drm_modeset_lock_all(dev);
		crtc = drm_crtc_find(dev, crtc_lut->crtc_id);
		if (!crtc) {
		ret = -ENOENT;
		goto out;
		}

		if (crtc->funcs->gamma_set == NULL) {
		ret = -ENOSYS;
		goto out;
		}

		/* memcpy into gamma store */
		if (crtc_lut->gamma_size != crtc->gamma_size) {
		ret = -EINVAL;
		goto out;
		}

		size = crtc_lut->gamma_size * (sizeof(uint16_t));
		r_base = crtc->gamma_store;
		if (copy_from_user(r_base, (void __user *)(unsigned long)crtc_lut->red, size)) {
		ret = -EFAULT;
		goto out;
		}

		g_base = r_base + size;
		if (copy_from_user(g_base, (void __user *)(unsigned long)crtc_lut->green, size)) {
		ret = -EFAULT;
		goto out;
		}

		b_base = g_base + size;
		if (copy_from_user(b_base, (void __user *)(unsigned long)crtc_lut->blue, size)) {
		ret = -EFAULT;
		goto out;
		}

		ret = crtc->funcs->gamma_set(crtc, r_base, g_base, b_base, crtc->gamma_size);

		out:
		drm_modeset_unlock_all(dev);
		return ret;

		}

		/**
		* drm_mode_gamma_get_ioctl - get the gamma table
		* @dev: DRM device
		* @data: ioctl data
		* @file_priv: DRM file info
		*
		* Copy the current gamma table into the storage provided. This also provides
		* the gamma table size the driver expects, which can be used to size the
		* allocated storage.
		*
		* Called by the user via ioctl.
		*
		* Returns:
		* Zero on success, negative errno on failure.
		*/
		int drm_mode_gamma_get_ioctl(struct drm_device *dev,
		void data, struct drm_file file_priv)
		{
		struct drm_mode_crtc_lut *crtc_lut = data;
		struct drm_crtc *crtc;
		void r_base, g_base, *b_base;
		int size;
		int ret = 0;

		if (!drm_core_check_feature(dev, DRIVER_MODESET))
		return -EINVAL;

		drm_modeset_lock_all(dev);
		crtc = drm_crtc_find(dev, crtc_lut->crtc_id);
		if (!crtc) {
		ret = -ENOENT;
		goto out;
		}

		/* memcpy into gamma store */
		if (crtc_lut->gamma_size != crtc->gamma_size) {
		ret = -EINVAL;
		goto out;
		}

		size = crtc_lut->gamma_size * (sizeof(uint16_t));
		r_base = crtc->gamma_store;
		if (copy_to_user((void __user *)(unsigned long)crtc_lut->red, r_base, size)) {
		ret = -EFAULT;
		goto out;
		}

		g_base = r_base + size;
		if (copy_to_user((void __user *)(unsigned long)crtc_lut->green, g_base, size)) {
		ret = -EFAULT;
		goto out;
		}

		b_base = g_base + size;
		if (copy_to_user((void __user *)(unsigned long)crtc_lut->blue, b_base, size)) {
		ret = -EFAULT;
		goto out;
		}
		out:
		drm_modeset_unlock_all(dev);
		return ret;
		}

		/**
		* drm_mode_config_reset - call ->reset callbacks
		* @dev: drm device
		@@ -1436,48 +1261,3 @@ struct drm_tile_group drm_mode_create_tile_group(struct drm_device dev,
		return tg;
		}
		EXPORT_SYMBOL(drm_mode_create_tile_group);

		/**
		* drm_crtc_enable_color_mgmt - enable color management properties
		* @crtc: DRM CRTC
		* @degamma_lut_size: the size of the degamma lut (before CSC)
		* @has_ctm: whether to attach ctm_property for CSC matrix
		* @gamma_lut_size: the size of the gamma lut (after CSC)
		*
		* This function lets the driver enable the color correction
		* properties on a CRTC. This includes 3 degamma, csc and gamma
		* properties that userspace can set and 2 size properties to inform
		* the userspace of the lut sizes. Each of the properties are
		* optional. The gamma and degamma properties are only attached if
		* their size is not 0 and ctm_property is only attached if has_ctm is
		* true.
		*/
		void drm_crtc_enable_color_mgmt(struct drm_crtc *crtc,
		uint degamma_lut_size,
		bool has_ctm,
		uint gamma_lut_size)
		{
		struct drm_device *dev = crtc->dev;
		struct drm_mode_config *config = &dev->mode_config;

		if (degamma_lut_size) {
		drm_object_attach_property(&crtc->base,
		config->degamma_lut_property, 0);
		drm_object_attach_property(&crtc->base,
		config->degamma_lut_size_property,
		degamma_lut_size);
		}

		if (has_ctm)
		drm_object_attach_property(&crtc->base,
		config->ctm_property, 0);

		if (gamma_lut_size) {
		drm_object_attach_property(&crtc->base,
		config->gamma_lut_property, 0);
		drm_object_attach_property(&crtc->base,
		config->gamma_lut_size_property,
		gamma_lut_size);
		}
		}
		EXPORT_SYMBOL(drm_crtc_enable_color_mgmt);

drivers/gpu/drm/drm_crtc_internal.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -58,6 +58,10 @@ int drm_mode_getcrtc(struct drm_device *dev,
		void data, struct drm_file file_priv);
		int drm_mode_setcrtc(struct drm_device *dev,
		void data, struct drm_file file_priv);

		/* drm_color_mgmt.c */

		/* IOCTLs */
		int drm_mode_gamma_get_ioctl(struct drm_device *dev,
		void data, struct drm_file file_priv);
		int drm_mode_gamma_set_ioctl(struct drm_device *dev,

include/drm/drm_color_mgmt.h

0 → 100644

+56 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2016 Intel Corporation
		*
		* Permission to use, copy, modify, distribute, and sell this software and its
		* documentation for any purpose is hereby granted without fee, provided that
		* the above copyright notice appear in all copies and that both that copyright
		* notice and this permission notice appear in supporting documentation, and
		* that the name of the copyright holders not be used in advertising or
		* publicity pertaining to distribution of the software without specific,
		* written prior permission. The copyright holders make no representations
		* about the suitability of this software for any purpose. It is provided "as
		* is" without express or implied warranty.
		*
		* THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
		* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
		* EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
		* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
		* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
		* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
		* OF THIS SOFTWARE.
		*/

		#ifndef __DRM_COLOR_MGMT_H__
		#define __DRM_COLOR_MGMT_H__

		#include <linux/ctype.h>

		void drm_crtc_enable_color_mgmt(struct drm_crtc *crtc,
		uint degamma_lut_size,
		bool has_ctm,
		uint gamma_lut_size);

		int drm_mode_crtc_set_gamma_size(struct drm_crtc *crtc,
		int gamma_size);

		/*
		* Extract a degamma/gamma LUT value provided by user and round it to the
		* precision supported by the hardware.
		*/
		static inline uint32_t drm_color_lut_extract(uint32_t user_input,
		uint32_t bit_precision)
		{
		uint32_t val = user_input;
		uint32_t max = 0xffff >> (16 - bit_precision);

		/* Round only if we're not using full precision. */
		if (bit_precision < 16) {
		val += 1UL << (16 - bit_precision - 1);
		val >>= 16 - bit_precision;
		}

		return clamp_val(val, 0, max);
		}


		#endif

Admin message