aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Osipenko <digetx@gmail.com>2015-06-28 15:27:02 -0400
committerThierry Reding <treding@nvidia.com>2015-10-02 08:40:12 -0400
commit3fe2c7d4c85b4557c9772ff16f31ddc18cfd2521 (patch)
treea440230ae2d5156f2e157f6e4549256878da0752
parent6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f (diff)
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: Dmitry Osipenko <digetx@gmail.com> Reviewed-By: Terje Bergstrom <tbergstrom@nvidia.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
-rw-r--r--drivers/gpu/host1x/hw/debug_hw.c2
-rw-r--r--drivers/gpu/host1x/hw/hw_host1x01_sync.h8
-rw-r--r--drivers/gpu/host1x/hw/hw_host1x02_sync.h8
-rw-r--r--drivers/gpu/host1x/hw/hw_host1x04_sync.h8
4 files changed, 13 insertions, 13 deletions
diff --git a/drivers/gpu/host1x/hw/debug_hw.c b/drivers/gpu/host1x/hw/debug_hw.c
index 791de9351eeb..cc3f1825c735 100644
--- a/drivers/gpu/host1x/hw/debug_hw.c
+++ b/drivers/gpu/host1x/hw/debug_hw.c
@@ -298,7 +298,7 @@ static void host1x_debug_show_mlocks(struct host1x *host, struct output *o)
298 host1x_sync_readl(host, HOST1X_SYNC_MLOCK_OWNER(i)); 298 host1x_sync_readl(host, HOST1X_SYNC_MLOCK_OWNER(i));
299 if (HOST1X_SYNC_MLOCK_OWNER_CH_OWNS_V(owner)) 299 if (HOST1X_SYNC_MLOCK_OWNER_CH_OWNS_V(owner))
300 host1x_debug_output(o, "%d: locked by channel %d\n", 300 host1x_debug_output(o, "%d: locked by channel %d\n",
301 i, HOST1X_SYNC_MLOCK_OWNER_CHID_F(owner)); 301 i, HOST1X_SYNC_MLOCK_OWNER_CHID_V(owner));
302 else if (HOST1X_SYNC_MLOCK_OWNER_CPU_OWNS_V(owner)) 302 else if (HOST1X_SYNC_MLOCK_OWNER_CPU_OWNS_V(owner))
303 host1x_debug_output(o, "%d: locked by cpu\n", i); 303 host1x_debug_output(o, "%d: locked by cpu\n", i);
304 else 304 else
diff --git a/drivers/gpu/host1x/hw/hw_host1x01_sync.h b/drivers/gpu/host1x/hw/hw_host1x01_sync.h
index ac704e579977..31238c285d46 100644
--- a/drivers/gpu/host1x/hw/hw_host1x01_sync.h
+++ b/drivers/gpu/host1x/hw/hw_host1x01_sync.h
@@ -131,12 +131,12 @@ static inline u32 host1x_sync_mlock_owner_r(unsigned int id)
131} 131}
132#define HOST1X_SYNC_MLOCK_OWNER(id) \ 132#define HOST1X_SYNC_MLOCK_OWNER(id) \
133 host1x_sync_mlock_owner_r(id) 133 host1x_sync_mlock_owner_r(id)
134static inline u32 host1x_sync_mlock_owner_chid_f(u32 v) 134static inline u32 host1x_sync_mlock_owner_chid_v(u32 v)
135{ 135{
136 return (v & 0xf) << 8; 136 return (v >> 8) & 0xf;
137} 137}
138#define HOST1X_SYNC_MLOCK_OWNER_CHID_F(v) \ 138#define HOST1X_SYNC_MLOCK_OWNER_CHID_V(v) \
139 host1x_sync_mlock_owner_chid_f(v) 139 host1x_sync_mlock_owner_chid_v(v)
140static inline u32 host1x_sync_mlock_owner_cpu_owns_v(u32 r) 140static inline u32 host1x_sync_mlock_owner_cpu_owns_v(u32 r)
141{ 141{
142 return (r >> 1) & 0x1; 142 return (r >> 1) & 0x1;
diff --git a/drivers/gpu/host1x/hw/hw_host1x02_sync.h b/drivers/gpu/host1x/hw/hw_host1x02_sync.h
index 4495401525e8..540c7b65995f 100644
--- a/drivers/gpu/host1x/hw/hw_host1x02_sync.h
+++ b/drivers/gpu/host1x/hw/hw_host1x02_sync.h
@@ -131,12 +131,12 @@ static inline u32 host1x_sync_mlock_owner_r(unsigned int id)
131} 131}
132#define HOST1X_SYNC_MLOCK_OWNER(id) \ 132#define HOST1X_SYNC_MLOCK_OWNER(id) \
133 host1x_sync_mlock_owner_r(id) 133 host1x_sync_mlock_owner_r(id)
134static inline u32 host1x_sync_mlock_owner_chid_f(u32 v) 134static inline u32 host1x_sync_mlock_owner_chid_v(u32 v)
135{ 135{
136 return (v & 0xf) << 8; 136 return (v >> 8) & 0xf;
137} 137}
138#define HOST1X_SYNC_MLOCK_OWNER_CHID_F(v) \ 138#define HOST1X_SYNC_MLOCK_OWNER_CHID_V(v) \
139 host1x_sync_mlock_owner_chid_f(v) 139 host1x_sync_mlock_owner_chid_v(v)
140static inline u32 host1x_sync_mlock_owner_cpu_owns_v(u32 r) 140static inline u32 host1x_sync_mlock_owner_cpu_owns_v(u32 r)
141{ 141{
142 return (r >> 1) & 0x1; 142 return (r >> 1) & 0x1;
diff --git a/drivers/gpu/host1x/hw/hw_host1x04_sync.h b/drivers/gpu/host1x/hw/hw_host1x04_sync.h
index ef2275b5407a..3d6c8ec65934 100644
--- a/drivers/gpu/host1x/hw/hw_host1x04_sync.h
+++ b/drivers/gpu/host1x/hw/hw_host1x04_sync.h
@@ -131,12 +131,12 @@ static inline u32 host1x_sync_mlock_owner_r(unsigned int id)
131} 131}
132#define HOST1X_SYNC_MLOCK_OWNER(id) \ 132#define HOST1X_SYNC_MLOCK_OWNER(id) \
133 host1x_sync_mlock_owner_r(id) 133 host1x_sync_mlock_owner_r(id)
134static inline u32 host1x_sync_mlock_owner_chid_f(u32 v) 134static inline u32 host1x_sync_mlock_owner_chid_v(u32 v)
135{ 135{
136 return (v & 0xf) << 8; 136 return (v >> 8) & 0xf;
137} 137}
138#define HOST1X_SYNC_MLOCK_OWNER_CHID_F(v) \ 138#define HOST1X_SYNC_MLOCK_OWNER_CHID_V(v) \
139 host1x_sync_mlock_owner_chid_f(v) 139 host1x_sync_mlock_owner_chid_v(v)
140static inline u32 host1x_sync_mlock_owner_cpu_owns_v(u32 r) 140static inline u32 host1x_sync_mlock_owner_cpu_owns_v(u32 r)
141{ 141{
142 return (r >> 1) & 0x1; 142 return (r >> 1) & 0x1;