From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
To: Chris Wilson <chris@chris-wilson.co.uk>, intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: Adding missing '; ' to ENGINE_INSTANCES
Date: Tue, 26 Mar 2019 18:16:33 +0000 [thread overview]
Message-ID: <e3509058-10b3-124b-9314-5b709ba5233d@linux.intel.com> (raw)
In-Reply-To: <20190326180007.11722-1-chris@chris-wilson.co.uk>
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@intel.com>
> Fixes: 97ee6e925552 ("drm/i915: stop storing the media fuse")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@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@intel.com>
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2019-03-26 18:16 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-26 18:00 [PATCH] drm/i915: Adding missing '; ' to ENGINE_INSTANCES Chris Wilson
2019-03-26 18:16 ` Tvrtko Ursulin [this message]
2019-03-26 20:48 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2019-03-26 21:08 ` ✓ Fi.CI.BAT: success " Patchwork
2019-03-27 8:22 ` ✓ Fi.CI.IGT: " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e3509058-10b3-124b-9314-5b709ba5233d@linux.intel.com \
--to=tvrtko.ursulin@linux.intel.com \
--cc=chris@chris-wilson.co.uk \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox