[PATCH xf86-video-amdgpu 5/7] Enable setting of color properties via RandR
sunpeng.li at amd.com
sunpeng.li at amd.com
Fri Jun 1 16:03:35 UTC 2018
From: "Leo (Sunpeng) Li" <sunpeng.li at amd.com>
Setting a color property involves:
1. Staging the property onto the driver-private CRTC object
2. Pushing the staged property into kernel DRM, for HW programming
Add a function to do the staging, and execute the above steps in
output_property_set.
Signed-off-by: Leo (Sunpeng) Li <sunpeng.li at amd.com>
---
src/drmmode_display.c | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 97 insertions(+)
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 350dc3d..6e5ae74 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -905,6 +905,89 @@ static int rr_configure_and_change_cm_property(xf86OutputPtr output,
}
/**
+* Stage a color management property. This parses the property value, according
+* to the cm property type, then stores it within the driver-private CRTC
+* object.
+*
+* @crtc: The CRTC to stage the new color management properties in
+* @cm_prop_index: The color property to stage
+* @value: The RandR property value to stage
+*
+* Return 0 on success, X-defined error code on failure.
+*/
+static int drmmode_crtc_stage_cm_prop(xf86CrtcPtr crtc,
+ enum drmmode_cm_prop cm_prop_index,
+ RRPropertyValuePtr value)
+{
+ drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
+ size_t expected_bytes = 0;
+ void **blob_data = NULL;
+ Bool use_default = FALSE;
+
+ /* Early return if CRTC has no cm support */
+ if (!drmmode_crtc_cm_enabled(drmmode_crtc))
+ return BadName;
+
+ /* Update properties on the driver-private CRTC */
+ if (cm_prop_index == CM_GAMMA_LUT) {
+ /* Calculate the expected size of value in bytes */
+ expected_bytes = sizeof(struct drm_color_lut) *
+ drmmode_crtc->gamma_lut_size;
+
+ /* For gamma and degamma, we allow a default SRGB curve to be
+ * set via setting a single element
+ *
+ * Otherwise, value size is in terms of the value format.
+ * Ensure it's also in bytes (<< 1) before comparing with the
+ * expected bytes.
+ */
+ if (value->size == 1)
+ use_default = TRUE;
+ else if (value->type != XA_INTEGER || value->format != 16 ||
+ (size_t)(value->size << 1) != expected_bytes)
+ return BadLength;
+
+ blob_data = (void**)&drmmode_crtc->gamma_lut;
+
+ } else if (cm_prop_index == CM_DEGAMMA_LUT) {
+ expected_bytes = sizeof(struct drm_color_lut) *
+ drmmode_crtc->degamma_lut_size;
+
+ if (value->size == 1)
+ use_default = TRUE;
+ else if (value->type != XA_INTEGER || value->format != 16 ||
+ (size_t)(value->size << 1) != expected_bytes)
+ return BadLength;
+
+ blob_data = (void**)&drmmode_crtc->degamma_lut;
+
+ } else if (cm_prop_index == CM_CTM) {
+ expected_bytes = sizeof(struct drm_color_ctm);
+
+ if (value->size == 1)
+ use_default = TRUE;
+ if (value->type != XA_INTEGER || value->format != 32 ||
+ (size_t)(value->size << 2) != expected_bytes)
+ return BadLength;
+
+ blob_data = (void**)&drmmode_crtc->ctm;
+
+ } else
+ return BadName;
+
+ free(*blob_data);
+ if (!use_default) {
+ *blob_data = malloc(expected_bytes);
+ if (!*blob_data)
+ return BadAlloc;
+ memcpy(*blob_data, value->data, expected_bytes);
+ } else
+ *blob_data = NULL;
+
+ return Success;
+}
+
+/**
* Push staged color management properties on the CRTC to DRM.
*
* @crtc: The CRTC containing staged properties
@@ -2126,8 +2209,22 @@ drmmode_output_set_property(xf86OutputPtr output, Atom property,
{
drmmode_output_private_ptr drmmode_output = output->driver_private;
AMDGPUEntPtr pAMDGPUEnt = AMDGPUEntPriv(output->scrn);
+ enum drmmode_cm_prop cm_prop_index;
int i;
+ cm_prop_index = get_cm_enum_from_str(NameForAtom(property));
+ if (cm_prop_index >= 0 && cm_prop_index != CM_GAMMA_LUT_SIZE &&
+ cm_prop_index != CM_DEGAMMA_LUT_SIZE) {
+ if (!output->crtc)
+ return FALSE;
+ if (drmmode_crtc_stage_cm_prop(output->crtc, cm_prop_index,
+ value))
+ return FALSE;
+ if (drmmode_crtc_push_cm_prop(output->crtc, cm_prop_index))
+ return FALSE;
+ return TRUE;
+ }
+
for (i = 0; i < drmmode_output->num_props; i++) {
drmmode_prop_ptr p = &drmmode_output->props[i];
--
2.7.4
More information about the amd-gfx
mailing list