Commit 9c1f06d9 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Reorder 12.4 lut udw vs. ldw functions 



Satisfy my ocd and define ilk_lut_12p4_ldw() before ilk_lut_12p4_udw().
That is the order all the other similar functions use.

Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221114153732.11773-6-ville.syrjala@linux.intel.com
parent 59c676a2

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

+8 −8
Original line number Diff line number Diff line
@@ -483,14 +483,6 @@ static void ilk_lut_10_pack(struct drm_color_lut *entry, u32 val) 
	entry->blue = intel_color_lut_pack(REG_FIELD_GET(PREC_PALETTE_10_BLUE_MASK, val), 10);

}



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

static u32 ilk_lut_12p4_udw(const struct drm_color_lut *color)

{

	return REG_FIELD_PREP(PREC_PALETTE_12P4_RED_UDW_MASK, color->red >> 6) |

		REG_FIELD_PREP(PREC_PALETTE_12P4_GREEN_UDW_MASK, color->green >> 6) |

		REG_FIELD_PREP(PREC_PALETTE_12P4_BLUE_UDW_MASK, color->blue >> 6);

}



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

static u32 ilk_lut_12p4_ldw(const struct drm_color_lut *color)

{
@@ -499,6 +491,14 @@ static u32 ilk_lut_12p4_ldw(const struct drm_color_lut *color) 
		REG_FIELD_PREP(PREC_PALETTE_12P4_BLUE_LDW_MASK, color->blue & 0x3f);

}



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

static u32 ilk_lut_12p4_udw(const struct drm_color_lut *color)

{

	return REG_FIELD_PREP(PREC_PALETTE_12P4_RED_UDW_MASK, color->red >> 6) |

		REG_FIELD_PREP(PREC_PALETTE_12P4_GREEN_UDW_MASK, color->green >> 6) |

		REG_FIELD_PREP(PREC_PALETTE_12P4_BLUE_UDW_MASK, color->blue >> 6);

}



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

{

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