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

drm/i915: Shuffle chv_cgm_gamma_pack() around a bit 



Move chv_cgm_gamma_pack() next to the other CGM gamma functions.
Right now it's stuck in the middle of the CGM degamma functions.

Reviewed-by: default avatarUma Shankar <uma.shankar@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200925131656.10022-7-ville.syrjala@linux.intel.com
parent 4073a4ee

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

+7 −7
Original line number Diff line number Diff line
@@ -1030,13 +1030,6 @@ static u32 chv_cgm_degamma_udw(const struct drm_color_lut *color) 
	return drm_color_lut_extract(color->red, 14);

}



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

{

	entry->green = intel_color_lut_pack(REG_FIELD_GET(CGM_PIPE_GAMMA_GREEN_MASK, ldw), 10);

	entry->blue = intel_color_lut_pack(REG_FIELD_GET(CGM_PIPE_GAMMA_BLUE_MASK, ldw), 10);

	entry->red = intel_color_lut_pack(REG_FIELD_GET(CGM_PIPE_GAMMA_RED_MASK, udw), 10);

}



static void chv_load_cgm_degamma(struct intel_crtc *crtc,

				 const struct drm_property_blob *blob)

{
@@ -1064,6 +1057,13 @@ static u32 chv_cgm_gamma_udw(const struct drm_color_lut *color) 
	return drm_color_lut_extract(color->red, 10);

}



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

{

	entry->green = intel_color_lut_pack(REG_FIELD_GET(CGM_PIPE_GAMMA_GREEN_MASK, ldw), 10);

	entry->blue = intel_color_lut_pack(REG_FIELD_GET(CGM_PIPE_GAMMA_BLUE_MASK, ldw), 10);

	entry->red = intel_color_lut_pack(REG_FIELD_GET(CGM_PIPE_GAMMA_RED_MASK, udw), 10);

}



static void chv_load_cgm_gamma(struct intel_crtc *crtc,

			       const struct drm_property_blob *blob)

{