Skip to content

L
linux
Commit 1b858874 authored by Swati Sharma's avatar Swati Sharma Committed by Jani Nikula
Browse files
Options

Revert "drm/i915/color: Extract icl_read_luts()" 

This reverts commit 84af7649.

This is causing problems with the display, displays are all
bright colors.

Fixes: 84af7649 ("drm/i915/color: Extract icl_read_luts()")
Signed-off-by: default avatarSwati Sharma <swati2.sharma@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190924135820.11850-1-swati2.sharma@intel.com
parent b1da91c9
Show whitespace changes
Inline Side-by-side
Showing with 15 additions and 117 deletions
drivers/gpu/drm/i915/display/intel_color.c
View file @ 1b858874
...@@ -1420,9 +1420,6 @@ static int icl_color_check(struct intel_crtc_state *crtc_state) ...@@ -1420,9 +1420,6 @@ static int icl_color_check(struct intel_crtc_state *crtc_state)
static int i9xx_gamma_precision(const struct intel_crtc_state *crtc_state) static int i9xx_gamma_precision(const struct intel_crtc_state *crtc_state)
{ {
if (!crtc_state->gamma_enable)
return 0;
switch (crtc_state->gamma_mode) { switch (crtc_state->gamma_mode) {
case GAMMA_MODE_MODE_8BIT: case GAMMA_MODE_MODE_8BIT:
return 8; return 8;
...@@ -1436,9 +1433,6 @@ static int i9xx_gamma_precision(const struct intel_crtc_state *crtc_state) ...@@ -1436,9 +1433,6 @@ static int i9xx_gamma_precision(const struct intel_crtc_state *crtc_state)
static int ilk_gamma_precision(const struct intel_crtc_state *crtc_state) static int ilk_gamma_precision(const struct intel_crtc_state *crtc_state)
{ {
if (!crtc_state->gamma_enable)
return 0;
if ((crtc_state->csc_mode & CSC_POSITION_BEFORE_GAMMA) == 0) if ((crtc_state->csc_mode & CSC_POSITION_BEFORE_GAMMA) == 0)
return 0; return 0;
...@@ -1455,9 +1449,6 @@ static int ilk_gamma_precision(const struct intel_crtc_state *crtc_state) ...@@ -1455,9 +1449,6 @@ static int ilk_gamma_precision(const struct intel_crtc_state *crtc_state)
static int chv_gamma_precision(const struct intel_crtc_state *crtc_state) static int chv_gamma_precision(const struct intel_crtc_state *crtc_state)
{ {
if (!crtc_state->gamma_enable)
return 0;
if (crtc_state->cgm_mode & CGM_PIPE_MODE_GAMMA) if (crtc_state->cgm_mode & CGM_PIPE_MODE_GAMMA)
return 10; return 10;
else else
...@@ -1466,9 +1457,6 @@ static int chv_gamma_precision(const struct intel_crtc_state *crtc_state) ...@@ -1466,9 +1457,6 @@ static int chv_gamma_precision(const struct intel_crtc_state *crtc_state)
static int glk_gamma_precision(const struct intel_crtc_state *crtc_state) static int glk_gamma_precision(const struct intel_crtc_state *crtc_state)
{ {
if (!crtc_state->gamma_enable)
return 0;
switch (crtc_state->gamma_mode) { switch (crtc_state->gamma_mode) {
case GAMMA_MODE_MODE_8BIT: case GAMMA_MODE_MODE_8BIT:
return 8; return 8;
...@@ -1480,39 +1468,21 @@ static int glk_gamma_precision(const struct intel_crtc_state *crtc_state) ...@@ -1480,39 +1468,21 @@ static int glk_gamma_precision(const struct intel_crtc_state *crtc_state)
} }
} }
static int icl_gamma_precision(const struct intel_crtc_state *crtc_state)
{
if ((crtc_state->gamma_mode & POST_CSC_GAMMA_ENABLE) == 0)
return 0;
switch (crtc_state->gamma_mode & GAMMA_MODE_MODE_MASK) {
case GAMMA_MODE_MODE_8BIT:
return 8;
case GAMMA_MODE_MODE_10BIT:
return 10;
case GAMMA_MODE_MODE_12BIT_MULTI_SEGMENTED:
return 16;
default:
MISSING_CASE(crtc_state->gamma_mode);
return 0;
}
}
int intel_color_get_gamma_bit_precision(const struct intel_crtc_state *crtc_state) int intel_color_get_gamma_bit_precision(const struct intel_crtc_state *crtc_state)
{ {
struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc); struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
if (!crtc_state->gamma_enable)
return 0;
if (HAS_GMCH(dev_priv)) { if (HAS_GMCH(dev_priv)) {
if (IS_CHERRYVIEW(dev_priv)) if (IS_CHERRYVIEW(dev_priv))
return chv_gamma_precision(crtc_state); return chv_gamma_precision(crtc_state);
else else
return i9xx_gamma_precision(crtc_state); return i9xx_gamma_precision(crtc_state);
} else { } else {
if (INTEL_GEN(dev_priv) >= 11) if (IS_CANNONLAKE(dev_priv) || IS_GEMINILAKE(dev_priv))
return icl_gamma_precision(crtc_state);
else if (IS_CANNONLAKE(dev_priv) || IS_GEMINILAKE(dev_priv))
return glk_gamma_precision(crtc_state); return glk_gamma_precision(crtc_state);
else if (IS_IRONLAKE(dev_priv)) else if (IS_IRONLAKE(dev_priv))
return ilk_gamma_precision(crtc_state); return ilk_gamma_precision(crtc_state);
...@@ -1543,20 +1513,6 @@ static bool intel_color_lut_entry_equal(struct drm_color_lut *lut1, ...@@ -1543,20 +1513,6 @@ static bool intel_color_lut_entry_equal(struct drm_color_lut *lut1,
return true; return true;
} }
static bool intel_color_lut_entry_multi_equal(struct drm_color_lut *lut1,
struct drm_color_lut *lut2,
int lut_size, u32 err)
{
int i;
for (i = 0; i < 9; i++) {
if (!err_check(&lut1[i], &lut2[i], err))
return false;
}
return true;
}
bool intel_color_lut_equal(struct drm_property_blob *blob1, bool intel_color_lut_equal(struct drm_property_blob *blob1,
struct drm_property_blob *blob2, struct drm_property_blob *blob2,
u32 gamma_mode, u32 bit_precision) u32 gamma_mode, u32 bit_precision)
...@@ -1575,8 +1531,16 @@ bool intel_color_lut_equal(struct drm_property_blob *blob1, ...@@ -1575,8 +1531,16 @@ bool intel_color_lut_equal(struct drm_property_blob *blob1,
lut_size2 = drm_color_lut_size(blob2); lut_size2 = drm_color_lut_size(blob2);
/* check sw and hw lut size */ /* check sw and hw lut size */
switch (gamma_mode) {
case GAMMA_MODE_MODE_8BIT:
case GAMMA_MODE_MODE_10BIT:
if (lut_size1 != lut_size2) if (lut_size1 != lut_size2)
return false; return false;
break;
default:
MISSING_CASE(gamma_mode);
return false;
}
lut1 = blob1->data; lut1 = blob1->data;
lut2 = blob2->data; lut2 = blob2->data;
...@@ -1584,18 +1548,13 @@ bool intel_color_lut_equal(struct drm_property_blob *blob1, ...@@ -1584,18 +1548,13 @@ bool intel_color_lut_equal(struct drm_property_blob *blob1,
err = 0xffff >> bit_precision; err = 0xffff >> bit_precision;
/* check sw and hw lut entry to be equal */ /* check sw and hw lut entry to be equal */
switch (gamma_mode & GAMMA_MODE_MODE_MASK) { switch (gamma_mode) {
case GAMMA_MODE_MODE_8BIT: case GAMMA_MODE_MODE_8BIT:
case GAMMA_MODE_MODE_10BIT: case GAMMA_MODE_MODE_10BIT:
if (!intel_color_lut_entry_equal(lut1, lut2, if (!intel_color_lut_entry_equal(lut1, lut2,
lut_size2, err)) lut_size2, err))
return false; return false;
break; break;
case GAMMA_MODE_MODE_12BIT_MULTI_SEGMENTED:
if (!intel_color_lut_entry_multi_equal(lut1, lut2,
lut_size2, err))
return false;
break;
default: default:
MISSING_CASE(gamma_mode); MISSING_CASE(gamma_mode);
return false; return false;
...@@ -1835,60 +1794,6 @@ static void glk_read_luts(struct intel_crtc_state *crtc_state) ...@@ -1835,60 +1794,6 @@ static void glk_read_luts(struct intel_crtc_state *crtc_state)
crtc_state->base.gamma_lut = glk_read_lut_10(crtc_state, PAL_PREC_INDEX_VALUE(0)); crtc_state->base.gamma_lut = glk_read_lut_10(crtc_state, PAL_PREC_INDEX_VALUE(0));
} }
static struct drm_property_blob *
icl_read_lut_multi_segment(const struct intel_crtc_state *crtc_state)
{
struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
int lut_size = INTEL_INFO(dev_priv)->color.gamma_lut_size;
enum pipe pipe = crtc->pipe;
struct drm_property_blob *blob;
struct drm_color_lut *blob_data;
u32 i, val1, val2;
blob = drm_property_create_blob(&dev_priv->drm,
sizeof(struct drm_color_lut) * lut_size,
NULL);
if (IS_ERR(blob))
return NULL;
blob_data = blob->data;
I915_WRITE(PREC_PAL_MULTI_SEG_INDEX(pipe), PAL_PREC_AUTO_INCREMENT);
for (i = 0; i < 9; i++) {
val1 = I915_READ(PREC_PAL_MULTI_SEG_DATA(pipe));
val2 = I915_READ(PREC_PAL_MULTI_SEG_DATA(pipe));
blob_data[i].red = REG_FIELD_GET(PAL_PREC_MULTI_SEG_RED_UDW_MASK, val2) << 6 |
REG_FIELD_GET(PAL_PREC_MULTI_SEG_RED_LDW_MASK, val1);
blob_data[i].green = REG_FIELD_GET(PAL_PREC_MULTI_SEG_GREEN_UDW_MASK, val2) << 6 |
REG_FIELD_GET(PAL_PREC_MULTI_SEG_GREEN_LDW_MASK, val1);
blob_data[i].blue = REG_FIELD_GET(PAL_PREC_MULTI_SEG_BLUE_UDW_MASK, val2) << 6 |
REG_FIELD_GET(PAL_PREC_MULTI_SEG_BLUE_LDW_MASK, val1);
}
/*
* FIXME readouts from PAL_PREC_DATA register aren't giving correct values
* in the case of fine and coarse segments. Restricting readouts only for
* super fine segment as of now.
*/
return blob;
}
static void icl_read_luts(struct intel_crtc_state *crtc_state)
{
if ((crtc_state->gamma_mode & GAMMA_MODE_MODE_MASK) ==
GAMMA_MODE_MODE_8BIT)
crtc_state->base.gamma_lut = i9xx_read_lut_8(crtc_state);
else if ((crtc_state->gamma_mode & GAMMA_MODE_MODE_MASK) ==
GAMMA_MODE_MODE_12BIT_MULTI_SEGMENTED)
crtc_state->base.gamma_lut = icl_read_lut_multi_segment(crtc_state);
else
crtc_state->base.gamma_lut = glk_read_lut_10(crtc_state, PAL_PREC_INDEX_VALUE(0));
}
void intel_color_init(struct intel_crtc *crtc) void intel_color_init(struct intel_crtc *crtc)
{ {
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
...@@ -1932,7 +1837,6 @@ void intel_color_init(struct intel_crtc *crtc) ...@@ -1932,7 +1837,6 @@ void intel_color_init(struct intel_crtc *crtc)
if (INTEL_GEN(dev_priv) >= 11) { if (INTEL_GEN(dev_priv) >= 11) {
dev_priv->display.load_luts = icl_load_luts; dev_priv->display.load_luts = icl_load_luts;
dev_priv->display.read_luts = icl_read_luts;
} else if (IS_CANNONLAKE(dev_priv) || IS_GEMINILAKE(dev_priv)) { } else if (IS_CANNONLAKE(dev_priv) || IS_GEMINILAKE(dev_priv)) {
dev_priv->display.load_luts = glk_load_luts; dev_priv->display.load_luts = glk_load_luts;
dev_priv->display.read_luts = glk_read_luts; dev_priv->display.read_luts = glk_read_luts;
......
drivers/gpu/drm/i915/i915_reg.h
View file @ 1b858874
...@@ -10575,12 +10575,6 @@ enum skl_power_gate { ...@@ -10575,12 +10575,6 @@ enum skl_power_gate {
#define _PAL_PREC_MULTI_SEG_DATA_A 0x4A40C #define _PAL_PREC_MULTI_SEG_DATA_A 0x4A40C
#define _PAL_PREC_MULTI_SEG_DATA_B 0x4AC0C #define _PAL_PREC_MULTI_SEG_DATA_B 0x4AC0C
#define PAL_PREC_MULTI_SEG_RED_LDW_MASK REG_GENMASK(29, 24)
#define PAL_PREC_MULTI_SEG_RED_UDW_MASK REG_GENMASK(29, 20)
#define PAL_PREC_MULTI_SEG_GREEN_LDW_MASK REG_GENMASK(19, 14)
#define PAL_PREC_MULTI_SEG_GREEN_UDW_MASK REG_GENMASK(19, 10)
#define PAL_PREC_MULTI_SEG_BLUE_LDW_MASK REG_GENMASK(9, 4)
#define PAL_PREC_MULTI_SEG_BLUE_UDW_MASK REG_GENMASK(9, 0)
#define PREC_PAL_MULTI_SEG_INDEX(pipe) _MMIO_PIPE(pipe, \ #define PREC_PAL_MULTI_SEG_INDEX(pipe) _MMIO_PIPE(pipe, \
_PAL_PREC_MULTI_SEG_INDEX_A, \ _PAL_PREC_MULTI_SEG_INDEX_A, \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7