From: Uma Shankar <uma.shankar@intel.com>
To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Cc: dcastagna@chromium.org, sam@ravnborg.org, seanpaul@chromium.org,
ville.syrjala@intel.com, maarten.lankhorst@intel.com
Subject: [v3 2/7] drm/i915: Define color lut range structure
Date: Fri, 12 Apr 2019 15:50:58 +0530 [thread overview]
Message-ID: <1555064463-18479-3-git-send-email-uma.shankar@intel.com> (raw)
In-Reply-To: <1555064463-18479-1-git-send-email-uma.shankar@intel.com>
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
This defines the color lut ranges for 10bit and multi
segmented gamma range for ICL.
v2: Defined and advertise the gamma modes supported on
various platforms as suggested by Ville.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Uma Shankar <uma.shankar@intel.com>
---
drivers/gpu/drm/i915/intel_color.c | 566 ++++++++++++++++++++++++++++++++++++-
1 file changed, 562 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_color.c b/drivers/gpu/drm/i915/intel_color.c
index ca341a9..c433215 100644
--- a/drivers/gpu/drm/i915/intel_color.c
+++ b/drivers/gpu/drm/i915/intel_color.c
@@ -383,6 +383,20 @@ static u32 ilk_lut_10(const struct drm_color_lut *color)
drm_color_lut_extract(color->blue, 10);
}
+static bool i9xx_has_10bit_lut(struct drm_i915_private *dev_priv)
+{
+ /*
+ * Bspec:
+ " "NOTE: The 8-bit (non-10-bit) mode is the only
+ * mode supported by BrookDale-G and Springdale-G."
+ * and
+ * "NOTE: The 8-bit (non-10-bit) mode is the only
+ * mode supported by Alviso and Grantsdale."
+ */
+ return !IS_I845G(dev_priv) && !IS_I865G(dev_priv) &&
+ !IS_I915G(dev_priv) && !IS_I915GM(dev_priv);
+}
+
/* Loads the legacy palette/gamma unit for the CRTC. */
static void i9xx_load_luts_internal(const struct intel_crtc_state *crtc_state,
const struct drm_property_blob *blob)
@@ -1221,10 +1235,420 @@ static int icl_color_check(struct intel_crtc_state *crtc_state)
return 0;
}
+enum {
+ I9XX_LUT_SIZE_8BIT = 256,
+ I9XX_LUT_SIZE_10BIT = 129,
+
+ ILK_LUT_SIZE_10BIT = 1024,
+ ILK_LUT_SIZE_12BIT = 513,
+
+ IVB_LUT_SIZE_SPLIT = 512,
+
+ CHV_LUT_SIZE_CGM_DEGAMMA = 65,
+ CHV_LUT_SIZE_CGM_GAMMA = 257,
+};
+
+#define I9XX_GAMMA_8 \
+ { \
+ .flags = DRM_MODE_LUT_GAMMA, \
+ .count = 256, \
+ .input_bpc = 8, .output_bpc = 8, \
+ .start = 0, .end = (1 << 8) - 1, \
+ .min = 0, .max = (1 << 8) - 1, \
+ }
+
+static const struct drm_color_lut_range i9xx_gamma_8[] = {
+ I9XX_GAMMA_8,
+};
+
+static const struct drm_color_lut_range i9xx_gamma_10_slope[] = {
+ {
+ .flags = (DRM_MODE_LUT_GAMMA |
+ DRM_MODE_LUT_INTERPOLATE |
+ DRM_MODE_LUT_NON_DECREASING),
+ .count = 129,
+ .input_bpc = 10, .output_bpc = 10,
+ .start = 0, .end = 1 << 10,
+ .min = 0, .max = (1 << 10) - 1,
+ },
+};
+
+#define I965_GAMMA_10 \
+ { \
+ .flags = (DRM_MODE_LUT_GAMMA | \
+ DRM_MODE_LUT_INTERPOLATE | \
+ DRM_MODE_LUT_NON_DECREASING), \
+ .count = 128, \
+ .input_bpc = 10, .output_bpc = 16, \
+ .start = 0, .end = (1 << 10) - (1 << 10) / 128, \
+ .min = 0, .max = (1 << 16) - 1, \
+ }, \
+ /* PIPEGCMAX */ \
+ { \
+ .flags = (DRM_MODE_LUT_GAMMA | \
+ DRM_MODE_LUT_INTERPOLATE | \
+ DRM_MODE_LUT_REUSE_LAST | \
+ DRM_MODE_LUT_NON_DECREASING), \
+ .count = 1, \
+ .input_bpc = 10, .output_bpc = 16, \
+ .start = (1 << 10) - (1 << 10) / 128, .end = 1 << 10, \
+ .min = 0, .max = 1 << 16, \
+ }
+
+static const struct drm_color_lut_range i965_gamma_10[] = {
+ I965_GAMMA_10,
+};
+
+#define CHV_CGM_DEGAMMA \
+ { \
+ .flags = (DRM_MODE_LUT_DEGAMMA | \
+ DRM_MODE_LUT_INTERPOLATE | \
+ DRM_MODE_LUT_NON_DECREASING), \
+ .count = 65, \
+ .input_bpc = 10, .output_bpc = 14, \
+ .start = 0, .end = 1 << 10, \
+ .min = 0, .max = (1 << 14) - 1, \
+ }
+#define CHV_CGM_GAMMA \
+ { \
+ .flags = (DRM_MODE_LUT_GAMMA | \
+ DRM_MODE_LUT_INTERPOLATE | \
+ DRM_MODE_LUT_NON_DECREASING), \
+ .count = 257, \
+ .input_bpc = 14, .output_bpc = 10, \
+ .start = 0, .end = 1 << 14, \
+ .min = 0, .max = (1 << 10) - 1, \
+ }
+
+static const struct drm_color_lut_range chv_cgm_degamma[] = {
+ CHV_CGM_DEGAMMA,
+};
+
+static const struct drm_color_lut_range chv_cgm_gamma[] = {
+ CHV_CGM_GAMMA,
+};
+
+static const struct drm_color_lut_range chv_cgm_degamma_i9xx_gamma_8[] = {
+ CHV_CGM_DEGAMMA,
+ I9XX_GAMMA_8,
+};
+
+static const struct drm_color_lut_range chv_cgm_degamma_i965_gamma_10[] = {
+ CHV_CGM_DEGAMMA,
+ I965_GAMMA_10,
+};
+
+static const struct drm_color_lut_range chv_cgm_degamma_cgm_degamma[] = {
+ CHV_CGM_DEGAMMA,
+ CHV_CGM_GAMMA,
+};
+
+static const struct drm_color_lut_range ilk_gamma_degamma_8[] = {
+ {
+ .flags = (DRM_MODE_LUT_GAMMA |
+ DRM_MODE_LUT_DEGAMMA),
+ .count = 256,
+ .input_bpc = 8, .output_bpc = 8,
+ .start = 0, .end = (1 << 8) - 1,
+ .min = 0, .max = (1 << 8) - 1,
+ },
+};
+
+static const struct drm_color_lut_range ilk_gamma_degamma_10[] = {
+ {
+ .flags = (DRM_MODE_LUT_GAMMA |
+ DRM_MODE_LUT_DEGAMMA),
+ .count = 1024,
+ .input_bpc = 10, .output_bpc = 10,
+ .start = 0, .end = (1 << 10) - 1,
+ .min = 0, .max = (1 << 10) - 1,
+ },
+};
+
+static const struct drm_color_lut_range ilk_gamma_degamma_12p4[] = {
+ {
+ .flags = (DRM_MODE_LUT_GAMMA |
+ DRM_MODE_LUT_DEGAMMA |
+ DRM_MODE_LUT_INTERPOLATE |
+ DRM_MODE_LUT_NON_DECREASING),
+ .count = 512,
+ .input_bpc = 12, .output_bpc = 16,
+ .start = 0, .end = (1 << 12) - (1 << 12) / 512,
+ .min = 0, .max = (1 << 16) - 1,
+ },
+ /* PIPEGCMAX */
+ {
+ .flags = (DRM_MODE_LUT_GAMMA |
+ DRM_MODE_LUT_DEGAMMA |
+ DRM_MODE_LUT_INTERPOLATE |
+ DRM_MODE_LUT_REUSE_LAST |
+ DRM_MODE_LUT_NON_DECREASING),
+ .count = 1,
+ .input_bpc = 10, .output_bpc = 16,
+ .start = (1 << 12) - (1 << 12) / 512, .end = 1 << 12,
+ .min = 0, .max = 1 << 16,
+ },
+};
+
+static const struct drm_color_lut_range ivb_gamma_degamma_10[] = {
+ {
+ .flags = (DRM_MODE_LUT_GAMMA |
+ DRM_MODE_LUT_DEGAMMA |
+ DRM_MODE_LUT_REFLECT_NEGATIVE),
+ .count = 1024,
+ .input_bpc = 10, .output_bpc = 10,
+ .start = 0, .end = (1 << 10) - 1,
+ .min = 0, .max = (1 << 10) - 1,
+ },
+ /* PAL_EXT_GC_MAX */
+ {
+ .flags = (DRM_MODE_LUT_GAMMA |
+ DRM_MODE_LUT_DEGAMMA |
+ DRM_MODE_LUT_REFLECT_NEGATIVE |
+ DRM_MODE_LUT_INTERPOLATE |
+ DRM_MODE_LUT_REUSE_LAST |
+ DRM_MODE_LUT_NON_DECREASING),
+ .count = 1,
+ .input_bpc = 10, .output_bpc = 16,
+ .start = 1 << 10, .end = 3 << 10,
+ .min = 0, .max = (8 << 16) - 1,
+ }
+};
+
+static const struct drm_color_lut_range glk_gamma_10[] = {
+ {
+ .flags = (DRM_MODE_LUT_GAMMA |
+ DRM_MODE_LUT_REFLECT_NEGATIVE),
+ .count = 1024,
+ .input_bpc = 10, .output_bpc = 10,
+ .start = 0, .end = (1 << 10) - 1,
+ .min = 0, .max = (1 << 10) - 1,
+ },
+ /* PAL_EXT_GC_MAX */
+ {
+ .flags = (DRM_MODE_LUT_GAMMA |
+ DRM_MODE_LUT_REFLECT_NEGATIVE |
+ DRM_MODE_LUT_INTERPOLATE |
+ DRM_MODE_LUT_REUSE_LAST |
+ DRM_MODE_LUT_NON_DECREASING),
+ .count = 1,
+ .input_bpc = 10, .output_bpc = 16,
+ .start = 1 << 10, .end = 3 << 10,
+ .min = 0, .max = (8 << 16) - 1,
+ },
+ /* PAL_EXT2_GC_MAX */
+ {
+ .flags = (DRM_MODE_LUT_GAMMA |
+ DRM_MODE_LUT_REFLECT_NEGATIVE |
+ DRM_MODE_LUT_INTERPOLATE |
+ DRM_MODE_LUT_REUSE_LAST |
+ DRM_MODE_LUT_NON_DECREASING),
+ .count = 1,
+ .input_bpc = 10, .output_bpc = 16,
+ .start = 3 << 12, .end = 7 << 12,
+ .min = 0, .max = (8 << 16) - 1,
+ },
+};
+
+/* FIXME input bpc? */
+static const struct drm_color_lut_range glk_gamma_12p4[] = {
+ {
+ .flags = (DRM_MODE_LUT_GAMMA |
+ DRM_MODE_LUT_REFLECT_NEGATIVE |
+ DRM_MODE_LUT_INTERPOLATE |
+ DRM_MODE_LUT_NON_DECREASING),
+ .count = 512,
+ .input_bpc = 16, .output_bpc = 16,
+ .start = 0, .end = (1 << 16) - (1 << 16) / 512,
+ .min = 0, .max = (1 << 16) - 1,
+ },
+ /* PAL_GC_MAX */
+ {
+ .flags = (DRM_MODE_LUT_GAMMA |
+ DRM_MODE_LUT_REFLECT_NEGATIVE |
+ DRM_MODE_LUT_INTERPOLATE |
+ DRM_MODE_LUT_REUSE_LAST |
+ DRM_MODE_LUT_NON_DECREASING),
+ .count = 1,
+ .input_bpc = 16, .output_bpc = 16,
+ .start = (1 << 16) - (1 << 16) / 512, .end = 1 << 16,
+ .min = 0, .max = 1 << 16,
+ },
+ /* PAL_EXT_GC_MAX */
+ {
+ .flags = (DRM_MODE_LUT_GAMMA |
+ DRM_MODE_LUT_REFLECT_NEGATIVE |
+ DRM_MODE_LUT_INTERPOLATE |
+ DRM_MODE_LUT_REUSE_LAST |
+ DRM_MODE_LUT_NON_DECREASING),
+ .count = 1,
+ .input_bpc = 16, .output_bpc = 16,
+ .start = 1 << 16, .end = 3 << 16,
+ .min = 0, .max = (8 << 16) - 1,
+ },
+ /* PAL_EXT2_GC_MAX */
+ {
+ .flags = (DRM_MODE_LUT_GAMMA |
+ DRM_MODE_LUT_REFLECT_NEGATIVE |
+ DRM_MODE_LUT_INTERPOLATE |
+ DRM_MODE_LUT_REUSE_LAST |
+ DRM_MODE_LUT_NON_DECREASING),
+ .count = 1,
+ .input_bpc = 16, .output_bpc = 16,
+ .start = 3 << 16, .end = 7 << 16,
+ .min = 0, .max = (8 << 16) - 1,
+ },
+};
+
+static const struct drm_color_lut_range ivb_split_gamma[] = {
+ {
+ .flags = (DRM_MODE_LUT_DEGAMMA |
+ DRM_MODE_LUT_REFLECT_NEGATIVE),
+ .count = 512,
+ .input_bpc = 9, .output_bpc = 10,
+ .start = 0, .end = (1 << 9) - 1,
+ .min = 0, .max = (1 << 10) - 1,
+ },
+ /* PAL_EXT_GC_MAX */
+ {
+ .flags = (DRM_MODE_LUT_DEGAMMA |
+ DRM_MODE_LUT_REFLECT_NEGATIVE |
+ DRM_MODE_LUT_INTERPOLATE |
+ DRM_MODE_LUT_REUSE_LAST |
+ DRM_MODE_LUT_NON_DECREASING),
+ .count = 1,
+ .input_bpc = 10, .output_bpc = 16,
+ .start = 1 << 9, .end = 3 << 9,
+ .min = 0, .max = (8 << 16) - 1,
+ },
+ {
+ .flags = DRM_MODE_LUT_GAMMA,
+ .count = 512,
+ .input_bpc = 9, .output_bpc = 10,
+ .start = 0, .end = (1 << 9) - 1,
+ .min = 0, .max = (1 << 10) - 1,
+ },
+};
+
+/* FIXME input bpc? */
+static const struct drm_color_lut_range ivb_gamma_degamma_12p4[] = {
+ {
+ .flags = (DRM_MODE_LUT_GAMMA |
+ DRM_MODE_LUT_DEGAMMA |
+ DRM_MODE_LUT_REFLECT_NEGATIVE |
+ DRM_MODE_LUT_INTERPOLATE |
+ DRM_MODE_LUT_NON_DECREASING),
+ .count = 512,
+ .input_bpc = 12, .output_bpc = 16,
+ .start = 0, .end = (1 << 12) - (1 << 12) / 512,
+ .min = 0, .max = (1 << 16) - 1,
+ },
+ /* PAL_GC_MAX */
+ {
+ .flags = (DRM_MODE_LUT_GAMMA |
+ DRM_MODE_LUT_DEGAMMA |
+ DRM_MODE_LUT_REFLECT_NEGATIVE |
+ DRM_MODE_LUT_INTERPOLATE |
+ DRM_MODE_LUT_REUSE_LAST |
+ DRM_MODE_LUT_NON_DECREASING),
+ .count = 1,
+ .input_bpc = 12, .output_bpc = 16,
+ .start = (1 << 12) - (1 << 12) / 512, .end = 1 << 12,
+ .min = 0, .max = 1 << 16,
+ },
+ /* PAL_EXT_GC_MAX */
+ {
+ .flags = (DRM_MODE_LUT_GAMMA |
+ DRM_MODE_LUT_DEGAMMA |
+ DRM_MODE_LUT_REFLECT_NEGATIVE |
+ DRM_MODE_LUT_INTERPOLATE |
+ DRM_MODE_LUT_REUSE_LAST |
+ DRM_MODE_LUT_NON_DECREASING),
+ .count = 1,
+ .input_bpc = 12, .output_bpc = 16,
+ .start = 1 << 12, .end = 3 << 12,
+ .min = 0, .max = (8 << 16) - 1,
+ },
+};
+
+ /* FIXME input bpc? */
+static const struct drm_color_lut_range icl_multi_seg_gamma[] = {
+ /* segment 1 aka. super fine segment */
+ {
+ .flags = (DRM_MODE_LUT_GAMMA |
+ DRM_MODE_LUT_REFLECT_NEGATIVE |
+ DRM_MODE_LUT_INTERPOLATE |
+ DRM_MODE_LUT_NON_DECREASING),
+ .count = 9,
+ .input_bpc = 24, .output_bpc = 16,
+ .start = 0, .end = (1 << 24) / (128 * 256),
+ .min = 0, .max = (1 << 16) - 1,
+ },
+ /* segment 2 aka. fine segment */
+ {
+ .flags = (DRM_MODE_LUT_GAMMA |
+ DRM_MODE_LUT_REFLECT_NEGATIVE |
+ DRM_MODE_LUT_INTERPOLATE |
+ DRM_MODE_LUT_NON_DECREASING),
+ .count = 257,
+ .input_bpc = 24, .output_bpc = 16,
+ .start = 0, .end = (1 << 24) / 128,
+ .min = 0, .max = (1 << 16) - 1,
+ },
+ /* segment 3 aka. coarse segment */
+ {
+ .flags = (DRM_MODE_LUT_GAMMA |
+ DRM_MODE_LUT_REFLECT_NEGATIVE |
+ DRM_MODE_LUT_INTERPOLATE |
+ DRM_MODE_LUT_NON_DECREASING),
+ .count = 257,
+ .input_bpc = 24, .output_bpc = 16,
+ .start = 0, .end = (1 << 24) - (1 << 24) / 256,
+ .min = 0, .max = (1 << 16) - 1,
+ },
+ /* segment 3 aka. coarse segment / PAL_GC_MAX */
+ {
+ .flags = (DRM_MODE_LUT_GAMMA |
+ DRM_MODE_LUT_REFLECT_NEGATIVE |
+ DRM_MODE_LUT_INTERPOLATE |
+ DRM_MODE_LUT_REUSE_LAST |
+ DRM_MODE_LUT_NON_DECREASING),
+ .count = 1,
+ .input_bpc = 24, .output_bpc = 16,
+ .start = (1 << 24) - (1 << 24) / 256, .end = 1 << 24,
+ .min = 0, .max = 1 << 16,
+ },
+ /* PAL_EXT_GC_MAX */
+ {
+ .flags = (DRM_MODE_LUT_GAMMA |
+ DRM_MODE_LUT_REFLECT_NEGATIVE |
+ DRM_MODE_LUT_INTERPOLATE |
+ DRM_MODE_LUT_REUSE_LAST |
+ DRM_MODE_LUT_NON_DECREASING),
+ .count = 1,
+ .input_bpc = 24, .output_bpc = 16,
+ .start = 1 << 24, .end = 3 << 24,
+ .min = 0, .max = (8 << 16) - 1,
+ },
+ /* PAL_EXT2_GC_MAX */
+ {
+ .flags = (DRM_MODE_LUT_GAMMA |
+ DRM_MODE_LUT_REFLECT_NEGATIVE |
+ DRM_MODE_LUT_INTERPOLATE |
+ DRM_MODE_LUT_REUSE_LAST |
+ DRM_MODE_LUT_NON_DECREASING),
+ .count = 1,
+ .input_bpc = 24, .output_bpc = 16,
+ .start = 3 << 24, .end = 7 << 24,
+ .min = 0, .max = (8 << 16) - 1,
+ },
+};
+
void intel_color_init(struct intel_crtc *crtc)
{
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
bool has_ctm = INTEL_INFO(dev_priv)->color.degamma_lut_size != 0;
+ int degamma_lut_size, gamma_lut_size;
drm_mode_crtc_set_gamma_size(&crtc->base, 256);
@@ -1233,25 +1657,159 @@ void intel_color_init(struct intel_crtc *crtc)
dev_priv->display.color_check = chv_color_check;
dev_priv->display.color_commit = i9xx_color_commit;
dev_priv->display.load_luts = cherryview_load_luts;
+
+ drm_color_add_gamma_mode_range(&dev_priv->drm,
+ "8bit gamma",
+ i9xx_gamma_8,
+ sizeof(i9xx_gamma_8));
+ drm_color_add_gamma_mode_range(&dev_priv->drm,
+ "interpolated gamma",
+ i965_gamma_10,
+ sizeof(i965_gamma_10));
+ drm_color_add_gamma_mode_range(&dev_priv->drm,
+ "CGM gamma",
+ chv_cgm_gamma,
+ sizeof(chv_cgm_gamma));
+ drm_color_add_gamma_mode_range(&dev_priv->drm,
+ "CGM degamma",
+ chv_cgm_degamma,
+ sizeof(chv_cgm_degamma));
+ drm_color_add_gamma_mode_range(&dev_priv->drm,
+ "CGM degamma with 8bit gamma",
+ chv_cgm_degamma_i9xx_gamma_8,
+ sizeof(chv_cgm_degamma));
+ drm_color_add_gamma_mode_range(&dev_priv->drm,
+ "CGM degamma with 10bit interpolated gamma",
+ chv_cgm_degamma_i965_gamma_10,
+ sizeof(chv_cgm_degamma));
+ drm_color_add_gamma_mode_range(&dev_priv->drm,
+ "CGM degamma with CGM gamma",
+ chv_cgm_degamma_cgm_degamma,
+ sizeof(chv_cgm_degamma));
} else if (INTEL_GEN(dev_priv) >= 4) {
dev_priv->display.color_check = i9xx_color_check;
dev_priv->display.color_commit = i9xx_color_commit;
dev_priv->display.load_luts = i965_load_luts;
+
+ drm_color_add_gamma_mode_range(&dev_priv->drm,
+ "8bit gamma",
+ i9xx_gamma_8,
+ sizeof(i9xx_gamma_8));
+ drm_color_add_gamma_mode_range(&dev_priv->drm,
+ "interpolated gamma",
+ i965_gamma_10,
+ sizeof(i965_gamma_10));
} else {
dev_priv->display.color_check = i9xx_color_check;
dev_priv->display.color_commit = i9xx_color_commit;
dev_priv->display.load_luts = i9xx_load_luts;
+
+ degamma_lut_size = 0;
+ gamma_lut_size = 0;
+ has_ctm = false;
+
+ drm_color_add_gamma_mode_range(&dev_priv->drm,
+ "8bit gamma",
+ i9xx_gamma_8,
+ sizeof(i9xx_gamma_8));
+
+ if (i9xx_has_10bit_lut(dev_priv)) {
+ /* 10bit interpolated gamma */
+ gamma_lut_size = I9XX_LUT_SIZE_10BIT;
+
+ drm_color_add_gamma_mode_range(&dev_priv->drm,
+ "interpolated gamma",
+ i9xx_gamma_10_slope,
+ sizeof(i9xx_gamma_10_slope));
+ }
}
} else {
- if (INTEL_GEN(dev_priv) >= 11)
+ if (INTEL_GEN(dev_priv) >= 11) {
dev_priv->display.color_check = icl_color_check;
- else if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
+ /* don't advertize the >= 1.0 entries */
+ degamma_lut_size = 0;
+ gamma_lut_size = ILK_LUT_SIZE_10BIT;
+
+ drm_color_add_gamma_mode_range(&dev_priv->drm,
+ "8bit gamma",
+ i9xx_gamma_8,
+ sizeof(i9xx_gamma_8));
+ drm_color_add_gamma_mode_range(&dev_priv->drm,
+ "10bit gamma",
+ glk_gamma_10,
+ sizeof(glk_gamma_10));
+ drm_color_add_gamma_mode_range(&dev_priv->drm,
+ "interpolated gamma",
+ glk_gamma_12p4,
+ sizeof(glk_gamma_12p4));
+ drm_color_add_gamma_mode_range(&dev_priv->drm,
+ "multi-segmented gamma",
+ icl_multi_seg_gamma,
+ sizeof(icl_multi_seg_gamma));
+ } else if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv)) {
dev_priv->display.color_check = glk_color_check;
- else if (INTEL_GEN(dev_priv) >= 7)
+ /* don't advertize the >= 1.0 entries */
+ degamma_lut_size = 0;
+ gamma_lut_size = ILK_LUT_SIZE_10BIT;
+ has_ctm = true;
+
+ drm_color_add_gamma_mode_range(&dev_priv->drm,
+ "8bit gamma",
+ i9xx_gamma_8,
+ sizeof(i9xx_gamma_8));
+ drm_color_add_gamma_mode_range(&dev_priv->drm,
+ "10bit gamma",
+ glk_gamma_10,
+ sizeof(glk_gamma_10));
+ drm_color_add_gamma_mode_range(&dev_priv->drm,
+ "interpolated gamma",
+ glk_gamma_12p4,
+ sizeof(glk_gamma_12p4));
+ } else if (INTEL_GEN(dev_priv) >= 7) {
dev_priv->display.color_check = ivb_color_check;
- else
+
+ /* don't advertize the >= 1.0 entries */
+ degamma_lut_size = IVB_LUT_SIZE_SPLIT;
+ gamma_lut_size = IVB_LUT_SIZE_SPLIT;
+ has_ctm = true;
+
+ drm_color_add_gamma_mode_range(&dev_priv->drm,
+ "8bit gamma or degamma",
+ ilk_gamma_degamma_8,
+ sizeof(ilk_gamma_degamma_8));
+ drm_color_add_gamma_mode_range(&dev_priv->drm,
+ "split gamma",
+ ivb_split_gamma,
+ sizeof(ivb_split_gamma));
+ drm_color_add_gamma_mode_range(&dev_priv->drm,
+ "10bit gamma or degamma",
+ ivb_gamma_degamma_10,
+ sizeof(ivb_gamma_degamma_10));
+ drm_color_add_gamma_mode_range(&dev_priv->drm,
+ "interpolated gamma or degamma",
+ ivb_gamma_degamma_12p4,
+ sizeof(ivb_gamma_degamma_12p4));
+ } else {
dev_priv->display.color_check = ilk_color_check;
+ degamma_lut_size = 0;
+ gamma_lut_size = ILK_LUT_SIZE_10BIT;
+ has_ctm = true;
+
+ drm_color_add_gamma_mode_range(&dev_priv->drm,
+ "8bit gamma or degamma",
+ ilk_gamma_degamma_8,
+ sizeof(ilk_gamma_degamma_8));
+ drm_color_add_gamma_mode_range(&dev_priv->drm,
+ "10bit gamma or degamma",
+ ilk_gamma_degamma_10,
+ sizeof(ilk_gamma_degamma_10));
+ drm_color_add_gamma_mode_range(&dev_priv->drm,
+ "interpolated gamma or degamma",
+ ilk_gamma_degamma_12p4,
+ sizeof(ilk_gamma_degamma_12p4));
+ }
+
if (INTEL_GEN(dev_priv) >= 9)
dev_priv->display.color_commit = skl_color_commit;
else if (IS_BROADWELL(dev_priv) || IS_HASWELL(dev_priv))
--
1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2019-04-12 10:20 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-12 10:20 [v3 0/7] Add Multi Segment Gamma Support Uma Shankar
2019-04-12 10:20 ` [v3 1/7] drm: Add gamma mode property Uma Shankar
2019-04-16 7:28 ` Daniel Vetter
2019-04-12 10:20 ` Uma Shankar [this message]
2019-04-12 10:20 ` [v3 3/7] drm/i915/icl: Add register definitions for Multi Segmented gamma Uma Shankar
2019-04-12 10:21 ` [v3 4/7] drm/i915/icl: Add support for multi segmented gamma mode Uma Shankar
2019-04-12 10:21 ` [v3 5/7] drm/i915: Attach gamma mode property Uma Shankar
2019-04-12 10:21 ` [v3 6/7] drm: Add Client Cap for advance gamma mode Uma Shankar
2019-04-15 10:57 ` Lankhorst, Maarten
2019-04-15 12:43 ` [Intel-gfx] " Ville Syrjälä
2019-04-16 8:54 ` Lankhorst, Maarten
2019-04-15 13:56 ` Sharma, Shashank
2019-04-15 14:12 ` Lankhorst, Maarten
2019-04-15 14:29 ` Sharma, Shashank
2019-04-15 19:20 ` Daniel Vetter
2019-04-16 15:06 ` Ville Syrjälä
2019-04-12 10:21 ` [v3 7/7] drm/i915: Enable " Uma Shankar
2019-04-12 10:39 ` ✗ Fi.CI.CHECKPATCH: warning for Add Multi Segment Gamma Support (rev3) Patchwork
2019-04-12 12:50 ` ✗ Fi.CI.BAT: failure " Patchwork
2019-04-17 7:28 ` [v3 0/7] Add Multi Segment Gamma Support Daniel Vetter
2019-04-17 11:57 ` Ville Syrjälä
2019-04-18 7:13 ` Daniel Vetter
2019-04-18 13:11 ` Ville Syrjälä
2019-04-23 6:52 ` Daniel Vetter
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=1555064463-18479-3-git-send-email-uma.shankar@intel.com \
--to=uma.shankar@intel.com \
--cc=dcastagna@chromium.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=maarten.lankhorst@intel.com \
--cc=sam@ravnborg.org \
--cc=seanpaul@chromium.org \
--cc=ville.syrjala@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.