diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-11-05 01:07:03 (GMT) |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-11-05 01:07:03 (GMT) |
| commit | 596a1d32bb42795cafbed66945645a74f0a3cc5b (patch) | |
| tree | abeb18475d003082882d84f26206d67278dc2b81 /drivers/gpu/host1x/hw/hw_host1x01_sync.h | |
| parent | cb0fb271213e8a06ca8815a459dfaddd5bb47b4b (diff) | |
| parent | 2bcdcbfae2895764372ef973a969f395a548f1ea (diff) | |
| download | linux-596a1d32bb42795cafbed66945645a74f0a3cc5b.tar.xz | |
Merge tag 'drm/tegra/for-4.4-rc1' of git://anongit.freedesktop.org/tegra/linux into drm-next
drm/tegra: Changes for v4.4-rc1
Just a couple of minor fixes and cleanups for this cycle.
* tag 'drm/tegra/for-4.4-rc1' of git://anongit.freedesktop.org/tegra/linux:
drm/tegra: dc: Request/free syncpoint at init/exit
drm/tegra: fb: Remove gratuituous blank line
gpu: host1x: Fix MLOCK's debug info
Diffstat (limited to 'drivers/gpu/host1x/hw/hw_host1x01_sync.h')
| -rw-r--r-- | drivers/gpu/host1x/hw/hw_host1x01_sync.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/host1x/hw/hw_host1x01_sync.h b/drivers/gpu/host1x/hw/hw_host1x01_sync.h index ac704e5..31238c2 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) } #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; |