summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_mocs.c
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2016-06-13 09:54:22 +0300
committerMika Kuoppala <mika.kuoppala@intel.com>2016-06-13 17:38:01 +0300
commit030daa0f5dbc713a87eb99c22c242857be307b15 (patch)
tree7362c59c0479bc0d34c17e733dfe8d45402c844e /drivers/gpu/drm/i915/intel_mocs.c
parent2ce0004cd019f8c3da5d7657794c261ebdd730c0 (diff)
downloadop-kernel-dev-030daa0f5dbc713a87eb99c22c242857be307b15.zip
op-kernel-dev-030daa0f5dbc713a87eb99c22c242857be307b15.tar.gz
drm/i915/mocs: || vs | typo in get_mocs_settings()
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>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_mocs.c')
-rw-r--r--drivers/gpu/drm/i915/intel_mocs.c2
1 files changed, 1 insertions, 1 deletions
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;
}
OpenPOWER on IntegriCloud