| Message ID | 1555509813-9021-12-git-send-email-swati2.sharma@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: adding state checker for gamma lut values | expand |
On Wed, 17 Apr 2019, Swati Sharma <swati2.sharma@intel.com> wrote: > v3: Rebase > v4: -Renamed intel_compare_color_lut() to intel_color_lut_equal() (Jani) > -Added the default label above the correct label (Jani) > -Corrected smatch warn "variable dereferenced before check" (Dan Carpenter) > > Signed-off-by: Swati Sharma <swati2.sharma@intel.com> > --- > drivers/gpu/drm/i915/intel_color.c | 50 ++++++++++++++++++++++++++++++++++++ > drivers/gpu/drm/i915/intel_color.h | 7 +++++ > drivers/gpu/drm/i915/intel_display.c | 10 ++++++++ > 3 files changed, 67 insertions(+) > > diff --git a/drivers/gpu/drm/i915/intel_color.c b/drivers/gpu/drm/i915/intel_color.c > index 731cb97..592c328 100644 > --- a/drivers/gpu/drm/i915/intel_color.c > +++ b/drivers/gpu/drm/i915/intel_color.c > @@ -1495,6 +1495,56 @@ static void ilk_get_color_config(struct intel_crtc_state *crtc_state) > ilk_get_gamma_config(crtc_state); > } > > +static inline bool gamma_err_check(struct drm_color_lut *sw_lut, struct drm_color_lut *hw_lut, u32 err) > +{ > + return ((abs((long)hw_lut->red - sw_lut->red)) >= err) || > + ((abs((long)hw_lut->blue - sw_lut->blue)) >= err) || > + ((abs((long)hw_lut->green - sw_lut->green)) >= err); > +} > + > +bool intel_color_lut_equal(struct drm_property_blob *blob1, > + struct drm_property_blob *blob2, > + u32 gamma_mode) > +{ > + struct drm_color_lut *sw_lut, *hw_lut; > + int sw_lut_size, hw_lut_size, i; > + u32 bit_precision, err; > + > + if (!blob1 || !blob2) > + return false; (!blob1 && !blob2) must return true, right? > + > + sw_lut = blob1->data; > + hw_lut = blob2->data; > + > + switch(gamma_mode) { > + default: > + case GAMMA_MODE_MODE_8BIT: > + bit_precision = 8; > + break; > + case GAMMA_MODE_MODE_10BIT: > + bit_precision = 10; > + break; > + case GAMMA_MODE_MODE_12BIT: > + bit_precision = 12; > + break; > + } > + > + err = 0xffff >> bit_precision; > + > + sw_lut_size = drm_color_lut_size(blob1); > + hw_lut_size = drm_color_lut_size(blob2); > + > + if (sw_lut_size != hw_lut_size) > + return false; > + > + for (i = 0; i < sw_lut_size; i++) { > + if (!gamma_err_check(&hw_lut[i], &sw_lut[i], err)) > + return false; > + } > + > + return true; > +} > + > void intel_color_init(struct intel_crtc *crtc) > { > struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); > diff --git a/drivers/gpu/drm/i915/intel_color.h b/drivers/gpu/drm/i915/intel_color.h > index 057e8ac..2ae615e 100644 > --- a/drivers/gpu/drm/i915/intel_color.h > +++ b/drivers/gpu/drm/i915/intel_color.h > @@ -6,13 +6,20 @@ > #ifndef __INTEL_COLOR_H__ > #define __INTEL_COLOR_H__ > > + > +#include <linux/types.h> > + > struct intel_crtc_state; > struct intel_crtc; > +struct drm_property_blob; > > void intel_color_init(struct intel_crtc *crtc); > int intel_color_check(struct intel_crtc_state *crtc_state); > void intel_color_commit(const struct intel_crtc_state *crtc_state); > void intel_color_load_luts(const struct intel_crtc_state *crtc_state); > void intel_color_get_config(struct intel_crtc_state *crtc_state); > +bool intel_color_lut_equal(struct drm_property_blob *blob1, > + struct drm_property_blob *blob2, > + u32 gamma_mode); > > #endif /* __INTEL_COLOR_H__ */ > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 0715b4e..bb1ccd7 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -12236,6 +12236,14 @@ static bool fastboot_enabled(struct drm_i915_private *dev_priv) > } \ > } while (0) > > +#define PIPE_CONF_CHECK_COLOR_LUT(name, gamma_mode) do { \ > + if (!intel_color_lut_equal(current_config->name, pipe_config->name, gamma_mode)) { \ > + pipe_config_err(adjust, __stringify(name), \ > + "hw_state doesn't match sw_state\n"); \ > + ret = false; \ > + } \ > +} while (0) > + > #define PIPE_CONF_QUIRK(quirk) \ > ((current_config->quirks | pipe_config->quirks) & (quirk)) > > @@ -12379,6 +12387,8 @@ static bool fastboot_enabled(struct drm_i915_private *dev_priv) > PIPE_CONF_CHECK_INFOFRAME(spd); > PIPE_CONF_CHECK_INFOFRAME(hdmi); > > + PIPE_CONF_CHECK_COLOR_LUT(base.gamma_lut, pipe_config->gamma_mode); > + Hmm, we check gamma_mode and gamma_enable within if (!adjust), I suppose this should be there too. > #undef PIPE_CONF_CHECK_X > #undef PIPE_CONF_CHECK_I > #undef PIPE_CONF_CHECK_BOOL Please add #undef PIPE_CONF_CHECK_COLOR_LUT
diff --git a/drivers/gpu/drm/i915/intel_color.c b/drivers/gpu/drm/i915/intel_color.c index 731cb97..592c328 100644 --- a/drivers/gpu/drm/i915/intel_color.c +++ b/drivers/gpu/drm/i915/intel_color.c @@ -1495,6 +1495,56 @@ static void ilk_get_color_config(struct intel_crtc_state *crtc_state) ilk_get_gamma_config(crtc_state); } +static inline bool gamma_err_check(struct drm_color_lut *sw_lut, struct drm_color_lut *hw_lut, u32 err) +{ + return ((abs((long)hw_lut->red - sw_lut->red)) >= err) || + ((abs((long)hw_lut->blue - sw_lut->blue)) >= err) || + ((abs((long)hw_lut->green - sw_lut->green)) >= err); +} + +bool intel_color_lut_equal(struct drm_property_blob *blob1, + struct drm_property_blob *blob2, + u32 gamma_mode) +{ + struct drm_color_lut *sw_lut, *hw_lut; + int sw_lut_size, hw_lut_size, i; + u32 bit_precision, err; + + if (!blob1 || !blob2) + return false; + + sw_lut = blob1->data; + hw_lut = blob2->data; + + switch(gamma_mode) { + default: + case GAMMA_MODE_MODE_8BIT: + bit_precision = 8; + break; + case GAMMA_MODE_MODE_10BIT: + bit_precision = 10; + break; + case GAMMA_MODE_MODE_12BIT: + bit_precision = 12; + break; + } + + err = 0xffff >> bit_precision; + + sw_lut_size = drm_color_lut_size(blob1); + hw_lut_size = drm_color_lut_size(blob2); + + if (sw_lut_size != hw_lut_size) + return false; + + for (i = 0; i < sw_lut_size; i++) { + if (!gamma_err_check(&hw_lut[i], &sw_lut[i], err)) + return false; + } + + return true; +} + void intel_color_init(struct intel_crtc *crtc) { struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); diff --git a/drivers/gpu/drm/i915/intel_color.h b/drivers/gpu/drm/i915/intel_color.h index 057e8ac..2ae615e 100644 --- a/drivers/gpu/drm/i915/intel_color.h +++ b/drivers/gpu/drm/i915/intel_color.h @@ -6,13 +6,20 @@ #ifndef __INTEL_COLOR_H__ #define __INTEL_COLOR_H__ + +#include <linux/types.h> + struct intel_crtc_state; struct intel_crtc; +struct drm_property_blob; void intel_color_init(struct intel_crtc *crtc); int intel_color_check(struct intel_crtc_state *crtc_state); void intel_color_commit(const struct intel_crtc_state *crtc_state); void intel_color_load_luts(const struct intel_crtc_state *crtc_state); void intel_color_get_config(struct intel_crtc_state *crtc_state); +bool intel_color_lut_equal(struct drm_property_blob *blob1, + struct drm_property_blob *blob2, + u32 gamma_mode); #endif /* __INTEL_COLOR_H__ */ diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 0715b4e..bb1ccd7 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -12236,6 +12236,14 @@ static bool fastboot_enabled(struct drm_i915_private *dev_priv) } \ } while (0) +#define PIPE_CONF_CHECK_COLOR_LUT(name, gamma_mode) do { \ + if (!intel_color_lut_equal(current_config->name, pipe_config->name, gamma_mode)) { \ + pipe_config_err(adjust, __stringify(name), \ + "hw_state doesn't match sw_state\n"); \ + ret = false; \ + } \ +} while (0) + #define PIPE_CONF_QUIRK(quirk) \ ((current_config->quirks | pipe_config->quirks) & (quirk)) @@ -12379,6 +12387,8 @@ static bool fastboot_enabled(struct drm_i915_private *dev_priv) PIPE_CONF_CHECK_INFOFRAME(spd); PIPE_CONF_CHECK_INFOFRAME(hdmi); + PIPE_CONF_CHECK_COLOR_LUT(base.gamma_lut, pipe_config->gamma_mode); + #undef PIPE_CONF_CHECK_X #undef PIPE_CONF_CHECK_I #undef PIPE_CONF_CHECK_BOOL
v3: Rebase v4: -Renamed intel_compare_color_lut() to intel_color_lut_equal() (Jani) -Added the default label above the correct label (Jani) -Corrected smatch warn "variable dereferenced before check" (Dan Carpenter) Signed-off-by: Swati Sharma <swati2.sharma@intel.com> --- drivers/gpu/drm/i915/intel_color.c | 50 ++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_color.h | 7 +++++ drivers/gpu/drm/i915/intel_display.c | 10 ++++++++ 3 files changed, 67 insertions(+)