drm: GAMMA_LUT_3D (wip)

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Author: vsyrjala

drivers/gpu/drm/drm_atomic_helper.c

@@ -3554,10 +3554,10 @@ int drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc,
 		goto fail;
 	}
 
-	/* Reset DEGAMMA_LUT and CTM properties. */
 	replaced  = drm_property_replace_blob(&crtc_state->degamma_lut, NULL);
 	replaced |= drm_property_replace_blob(&crtc_state->ctm, NULL);
 	replaced |= drm_property_replace_blob(&crtc_state->gamma_lut, blob);
+	replaced |= drm_property_replace_blob(&crtc_state->gamma_lut_3d, NULL);
 	crtc_state->color_mgmt_changed |= replaced;
 
 	ret = drm_atomic_commit(state);

drivers/gpu/drm/drm_atomic_state_helper.c

@@ -141,6 +141,8 @@ void __drm_atomic_helper_crtc_duplicate_state(struct drm_crtc *crtc,
 		drm_property_blob_get(state->ctm);
 	if (state->gamma_lut)
 		drm_property_blob_get(state->gamma_lut);
+	if (state->gamma_lut_3d)
+		drm_property_blob_get(state->gamma_lut_3d);
 	state->mode_changed = false;
 	state->active_changed = false;
 	state->planes_changed = false;
@@ -213,6 +215,7 @@ void __drm_atomic_helper_crtc_destroy_state(struct drm_crtc_state *state)
 	drm_property_blob_put(state->degamma_lut);
 	drm_property_blob_put(state->ctm);
 	drm_property_blob_put(state->gamma_lut);
+	drm_property_blob_put(state->gamma_lut_3d);
 }
 EXPORT_SYMBOL(__drm_atomic_helper_crtc_destroy_state);
 

drivers/gpu/drm/drm_atomic_uapi.c

@@ -471,6 +471,14 @@ static int drm_atomic_crtc_set_property(struct drm_crtc *crtc,
 					&replaced);
 		state->color_mgmt_changed |= replaced;
 		return ret;
+	} else if (property == config->gamma_lut_3d_property) {
+		ret = drm_atomic_replace_property_blob_from_id(dev,
+					&state->gamma_lut_3d,
+					val,
+					-1, sizeof(struct drm_color_lut),
+					&replaced);
+		state->color_mgmt_changed |= replaced;
+		return ret;
 	} else if (property == config->prop_out_fence_ptr) {
 		s32 __user *fence_ptr = u64_to_user_ptr(val);
 
@@ -516,6 +524,8 @@ drm_atomic_crtc_get_property(struct drm_crtc *crtc,
 		*val = (state->ctm) ? state->ctm->base.id : 0;
 	else if (property == config->gamma_lut_property)
 		*val = (state->gamma_lut) ? state->gamma_lut->base.id : 0;
+	else if (property == config->gamma_lut_3d_property)
+		*val = (state->gamma_lut_3d) ? state->gamma_lut_3d->base.id : 0;
 	else if (property == config->prop_out_fence_ptr)
 		*val = 0;
 	else if (property == crtc->scaling_filter_property)

drivers/gpu/drm/drm_color_mgmt.c

@@ -88,6 +88,29 @@
  *	largest size, and sub-sample smaller sized LUTs (e.g. for split-gamma
  *	modes) appropriately.
  *
+ * “GAMMA_LUT_3D”:
+ *	Blob property to set the current 3D LUT apply to pixel data after
+ *      the lookup through the gamma LUT. The data is interpreted as a struct
+ *	&drm_color_lut.
+ *
+ *      The 3D LUT is stored in the following order:
+ *      output=lut[red*sz*sz+green*sz+blue],
+ *      where sz=GAMMA_LUT_3D_SIZE, and red,green,blue are
+ *      the input values in the range [0,sz-1].
+ *
+ *	Setting this to NULL (blob property value set to 0) means a
+ *	unit/pass-thru matrix should be used. This is generally the driver
+ *	boot-up state too. Drivers can access the blob for the color conversion
+ *	matrix through &drm_crtc_state.lut_3d.
+ *
+ * “GAMMA_LUT_3D_SIZE”:
+ *	Unsigned range property to give the size of the lookup table to be set
+ *	on the GAMMA_LUT_3D property (the size depends on the underlying hardware).
+ *      This is the size of a single dimension of the LUT, so the LUT will have
+ *      GAMMA_LUT_3D_SIZE^3 total entries.
+ *	If drivers support multiple LUT sizes then they should publish the
+ *	largest size, and sub-sample smaller sized LUTs appropriately.
+ *
  * There is also support for a legacy gamma table, which is set up by calling
  * drm_mode_crtc_set_gamma_size(). Drivers which support both should use
  * drm_atomic_helper_legacy_gamma_set() to alias the legacy gamma ramp with the
@@ -190,6 +213,22 @@ void drm_crtc_enable_color_mgmt(struct drm_crtc *crtc,
 }
 EXPORT_SYMBOL(drm_crtc_enable_color_mgmt);
 
+void drm_crtc_enable_gamma_lut_3d(struct drm_crtc *crtc,
+				  unsigned int gamma_lut_3d_size)
+{
+	struct drm_device *dev = crtc->dev;
+	struct drm_mode_config *config = &dev->mode_config;
+
+	if (gamma_lut_3d_size) {
+		drm_object_attach_property(&crtc->base,
+					   config->gamma_lut_3d_property, 0);
+		drm_object_attach_property(&crtc->base,
+					   config->gamma_lut_3d_size_property,
+					   gamma_lut_3d_size);
+	}
+}
+EXPORT_SYMBOL(drm_crtc_enable_gamma_lut_3d);
+
 /**
  * drm_mode_crtc_set_gamma_size - set the gamma table size
  * @crtc: CRTC to set the gamma table size for

drivers/gpu/drm/drm_fb_helper.c

@@ -1059,6 +1059,8 @@ static int setcmap_atomic(struct fb_cmap *cmap, struct fb_info *info)
 		replaced |= drm_property_replace_blob(&crtc_state->ctm, NULL);
 		replaced |= drm_property_replace_blob(&crtc_state->gamma_lut,
 						      gamma_lut);
+		replaced |= drm_property_replace_blob(&crtc_state->gamma_lut_3d,
+						      NULL);
 		crtc_state->color_mgmt_changed |= replaced;
 	}
 

drivers/gpu/drm/drm_mode_config.c

@@ -364,6 +364,20 @@ static int drm_mode_create_standard_properties(struct drm_device *dev)
 		return -ENOMEM;
 	dev->mode_config.gamma_lut_size_property = prop;
 
+	prop = drm_property_create(dev,
+			DRM_MODE_PROP_BLOB,
+			"GAMMA_LUT_3D", 0);
+	if (!prop)
+		return -ENOMEM;
+	dev->mode_config.gamma_lut_3d_property = prop;
+
+	prop = drm_property_create_range(dev,
+			DRM_MODE_PROP_IMMUTABLE,
+			"GAMMA_LUT_3D_SIZE", 0, UINT_MAX);
+	if (!prop)
+		return -ENOMEM;
+	dev->mode_config.gamma_lut_3d_size_property = prop;
+
 	prop = drm_property_create(dev,
 				   DRM_MODE_PROP_IMMUTABLE | DRM_MODE_PROP_BLOB,
 				   "IN_FORMATS", 0);

include/drm/drm_color_mgmt.h

@@ -59,6 +59,9 @@ void drm_crtc_enable_color_mgmt(struct drm_crtc *crtc,
 				bool has_ctm,
 				uint gamma_lut_size);
 
+void drm_crtc_enable_gamma_lut_3d(struct drm_crtc *crtc,
+				  unsigned int gamma_lut_3d_size);
+
 int drm_mode_crtc_set_gamma_size(struct drm_crtc *crtc,
 				 int gamma_size);
 

include/drm/drm_crtc.h

@@ -165,8 +165,8 @@ struct drm_crtc_state {
 	bool zpos_changed : 1;
 	/**
 	 * @color_mgmt_changed: Color management properties have changed
-	 * (@gamma_lut, @degamma_lut or @ctm). Used by the atomic helpers and
-	 * drivers to steer the atomic commit control flow.
+	 * (@gamma_lut, @degamma_lut, @ctm, @gamma_lut_3d). Used by the atomic
+	 * helpers and drivers to steer the atomic commit control flow.
 	 */
 	bool color_mgmt_changed : 1;
 
@@ -288,6 +288,15 @@ struct drm_crtc_state {
 	 */
 	struct drm_property_blob *gamma_lut;
 
+	/**
+	 * @gamma_lut_3d:
+	 *
+	 * 3D LUT for converting pixel data adter @gamma_lut.
+	 * See drm_crtc_enable_color_mgmt(). The blob (if not NULL)
+	 * is a &struct drm_color_lut.
+	 */
+	struct drm_property_blob *gamma_lut_3d;
+
 	/**
 	 * @target_vblank:
 	 *

include/drm/drm_mode_config.h

@@ -799,6 +799,16 @@ struct drm_mode_config {
 	 * gamma LUT as supported by the driver (read-only).
 	 */
 	struct drm_property *gamma_lut_size_property;
+	/**
+	 * @gamma_lut_3d_property: Optional CRTC property to set the 3D LUT
+	 * used to convert the colors, after the gamma LUT.
+	 */
+	struct drm_property *gamma_lut_3d_property;
+	/**
+	 * @gamma_lut_3d_size_property: Optional CRTC property for the size
+	 * of the 3D LUT as supported by the driver (read-only).
+	 */
+	struct drm_property *gamma_lut_3d_size_property;
 
 	/**
 	 * @suggested_x_property: Optional connector property with a hint for