* [patch] drm/i915/mocs: || vs | typo in get_mocs_settings()
@ 2016-06-13 6:54 Dan Carpenter
2016-06-13 10:40 ` Mika Kuoppala
2016-06-13 14:40 ` Mika Kuoppala
0 siblings, 2 replies; 3+ messages in thread
From: Dan Carpenter @ 2016-06-13 6:54 UTC (permalink / raw)
To: Daniel Vetter, Mika Kuoppala
Cc: David Airlie, intel-gfx, kernel-janitors, dri-devel
It seems pretty clear that bitwise OR was intended here and not logical
OR.
Fixes: 6fc29133eafb ('drm/i915/gen9: Add WaDisableSkipCaching')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/gpu/drm/i915/intel_mocs.c b/drivers/gpu/drm/i915/intel_mocs.c
index 8f96c40..3c1482b 100644
--- a/drivers/gpu/drm/i915/intel_mocs.c
+++ b/drivers/gpu/drm/i915/intel_mocs.c
@@ -162,7 +162,7 @@ static bool get_mocs_settings(struct drm_i915_private *dev_priv,
for (i = 0; i < table->size; i++)
if (WARN_ON(table->table[i].l3cc_value &
- (L3_ESC(1) || L3_SCC(0x7))))
+ (L3_ESC(1) | L3_SCC(0x7))))
return false;
}
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [patch] drm/i915/mocs: || vs | typo in get_mocs_settings()
2016-06-13 6:54 [patch] drm/i915/mocs: || vs | typo in get_mocs_settings() Dan Carpenter
@ 2016-06-13 10:40 ` Mika Kuoppala
2016-06-13 14:40 ` Mika Kuoppala
1 sibling, 0 replies; 3+ messages in thread
From: Mika Kuoppala @ 2016-06-13 10:40 UTC (permalink / raw)
To: Dan Carpenter, Daniel Vetter
Cc: David Airlie, intel-gfx, kernel-janitors, dri-devel
Dan Carpenter <dan.carpenter@oracle.com> writes:
> It seems pretty clear that bitwise OR was intended here and not logical
> OR.
>
> Fixes: 6fc29133eafb ('drm/i915/gen9: Add WaDisableSkipCaching')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
>
> diff --git a/drivers/gpu/drm/i915/intel_mocs.c b/drivers/gpu/drm/i915/intel_mocs.c
> index 8f96c40..3c1482b 100644
> --- a/drivers/gpu/drm/i915/intel_mocs.c
> +++ b/drivers/gpu/drm/i915/intel_mocs.c
> @@ -162,7 +162,7 @@ static bool get_mocs_settings(struct drm_i915_private *dev_priv,
>
> for (i = 0; i < table->size; i++)
> if (WARN_ON(table->table[i].l3cc_value &
> - (L3_ESC(1) || L3_SCC(0x7))))
> + (L3_ESC(1) | L3_SCC(0x7))))
> return false;
> }
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [patch] drm/i915/mocs: || vs | typo in get_mocs_settings()
2016-06-13 6:54 [patch] drm/i915/mocs: || vs | typo in get_mocs_settings() Dan Carpenter
2016-06-13 10:40 ` Mika Kuoppala
@ 2016-06-13 14:40 ` Mika Kuoppala
1 sibling, 0 replies; 3+ messages in thread
From: Mika Kuoppala @ 2016-06-13 14:40 UTC (permalink / raw)
To: Dan Carpenter, Daniel Vetter
Cc: Jani Nikula, David Airlie, intel-gfx, dri-devel, kernel-janitors
Dan Carpenter <dan.carpenter@oracle.com> writes:
> It seems pretty clear that bitwise OR was intended here and not logical
> OR.
>
> Fixes: 6fc29133eafb ('drm/i915/gen9: Add WaDisableSkipCaching')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Pushed to drm-intel-next-queued. Thanks for patch.
-Mika
>
> diff --git a/drivers/gpu/drm/i915/intel_mocs.c b/drivers/gpu/drm/i915/intel_mocs.c
> index 8f96c40..3c1482b 100644
> --- a/drivers/gpu/drm/i915/intel_mocs.c
> +++ b/drivers/gpu/drm/i915/intel_mocs.c
> @@ -162,7 +162,7 @@ static bool get_mocs_settings(struct drm_i915_private *dev_priv,
>
> for (i = 0; i < table->size; i++)
> if (WARN_ON(table->table[i].l3cc_value &
> - (L3_ESC(1) || L3_SCC(0x7))))
> + (L3_ESC(1) | L3_SCC(0x7))))
> return false;
> }
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-06-13 14:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-13 6:54 [patch] drm/i915/mocs: || vs | typo in get_mocs_settings() Dan Carpenter
2016-06-13 10:40 ` Mika Kuoppala
2016-06-13 14:40 ` Mika Kuoppala
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox