diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-04-11 19:17:31 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-04-11 19:17:36 +1000 |
| commit | 7a74198f587b3cfd5c4c5fe3cb8b46188c9ae02d (patch) | |
| tree | c367e7e2cd5d9774edaed94f872c677fcc269a70 | |
| parent | 9b39b013037fbfa8d4b999345d9e904d8a336fc2 (diff) | |
| parent | e154592a1d25fa1f50ac1bd8d132d0e1103442ba (diff) | |
| download | fscrypt-7a74198f587b3cfd5c4c5fe3cb8b46188c9ae02d.tar.gz | |
Merge tag 'drm/tegra/for-5.1-rc5' of git://anongit.freedesktop.org/tegra/linux into drm-fixes
drm/tegra: Fixes for v5.1-rc5
A single, one-line fix for a build error introduced in v5.1-rc1.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thierry Reding <thierry.reding@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190411084106.7552-1-thierry.reding@gmail.com
| -rw-r--r-- | drivers/gpu/host1x/hw/channel_hw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/host1x/hw/channel_hw.c b/drivers/gpu/host1x/hw/channel_hw.c index 27101c04a8272..4030d64916f00 100644 --- a/drivers/gpu/host1x/hw/channel_hw.c +++ b/drivers/gpu/host1x/hw/channel_hw.c @@ -114,7 +114,7 @@ static inline void synchronize_syncpt_base(struct host1x_job *job) static void host1x_channel_set_streamid(struct host1x_channel *channel) { -#if HOST1X_HW >= 6 +#if IS_ENABLED(CONFIG_IOMMU_API) && HOST1X_HW >= 6 struct iommu_fwspec *spec = dev_iommu_fwspec_get(channel->dev->parent); u32 sid = spec ? spec->ids[0] & 0xffff : 0x7f; |