On Thu, 27 Feb 2020, Anshuman Gupta <anshuman.gupta@xxxxxxxxx> wrote: > Fix kbuild test robot build error for below commit > <d54c1a513c487ac6d6b3c4595e93e3625b461cc3>. The proper format to reference other commits is d54c1a513c48 ("drm/i915: Fix broken transcoder err state") If you put this magic spell in your ~/.gitconfig under [alias]: cite = "!f() { git log -1 '--pretty=format:%H (\"%s\")%n' $1 | sed -e 's/\\([0-f]\\{12\\}\\)[0-f]*/\\1/'; }; f" you can use 'git cite <commit-ish>' to give you the properly formatted citation. > has_transcoder() was unused because function which was using it > intel_display_capture_error_state() defined under > CONFIG_DRM_I915_CAPTURE_ERROR. > Moving has_transcoder() to under CONFIG_DRM_I915_CAPTURE_ERROR. > No functional change. > > Cc: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > Reported-by: kbuild test robot <lkp@xxxxxxxxx> > Signed-off-by: Anshuman Gupta <anshuman.gupta@xxxxxxxxx> Fixes: d54c1a513c48 ("drm/i915: Fix broken transcoder err state") Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx> > --- > drivers/gpu/drm/i915/display/intel_display.c | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > index 2fd3ccd33e30..27ec245e0dd2 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -249,15 +249,6 @@ intel_fdi_link_freq(struct drm_i915_private *dev_priv, > return dev_priv->fdi_pll_freq; > } > > -static bool > -has_transcoder(struct drm_i915_private *dev_priv, enum transcoder cpu_transcoder) > -{ > - if (cpu_transcoder == TRANSCODER_EDP) > - return HAS_TRANSCODER_EDP(dev_priv); > - else > - return INTEL_INFO(dev_priv)->pipe_mask & BIT(cpu_transcoder); > -} > - > static const struct intel_limit intel_limits_i8xx_dac = { > .dot = { .min = 25000, .max = 350000 }, > .vco = { .min = 908000, .max = 1512000 }, > @@ -18838,6 +18829,15 @@ void intel_modeset_driver_remove_noirq(struct drm_i915_private *i915) > > #if IS_ENABLED(CONFIG_DRM_I915_CAPTURE_ERROR) > > +static bool > +has_transcoder(struct drm_i915_private *dev_priv, enum transcoder cpu_transcoder) > +{ > + if (cpu_transcoder == TRANSCODER_EDP) > + return HAS_TRANSCODER_EDP(dev_priv); > + else > + return INTEL_INFO(dev_priv)->pipe_mask & BIT(cpu_transcoder); > +} > + > struct intel_display_error_state { > > u32 power_well_driver; -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx