diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-02-11 13:32:38 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-02-11 13:32:49 +1000 |
| commit | 38f070eb125a9253ec1acd641e7159555f57132a (patch) | |
| tree | a5e146cc0f8dbf5486ef8ae14a77e50164ee1ac0 /drivers/gpu/host1x/hw/host1x06_hardware.h | |
| parent | 0ad7fb7c7b973ca4cea341282a60d056393d8034 (diff) | |
| parent | 79930bafe2802c3a67a70ad4904032d9154bf3fa (diff) | |
Merge tag 'drm/tegra/for-5.1-rc1' of git://anongit.freedesktop.org/tegra/linux into drm-next
drm/tegra: Changes for v5.1-rc1
This set of changes starts of with some refactoring of the CEC support
to make it reusable on Tegra210 and later. Following are a couple of
fixes for HDMI audio support (via HDA).
The bulk here is a set of preparatory patches working towards enabling
Tegra186 support for host1x and VIC. Additional patches will be needed
to fully enable this, but they're not quite ready yet.
To round things off, this also adds support for configuring the SOR
crossbar using device tree, and fixes a couple of job-related issues in
the host1x code.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thierry Reding <thierry.reding@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190208144721.25830-1-thierry.reding@gmail.com
Diffstat (limited to 'drivers/gpu/host1x/hw/host1x06_hardware.h')
| -rw-r--r-- | drivers/gpu/host1x/hw/host1x06_hardware.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/host1x/hw/host1x06_hardware.h b/drivers/gpu/host1x/hw/host1x06_hardware.h index 3039c92ea605..dd37b10c8d04 100644 --- a/drivers/gpu/host1x/hw/host1x06_hardware.h +++ b/drivers/gpu/host1x/hw/host1x06_hardware.h @@ -22,6 +22,7 @@ #include <linux/types.h> #include <linux/bitops.h> +#include "hw_host1x06_channel.h" #include "hw_host1x06_uclass.h" #include "hw_host1x06_vm.h" #include "hw_host1x06_hypervisor.h" @@ -137,6 +138,11 @@ static inline u32 host1x_opcode_gather_incr(unsigned offset, unsigned count) return (6 << 28) | (offset << 16) | BIT(15) | BIT(14) | count; } +static inline u32 host1x_opcode_gather_wide(unsigned count) +{ + return (12 << 28) | count; +} + #define HOST1X_OPCODE_NOP host1x_opcode_nonincr(0, 0) #endif |