Commit 79aad29c authored by Mikko Perttunen's avatar Mikko Perttunen Committed by Thierry Reding
Browse files

gpu: host1x: Fix mask for syncpoint increment register 



On Tegra186+, the syncpoint ID has 10 bits of space. To allow
using more than 256 syncpoints, fix the mask.

Fixes: 9abdd497 ("gpu: host1x: Tegra234 device data and headers")
Signed-off-by: default avatarMikko Perttunen <mperttunen@nvidia.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 3d905751

drivers/gpu/host1x/hw/hw_host1x06_uclass.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -53,7 +53,7 @@ static inline u32 host1x_uclass_incr_syncpt_cond_f(u32 v) 
	host1x_uclass_incr_syncpt_cond_f(v)

	host1x_uclass_incr_syncpt_cond_f(v)

static inline u32 host1x_uclass_incr_syncpt_indx_f(u32 v)

static inline u32 host1x_uclass_incr_syncpt_indx_f(u32 v)

{

{

	return (v & 0xff) << 0;

	return (v & 0x3ff) << 0;

}

}

#define HOST1X_UCLASS_INCR_SYNCPT_INDX_F(v) \

#define HOST1X_UCLASS_INCR_SYNCPT_INDX_F(v) \

	host1x_uclass_incr_syncpt_indx_f(v)

	host1x_uclass_incr_syncpt_indx_f(v)

drivers/gpu/host1x/hw/hw_host1x07_uclass.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -53,7 +53,7 @@ static inline u32 host1x_uclass_incr_syncpt_cond_f(u32 v) 
	host1x_uclass_incr_syncpt_cond_f(v)

	host1x_uclass_incr_syncpt_cond_f(v)

static inline u32 host1x_uclass_incr_syncpt_indx_f(u32 v)

static inline u32 host1x_uclass_incr_syncpt_indx_f(u32 v)

{

{

	return (v & 0xff) << 0;

	return (v & 0x3ff) << 0;

}

}

#define HOST1X_UCLASS_INCR_SYNCPT_INDX_F(v) \

#define HOST1X_UCLASS_INCR_SYNCPT_INDX_F(v) \

	host1x_uclass_incr_syncpt_indx_f(v)

	host1x_uclass_incr_syncpt_indx_f(v)

drivers/gpu/host1x/hw/hw_host1x08_uclass.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -53,7 +53,7 @@ static inline u32 host1x_uclass_incr_syncpt_cond_f(u32 v) 
	host1x_uclass_incr_syncpt_cond_f(v)

	host1x_uclass_incr_syncpt_cond_f(v)

static inline u32 host1x_uclass_incr_syncpt_indx_f(u32 v)

static inline u32 host1x_uclass_incr_syncpt_indx_f(u32 v)

{

{

	return (v & 0xff) << 0;

	return (v & 0x3ff) << 0;

}

}

#define HOST1X_UCLASS_INCR_SYNCPT_INDX_F(v) \

#define HOST1X_UCLASS_INCR_SYNCPT_INDX_F(v) \

	host1x_uclass_incr_syncpt_indx_f(v)

	host1x_uclass_incr_syncpt_indx_f(v)