Commit 28c9fa77 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Deconfuse the ilk+ 12.4 LUT entry functions 



s/icl_lut_multi_seg_pack/ilk_lut_12p4_pack/ since that's what it is
and group the corresponding "unpack" functions next to it.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221026113906.10551-7-ville.syrjala@linux.intel.com


Reviewed-by: default avatarAnkit Nautiyal <ankit.k.nautiyal@intel.com>
parent 8f079f08

drivers/gpu/drm/i915/display/intel_color.c

+19 −19
Original line number Diff line number Diff line
@@ -482,7 +482,21 @@ static void ilk_lut_10_pack(struct drm_color_lut *entry, u32 val) 
	entry->blue = intel_color_lut_pack(REG_FIELD_GET(PREC_PALETTE_BLUE_MASK, val), 10);

}



static void icl_lut_multi_seg_pack(struct drm_color_lut *entry, u32 ldw, u32 udw)

/* ilk+ "12.4" interpolated format (high 10 bits) */

static u32 ilk_lut_12p4_udw(const struct drm_color_lut *color)

{

	return (color->red >> 6) << 20 | (color->green >> 6) << 10 |

		(color->blue >> 6);

}



/* ilk+ "12.4" interpolated format (low 6 bits) */

static u32 ilk_lut_12p4_ldw(const struct drm_color_lut *color)

{

	return (color->red & 0x3f) << 24 | (color->green & 0x3f) << 14 |

		(color->blue & 0x3f) << 4;

}



static void ilk_lut_12p4_pack(struct drm_color_lut *entry, u32 ldw, u32 udw)

{

	entry->red = REG_FIELD_GET(PAL_PREC_MULTI_SEG_RED_UDW_MASK, udw) << 6 |

		REG_FIELD_GET(PAL_PREC_MULTI_SEG_RED_LDW_MASK, ldw);
@@ -917,20 +931,6 @@ static void glk_load_luts(const struct intel_crtc_state *crtc_state) 
	}

}



/* ilk+ "12.4" interpolated format (high 10 bits) */

static u32 ilk_lut_12p4_udw(const struct drm_color_lut *color)

{

	return (color->red >> 6) << 20 | (color->green >> 6) << 10 |

		(color->blue >> 6);

}



/* ilk+ "12.4" interpolated format (low 6 bits) */

static u32 ilk_lut_12p4_ldw(const struct drm_color_lut *color)

{

	return (color->red & 0x3f) << 24 | (color->green & 0x3f) << 14 |

		(color->blue & 0x3f) << 4;

}



static void

ivb_load_lut_max(const struct intel_crtc_state *crtc_state,

		 const struct drm_color_lut *color)
@@ -2151,7 +2151,7 @@ icl_read_lut_multi_segment(struct intel_crtc *crtc) 
		u32 ldw = intel_de_read_fw(i915, PREC_PAL_MULTI_SEG_DATA(pipe));

		u32 udw = intel_de_read_fw(i915, PREC_PAL_MULTI_SEG_DATA(pipe));



		icl_lut_multi_seg_pack(&lut[i], ldw, udw);

		ilk_lut_12p4_pack(&lut[i], ldw, udw);

	}



	intel_de_write_fw(i915, PREC_PAL_MULTI_SEG_INDEX(pipe), 0);