From 7bc97ca7d5e0cee265014ce5fd682858c3b63629 Mon Sep 17 00:00:00 2001 From: Lauri Peltonen Date: Mon, 8 May 2017 22:39:44 +0300 Subject: gpu: nvgpu: Don't reject unusual ZBC colors For some use cases, we need to program two ZBC slots with the same DS color value but different FB color value. Remove the check that would reject such unorthodox ZBC entries. Bug 1847208 Change-Id: Ibed2c8195516832789470f7f1a8c865568694c28 Signed-off-by: Lauri Peltonen Reviewed-on: http://git-master/r/1477611 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/gr_gk20a.c') diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index bd5f44a4..e645a1a4 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c @@ -4073,15 +4073,10 @@ int gr_gk20a_add_zbc(struct gk20a *g, struct gr_gk20a *gr, if (c_tbl->ref_cnt && c_tbl->format == zbc_val->format && memcmp(c_tbl->color_ds, zbc_val->color_ds, - sizeof(zbc_val->color_ds)) == 0) { + sizeof(zbc_val->color_ds)) == 0 && + memcmp(c_tbl->color_l2, zbc_val->color_l2, + sizeof(zbc_val->color_l2)) == 0) { - if (memcmp(c_tbl->color_l2, zbc_val->color_l2, - sizeof(zbc_val->color_l2))) { - nvgpu_err(g, - "zbc l2 and ds color don't match with existing entries"); - ret = -EINVAL; - goto err_mutex; - } added = true; c_tbl->ref_cnt++; ret = 0; -- cgit v1.2.2