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

drm/i915/color: Use per-device debugs 



Switch to drm_dbg_kms() in the LUT validation code so we see
which device generated the debugs. Need to plumb i915 a bit
deeper to make that happen.

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


Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
parent ca93f9f3

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

+6 −5
Original line number Diff line number Diff line
@@ -2111,7 +2111,8 @@ static u32 intel_degamma_lut_size(const struct intel_crtc_state *crtc_state) 
	return DISPLAY_INFO(i915)->color.degamma_lut_size;

}



static int check_lut_size(const struct drm_property_blob *lut, int expected)

static int check_lut_size(struct drm_i915_private *i915,

			  const struct drm_property_blob *lut, int expected)

{

	int len;
@@ -2120,7 +2121,7 @@ static int check_lut_size(const struct drm_property_blob *lut, int expected) 


	len = drm_color_lut_size(lut);

	if (len != expected) {

		DRM_DEBUG_KMS("Invalid LUT size; got %d, expected %d\n",

		drm_dbg_kms(&i915->drm, "Invalid LUT size; got %d, expected %d\n",

			    len, expected);

		return -EINVAL;

	}
@@ -2146,8 +2147,8 @@ static int _check_luts(const struct intel_crtc_state *crtc_state, 
	degamma_length = intel_degamma_lut_size(crtc_state);

	gamma_length = intel_gamma_lut_size(crtc_state);



	if (check_lut_size(degamma_lut, degamma_length) ||

	    check_lut_size(gamma_lut, gamma_length))

	if (check_lut_size(i915, degamma_lut, degamma_length) ||

	    check_lut_size(i915, gamma_lut, gamma_length))

		return -EINVAL;



	if (drm_color_lut_check(degamma_lut, degamma_tests) ||