diff options
author | Dave Airlie <airlied@redhat.com> | 2018-12-13 10:16:09 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2018-12-13 10:16:25 +1000 |
commit | 29a1da27c4e41c2b4ad85f02bbf412926d4b38df (patch) | |
tree | b9091bb49c0735968217d23e50d0a43db69b9d18 /drivers/gpu/host1x/hw/hw_host1x06_uclass.h | |
parent | Merge branch 'drm-next-4.21' of git://people.freedesktop.org/~agd5f/linux into drm-next (diff) | |
parent | drm/tegra: sor: Reset the SOR if possible (diff) | |
download | linux-dev-29a1da27c4e41c2b4ad85f02bbf412926d4b38df.tar.xz linux-dev-29a1da27c4e41c2b4ad85f02bbf412926d4b38df.zip |
Merge tag 'drm/tegra/for-4.21-rc1' of git://anongit.freedesktop.org/tegra/linux into drm-next
drm/tegra: Changes for v4.21-rc1
These changes contain a couple of minor fixes for host1x and the Falcon
library in Tegra DRM. There are also a couple of missing pieces that
finally enable support for host1x, VIC and display on Tegra194. I've
also added a patch that enables audio over HDMI using the SOR which has
been tested, and works, on both Tegra186 and Tegra194.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thierry Reding <thierry.reding@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181207134712.32683-1-thierry.reding@gmail.com
Diffstat (limited to 'drivers/gpu/host1x/hw/hw_host1x06_uclass.h')
-rw-r--r-- | drivers/gpu/host1x/hw/hw_host1x06_uclass.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/host1x/hw/hw_host1x06_uclass.h b/drivers/gpu/host1x/hw/hw_host1x06_uclass.h index 4457486c72b0..e599e15bf999 100644 --- a/drivers/gpu/host1x/hw/hw_host1x06_uclass.h +++ b/drivers/gpu/host1x/hw/hw_host1x06_uclass.h @@ -59,7 +59,7 @@ static inline u32 host1x_uclass_incr_syncpt_r(void) host1x_uclass_incr_syncpt_r() static inline u32 host1x_uclass_incr_syncpt_cond_f(u32 v) { - return (v & 0xff) << 8; + return (v & 0xff) << 10; } #define HOST1X_UCLASS_INCR_SYNCPT_COND_F(v) \ host1x_uclass_incr_syncpt_cond_f(v) |