drm/i915/gt: Use the BIT when checking the flags, not the index
diff mbox series

Message ID 20200115122509.2673075-1-chris@chris-wilson.co.uk
State New
Headers show
Series
  • drm/i915/gt: Use the BIT when checking the flags, not the index
Related show

Commit Message

Chris Wilson Jan. 15, 2020, 12:25 p.m. UTC
In converting over to using set_bit()/test_bit(), when manually
inspecting the rq->flags, we need to use BIT().

Fixes: e1c31fb5dde3 ("drm/i915: Merge i915_request.flags with i915_request.fence.flags")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Matthew Auld <matthew.auld@intel.com>
---
 drivers/gpu/drm/i915/gt/intel_lrc.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Tvrtko Ursulin Jan. 15, 2020, 12:29 p.m. UTC | #1
On 15/01/2020 12:25, Chris Wilson wrote:
> In converting over to using set_bit()/test_bit(), when manually
> inspecting the rq->flags, we need to use BIT().
> 
> Fixes: e1c31fb5dde3 ("drm/i915: Merge i915_request.flags with i915_request.fence.flags")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> Cc: Matthew Auld <matthew.auld@intel.com>
> ---
>   drivers/gpu/drm/i915/gt/intel_lrc.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c
> index 9e430590fb3a..a8fe2f16c910 100644
> --- a/drivers/gpu/drm/i915/gt/intel_lrc.c
> +++ b/drivers/gpu/drm/i915/gt/intel_lrc.c
> @@ -1535,7 +1535,8 @@ static bool can_merge_rq(const struct i915_request *prev,
>   		return true;
>   
>   	if (unlikely((prev->fence.flags ^ next->fence.flags) &
> -		     (I915_FENCE_FLAG_NOPREEMPT | I915_FENCE_FLAG_SENTINEL)))
> +		     (BIT(I915_FENCE_FLAG_NOPREEMPT) |
> +		      BIT(I915_FENCE_FLAG_SENTINEL))))
>   		return false;
>   
>   	if (!can_merge_ctx(prev->context, next->context))
> 

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

Regards,

Tvrtko

Patch
diff mbox series

diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c
index 9e430590fb3a..a8fe2f16c910 100644
--- a/drivers/gpu/drm/i915/gt/intel_lrc.c
+++ b/drivers/gpu/drm/i915/gt/intel_lrc.c
@@ -1535,7 +1535,8 @@  static bool can_merge_rq(const struct i915_request *prev,
 		return true;
 
 	if (unlikely((prev->fence.flags ^ next->fence.flags) &
-		     (I915_FENCE_FLAG_NOPREEMPT | I915_FENCE_FLAG_SENTINEL)))
+		     (BIT(I915_FENCE_FLAG_NOPREEMPT) |
+		      BIT(I915_FENCE_FLAG_SENTINEL))))
 		return false;
 
 	if (!can_merge_ctx(prev->context, next->context))