Commit 3fe2c7d4 authored by Dmitry Osipenko's avatar Dmitry Osipenko Committed by Thierry Reding
Browse files

gpu: host1x: Fix MLOCK's debug info 



MLOCK's debug info, spewed on CDMA timeout, contains meaningless MLOCK
owner channel ID because HOST1X_SYNC_MLOCK_OWNER_CHID_F() returns shifted
value, while unshifted should be used. Fix it by changing '_F' to '_V'.

Signed-off-by: default avatarDmitry Osipenko <digetx@gmail.com>
Reviewed-By: default avatarTerje Bergstrom <tbergstrom@nvidia.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 6ff33f39

drivers/gpu/host1x/hw/debug_hw.c

+1 −1
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ static void host1x_debug_show_mlocks(struct host1x *host, struct output *o) 
			host1x_sync_readl(host, HOST1X_SYNC_MLOCK_OWNER(i));

		if (HOST1X_SYNC_MLOCK_OWNER_CH_OWNS_V(owner))

			host1x_debug_output(o, "%d: locked by channel %d\n",

				i, HOST1X_SYNC_MLOCK_OWNER_CHID_F(owner));

				i, HOST1X_SYNC_MLOCK_OWNER_CHID_V(owner));

		else if (HOST1X_SYNC_MLOCK_OWNER_CPU_OWNS_V(owner))

			host1x_debug_output(o, "%d: locked by cpu\n", i);

		else

drivers/gpu/host1x/hw/hw_host1x01_sync.h

+4 −4
Original line number Diff line number Diff line
@@ -131,12 +131,12 @@ static inline u32 host1x_sync_mlock_owner_r(unsigned int id) 
}

#define HOST1X_SYNC_MLOCK_OWNER(id) \

	host1x_sync_mlock_owner_r(id)

static inline u32 host1x_sync_mlock_owner_chid_f(u32 v)

static inline u32 host1x_sync_mlock_owner_chid_v(u32 v)

{

	return (v & 0xf) << 8;

	return (v >> 8) & 0xf;

}

#define HOST1X_SYNC_MLOCK_OWNER_CHID_F(v) \

	host1x_sync_mlock_owner_chid_f(v)

#define HOST1X_SYNC_MLOCK_OWNER_CHID_V(v) \

	host1x_sync_mlock_owner_chid_v(v)

static inline u32 host1x_sync_mlock_owner_cpu_owns_v(u32 r)

{

	return (r >> 1) & 0x1;

drivers/gpu/host1x/hw/hw_host1x02_sync.h

+4 −4
Original line number Diff line number Diff line
@@ -131,12 +131,12 @@ static inline u32 host1x_sync_mlock_owner_r(unsigned int id) 
}

#define HOST1X_SYNC_MLOCK_OWNER(id) \

	host1x_sync_mlock_owner_r(id)

static inline u32 host1x_sync_mlock_owner_chid_f(u32 v)

static inline u32 host1x_sync_mlock_owner_chid_v(u32 v)

{

	return (v & 0xf) << 8;

	return (v >> 8) & 0xf;

}

#define HOST1X_SYNC_MLOCK_OWNER_CHID_F(v) \

	host1x_sync_mlock_owner_chid_f(v)

#define HOST1X_SYNC_MLOCK_OWNER_CHID_V(v) \

	host1x_sync_mlock_owner_chid_v(v)

static inline u32 host1x_sync_mlock_owner_cpu_owns_v(u32 r)

{

	return (r >> 1) & 0x1;

drivers/gpu/host1x/hw/hw_host1x04_sync.h

+4 −4
Original line number Diff line number Diff line
@@ -131,12 +131,12 @@ static inline u32 host1x_sync_mlock_owner_r(unsigned int id) 
}

#define HOST1X_SYNC_MLOCK_OWNER(id) \

	host1x_sync_mlock_owner_r(id)

static inline u32 host1x_sync_mlock_owner_chid_f(u32 v)

static inline u32 host1x_sync_mlock_owner_chid_v(u32 v)

{

	return (v & 0xf) << 8;

	return (v >> 8) & 0xf;

}

#define HOST1X_SYNC_MLOCK_OWNER_CHID_F(v) \

	host1x_sync_mlock_owner_chid_f(v)

#define HOST1X_SYNC_MLOCK_OWNER_CHID_V(v) \

	host1x_sync_mlock_owner_chid_v(v)

static inline u32 host1x_sync_mlock_owner_cpu_owns_v(u32 r)

{

	return (r >> 1) & 0x1;

CRA Git | Maintained and supported by SUSTech CRA and CCSE