[Intel-gfx] [PATCH] drm/i915/gt: Manage uncore->lock while waiting on MCR register

Matt Roper matthew.d.roper at intel.com
Thu Nov 24 00:08:27 UTC 2022


On Wed, Nov 23, 2022 at 02:46:18PM -0800, John Harrison wrote:
> On 11/17/2022 09:33, Matt Roper wrote:
> > ...
> > 
> > diff --git a/drivers/gpu/drm/i915/gt/intel_gt_mcr.c b/drivers/gpu/drm/i915/gt/intel_gt_mcr.c
> > index 830edffe88cc..d9a8ff9e5e57 100644
> > --- a/drivers/gpu/drm/i915/gt/intel_gt_mcr.c
> > +++ b/drivers/gpu/drm/i915/gt/intel_gt_mcr.c
> > @@ -730,17 +730,19 @@ void intel_gt_mcr_get_ss_steering(struct intel_gt *gt, unsigned int dss,
> >    *
> >    * Return: 0 if the register matches the desired condition, or -ETIMEDOUT.
> >    */
> > -int intel_gt_mcr_wait_for_reg_fw(struct intel_gt *gt,
> > -				 i915_mcr_reg_t reg,
> > -				 u32 mask,
> > -				 u32 value,
> > -				 unsigned int fast_timeout_us,
> > -				 unsigned int slow_timeout_ms)
> > +int intel_gt_mcr_wait_for_reg(struct intel_gt *gt,
> This change missed the comment above and so is causing errors from the
> documentation build:

Yeah, I already sent a fix for that here:

https://patchwork.freedesktop.org/patch/512602/?series=111220&rev=1


Matt

> 
> Error: make htmldocs had i915 warnings
> ./drivers/gpu/drm/i915/gt/intel_gt_mcr.c:739: warning: expecting prototype for intel_gt_mcr_wait_for_reg_fw(). Prototype was for intel_gt_mcr_wait_for_reg() instead
> ./drivers/gpu/drm/i915/gt/intel_gt_mcr.c:739: warning: expecting prototype for intel_gt_mcr_wait_for_reg_fw(). Prototype was for intel_gt_mcr_wait_for_reg() instead
> 
> John.
> 
> 

-- 
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation


More information about the dri-devel mailing list