summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2018-11-19 11:31:30 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-12-13 08:51:58 +0100
commit5f7d707b15885cb039477d91867e653b243f7c2f (patch)
treebd37b4893b3229c02820498de1e29e6e6e4f1156 /drivers/gpu
parent0dcdd33f8e13380b11965491bdefc29eca3f69ec (diff)
downloadlinux-stable-5f7d707b15885cb039477d91867e653b243f7c2f.tar.gz
linux-stable-5f7d707b15885cb039477d91867e653b243f7c2f.tar.bz2
linux-stable-5f7d707b15885cb039477d91867e653b243f7c2f.zip
gpu: host1x: Fix syncpoint ID field size on Tegra186
[ Upstream commit 2fc777ba8422e4a38cae61537ad6a26435a86fb8 ] The number of syncpoints on Tegra186 is 576 and therefore no longer fits into 8 bits. Increase the size of the syncpoint ID field to 10 in order to accomodate all syncpoints. Reviewed-by: Mikko Perttunen <mperttunen@nvidia.com> Signed-off-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/host1x/hw/hw_host1x06_uclass.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/host1x/hw/hw_host1x06_uclass.h b/drivers/gpu/host1x/hw/hw_host1x06_uclass.h
index 4457486c72b0..e599e15bf999 100644
--- a/drivers/gpu/host1x/hw/hw_host1x06_uclass.h
+++ b/drivers/gpu/host1x/hw/hw_host1x06_uclass.h
@@ -59,7 +59,7 @@ static inline u32 host1x_uclass_incr_syncpt_r(void)
host1x_uclass_incr_syncpt_r()
static inline u32 host1x_uclass_incr_syncpt_cond_f(u32 v)
{
- return (v & 0xff) << 8;
+ return (v & 0xff) << 10;
}
#define HOST1X_UCLASS_INCR_SYNCPT_COND_F(v) \
host1x_uclass_incr_syncpt_cond_f(v)