[Intel-gfx] [PATCH] drm/i915: Adding missing '; ' to ENGINE_INSTANCES

[Tvrtko Ursulin]

On 26/03/2019 18:00, Chris Wilson wrote:
> Tvrtko spotted that I left off the trailing ';'. It went unnoticed by CI
> because despite adding the macro, we didn't add a user, so include one as
> well (a simple debug print).
> 
> Reported-by:  Tvrtko Ursulin <tvrtko.ursulin at intel.com>
> Fixes: 97ee6e925552 ("drm/i915: stop storing the media fuse")
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
> ---
>   drivers/gpu/drm/i915/i915_drv.h          | 2 +-
>   drivers/gpu/drm/i915/intel_device_info.c | 8 ++++++--
>   2 files changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 380198628d83..f73e78cf2f11 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -2458,7 +2458,7 @@ static inline unsigned int i915_sg_segment_size(void)
>   	unsigned int first__ = (first);					\
>   	unsigned int count__ = (count);					\
>   	(INTEL_INFO(dev_priv)->engine_mask &				\
> -	 GENMASK(first__ + count__ - 1, first__)) >> first__		\
> +	 GENMASK(first__ + count__ - 1, first__)) >> first__;		\
>   })
>   #define VDBOX_MASK(dev_priv) \
>   	ENGINE_INSTANCES_MASK(dev_priv, VCS0, I915_MAX_VCS)
> diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
> index 5776a0def7ac..bd226b9b7f8f 100644
> --- a/drivers/gpu/drm/i915/intel_device_info.c
> +++ b/drivers/gpu/drm/i915/intel_device_info.c
> @@ -890,7 +890,6 @@ void intel_device_info_init_mmio(struct drm_i915_private *dev_priv)
>   	vebox_mask = (media_fuse & GEN11_GT_VEBOX_DISABLE_MASK) >>
>   		      GEN11_GT_VEBOX_DISABLE_SHIFT;
>   
> -	DRM_DEBUG_DRIVER("vdbox enable: %04x\n", vdbox_mask);
>   	for (i = 0; i < I915_MAX_VCS; i++) {
>   		if (!HAS_ENGINE(dev_priv, _VCS(i)))
>   			continue;
> @@ -908,8 +907,10 @@ void intel_device_info_init_mmio(struct drm_i915_private *dev_priv)
>   		if (logical_vdbox++ % 2 == 0)
>   			RUNTIME_INFO(dev_priv)->vdbox_sfc_access |= BIT(i);
>   	}
> +	DRM_DEBUG_DRIVER("vdbox enable: %04x, instances: %04lx\n",
> +			vdbox_mask, VDBOX_MASK(dev_priv));
> +	GEM_BUG_ON(vdbox_mask != VDBOX_MASK(dev_priv));
>   
> -	DRM_DEBUG_DRIVER("vebox enable: %04x\n", vebox_mask);
>   	for (i = 0; i < I915_MAX_VECS; i++) {
>   		if (!HAS_ENGINE(dev_priv, _VECS(i)))
>   			continue;
> @@ -919,4 +920,7 @@ void intel_device_info_init_mmio(struct drm_i915_private *dev_priv)
>   			DRM_DEBUG_DRIVER("vecs%u fused off\n", i);
>   		}
>   	}
> +	DRM_DEBUG_DRIVER("vebox enable: %04x, instances: %04lx\n",
> +			vebox_mask, VEBOX_MASK(dev_priv));
> +	GEM_BUG_ON(vebox_mask != VEBOX_MASK(dev_priv));
>   }
> 

Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>

Regards,

Tvrtko