diff options
| author | Dave Airlie <airlied@redhat.com> | 2022-11-30 06:08:53 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2022-11-30 06:08:58 +0300 |
| commit | 02339a83dc828cf1b6dfcb42502f80f7c8d7e33f (patch) | |
| tree | c6226c233d97e6e996152474db8562460a2b0663 /include/linux | |
| parent | 795bd9bb21c694ebcee38e8026ebeac4a63929bf (diff) | |
| parent | 08fef75f5e17c80cdb9ab56d65685cb43c8e44d3 (diff) | |
| download | linux-02339a83dc828cf1b6dfcb42502f80f7c8d7e33f.tar.xz | |
Merge tag 'drm/tegra/for-6.2-rc1' of https://gitlab.freedesktop.org/drm/tegra into drm-next
drm/tegra: Changes for v6.2-rc1
This contains a bunch of cleanups across the board as well as support
for the NVDEC hardware found on the Tegra234 SoC.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thierry Reding <thierry.reding@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221125155219.3352952-1-thierry.reding@gmail.com
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/host1x.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/host1x.h b/include/linux/host1x.h index cb2100d9b0ff..dc55d9d3b94f 100644 --- a/include/linux/host1x.h +++ b/include/linux/host1x.h @@ -469,11 +469,13 @@ struct host1x_memory_context { #ifdef CONFIG_IOMMU_API struct host1x_memory_context *host1x_memory_context_alloc(struct host1x *host1x, + struct device *dev, struct pid *pid); void host1x_memory_context_get(struct host1x_memory_context *cd); void host1x_memory_context_put(struct host1x_memory_context *cd); #else static inline struct host1x_memory_context *host1x_memory_context_alloc(struct host1x *host1x, + struct device *dev, struct pid *pid) { return NULL; |