mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 02:30:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

gpu: host1x: Fix MLOCK's debug info

Browse source 
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: Dmitry Osipenko <digetx@gmail.com>
Reviewed-By: Terje Bergstrom <tbergstrom@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
This commit is contained in:
Dmitry Osipenko 2015-06-28 22:27:02 +03:00 committed by Thierry Reding
parent 6ff33f3902
commit 3fe2c7d4c8
4 changed files with 13 additions and 13 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/gpu/host1x/hw/debug_hw.c
View file

@ -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)); host1x_sync_readl(host, HOST1X_SYNC_MLOCK_OWNER(i));
if (HOST1X_SYNC_MLOCK_OWNER_CH_OWNS_V(owner)) if (HOST1X_SYNC_MLOCK_OWNER_CH_OWNS_V(owner))
host1x_debug_output(o, "%d: locked by channel %d\n", 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)) else if (HOST1X_SYNC_MLOCK_OWNER_CPU_OWNS_V(owner))
host1x_debug_output(o, "%d: locked by cpu\n", i); host1x_debug_output(o, "%d: locked by cpu\n", i);
else else

8
drivers/gpu/host1x/hw/hw_host1x01_sync.h
View file

@ -131,12 +131,12 @@ static inline u32 host1x_sync_mlock_owner_r(unsigned int id)
} }
#define HOST1X_SYNC_MLOCK_OWNER(id) \ #define HOST1X_SYNC_MLOCK_OWNER(id) \
host1x_sync_mlock_owner_r(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) \ #define HOST1X_SYNC_MLOCK_OWNER_CHID_V(v) \
host1x_sync_mlock_owner_chid_f(v) host1x_sync_mlock_owner_chid_v(v)
static inline u32 host1x_sync_mlock_owner_cpu_owns_v(u32 r) static inline u32 host1x_sync_mlock_owner_cpu_owns_v(u32 r)
{ {
return (r >> 1) & 0x1; return (r >> 1) & 0x1;

8
drivers/gpu/host1x/hw/hw_host1x02_sync.h
View file

@ -131,12 +131,12 @@ static inline u32 host1x_sync_mlock_owner_r(unsigned int id)
} }
#define HOST1X_SYNC_MLOCK_OWNER(id) \ #define HOST1X_SYNC_MLOCK_OWNER(id) \
host1x_sync_mlock_owner_r(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) \ #define HOST1X_SYNC_MLOCK_OWNER_CHID_V(v) \
host1x_sync_mlock_owner_chid_f(v) host1x_sync_mlock_owner_chid_v(v)
static inline u32 host1x_sync_mlock_owner_cpu_owns_v(u32 r) static inline u32 host1x_sync_mlock_owner_cpu_owns_v(u32 r)
{ {
return (r >> 1) & 0x1; return (r >> 1) & 0x1;

8
drivers/gpu/host1x/hw/hw_host1x04_sync.h
View file

@ -131,12 +131,12 @@ static inline u32 host1x_sync_mlock_owner_r(unsigned int id)
} }
#define HOST1X_SYNC_MLOCK_OWNER(id) \ #define HOST1X_SYNC_MLOCK_OWNER(id) \
host1x_sync_mlock_owner_r(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) \ #define HOST1X_SYNC_MLOCK_OWNER_CHID_V(v) \
host1x_sync_mlock_owner_chid_f(v) host1x_sync_mlock_owner_chid_v(v)
static inline u32 host1x_sync_mlock_owner_cpu_owns_v(u32 r) static inline u32 host1x_sync_mlock_owner_cpu_owns_v(u32 r)
{ {
return (r >> 1) & 0x1; return (r >> 1) & 0x1;