gpu: host1x: Fix syncpoint ID field size on Tegra186
authorThierry Reding <treding@nvidia.com>
Mon, 19 Nov 2018 10:31:30 +0000 (11:31 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 13 Dec 2019 07:51:58 +0000 (08:51 +0100)
[ 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>
drivers/gpu/host1x/hw/hw_host1x06_uclass.h

index 4457486..e599e15 100644 (file)
@@ -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)