Commit 07e176f2 authored by Ville Syrjälä's avatar Ville Syrjälä

drm/i915: Shorten GAMMA_MODE_MODE_12BIT_MULTI_SEGMENTED a bit

s/GAMMA_MODE_MODE_12BIT_MULTI_SEGMENTED/GAMMA_MODE_MODE_12BIT_MULTI_SEG/
to make this thing slightly shorter.

Also fix up the platform comment while at it.
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221123152638.20622-2-ville.syrjala@linux.intel.comReviewed-by: default avatarAnkit Nautiyal <ankit.k.nautiyal@intel.com>
Reviewed-by: default avatarUma Shankar <uma.shankar@intel.com>
parent 2357f2b2
...@@ -1212,7 +1212,7 @@ static void icl_load_luts(const struct intel_crtc_state *crtc_state) ...@@ -1212,7 +1212,7 @@ static void icl_load_luts(const struct intel_crtc_state *crtc_state)
case GAMMA_MODE_MODE_8BIT: case GAMMA_MODE_MODE_8BIT:
ilk_load_lut_8(crtc, post_csc_lut); ilk_load_lut_8(crtc, post_csc_lut);
break; break;
case GAMMA_MODE_MODE_12BIT_MULTI_SEGMENTED: case GAMMA_MODE_MODE_12BIT_MULTI_SEG:
icl_program_gamma_superfine_segment(crtc_state); icl_program_gamma_superfine_segment(crtc_state);
icl_program_gamma_multi_segment(crtc_state); icl_program_gamma_multi_segment(crtc_state);
ivb_load_lut_ext_max(crtc_state); ivb_load_lut_ext_max(crtc_state);
...@@ -2091,7 +2091,7 @@ static u32 icl_gamma_mode(const struct intel_crtc_state *crtc_state) ...@@ -2091,7 +2091,7 @@ static u32 icl_gamma_mode(const struct intel_crtc_state *crtc_state)
else if (DISPLAY_VER(i915) >= 13) else if (DISPLAY_VER(i915) >= 13)
gamma_mode |= GAMMA_MODE_MODE_10BIT; gamma_mode |= GAMMA_MODE_MODE_10BIT;
else else
gamma_mode |= GAMMA_MODE_MODE_12BIT_MULTI_SEGMENTED; gamma_mode |= GAMMA_MODE_MODE_12BIT_MULTI_SEG;
return gamma_mode; return gamma_mode;
} }
...@@ -2283,7 +2283,7 @@ static int icl_post_csc_lut_precision(const struct intel_crtc_state *crtc_state) ...@@ -2283,7 +2283,7 @@ static int icl_post_csc_lut_precision(const struct intel_crtc_state *crtc_state)
return 8; return 8;
case GAMMA_MODE_MODE_10BIT: case GAMMA_MODE_MODE_10BIT:
return 10; return 10;
case GAMMA_MODE_MODE_12BIT_MULTI_SEGMENTED: case GAMMA_MODE_MODE_12BIT_MULTI_SEG:
return 16; return 16;
default: default:
MISSING_CASE(crtc_state->gamma_mode); MISSING_CASE(crtc_state->gamma_mode);
...@@ -2455,7 +2455,7 @@ static bool icl_lut_equal(const struct intel_crtc_state *crtc_state, ...@@ -2455,7 +2455,7 @@ static bool icl_lut_equal(const struct intel_crtc_state *crtc_state,
/* hw readout broken except for the super fine segment :( */ /* hw readout broken except for the super fine segment :( */
if ((crtc_state->gamma_mode & GAMMA_MODE_MODE_MASK) == if ((crtc_state->gamma_mode & GAMMA_MODE_MODE_MASK) ==
GAMMA_MODE_MODE_12BIT_MULTI_SEGMENTED) GAMMA_MODE_MODE_12BIT_MULTI_SEG)
check_size = 9; check_size = 9;
return intel_lut_equal(blob1, blob2, check_size, return intel_lut_equal(blob1, blob2, check_size,
...@@ -2971,7 +2971,7 @@ static void icl_read_luts(struct intel_crtc_state *crtc_state) ...@@ -2971,7 +2971,7 @@ static void icl_read_luts(struct intel_crtc_state *crtc_state)
case GAMMA_MODE_MODE_10BIT: case GAMMA_MODE_MODE_10BIT:
crtc_state->post_csc_lut = bdw_read_lut_10(crtc, PAL_PREC_INDEX_VALUE(0)); crtc_state->post_csc_lut = bdw_read_lut_10(crtc, PAL_PREC_INDEX_VALUE(0));
break; break;
case GAMMA_MODE_MODE_12BIT_MULTI_SEGMENTED: case GAMMA_MODE_MODE_12BIT_MULTI_SEG:
crtc_state->post_csc_lut = icl_read_lut_multi_segment(crtc); crtc_state->post_csc_lut = icl_read_lut_multi_segment(crtc);
break; break;
default: default:
......
...@@ -5315,7 +5315,7 @@ ...@@ -5315,7 +5315,7 @@
#define GAMMA_MODE_MODE_10BIT (1 << 0) #define GAMMA_MODE_MODE_10BIT (1 << 0)
#define GAMMA_MODE_MODE_12BIT (2 << 0) #define GAMMA_MODE_MODE_12BIT (2 << 0)
#define GAMMA_MODE_MODE_SPLIT (3 << 0) /* ivb-bdw */ #define GAMMA_MODE_MODE_SPLIT (3 << 0) /* ivb-bdw */
#define GAMMA_MODE_MODE_12BIT_MULTI_SEGMENTED (3 << 0) /* icl + */ #define GAMMA_MODE_MODE_12BIT_MULTI_SEG (3 << 0) /* icl-tgl */
/* Display Internal Timeout Register */ /* Display Internal Timeout Register */
#define RM_TIMEOUT _MMIO(0x42060) #define RM_TIMEOUT _MMIO(0x42060)
......
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