diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-02-10 16:27:24 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-02-10 16:27:24 +0100 |
| commit | 51a831a7725b1273381cb4a9f3f0d619276e3521 (patch) | |
| tree | 9ba8c84b99e828b8e40e08df22c23712bb13f8c0 /drivers/gpu/drm/etnaviv/etnaviv_iommu.c | |
| parent | 4f4631af8faf791a60264cf028a16d61804414c8 (diff) | |
| parent | 13f62f54d174d3417c3caaafedf5e22a0a03e442 (diff) | |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
Chris Wilson needs the new drm_driver->release callback to make sure
the shiny new dma-buf testcases don't oops the driver on unload.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/gpu/drm/etnaviv/etnaviv_iommu.c')
| -rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_iommu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_iommu.c b/drivers/gpu/drm/etnaviv/etnaviv_iommu.c index 81f1583a7946..7a7c97f599d7 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_iommu.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_iommu.c @@ -184,7 +184,7 @@ static void etnaviv_iommuv1_dump(struct iommu_domain *domain, void *buf) memcpy(buf, etnaviv_domain->pgtable.pgtable, PT_SIZE); } -static struct etnaviv_iommu_ops etnaviv_iommu_ops = { +static const struct etnaviv_iommu_ops etnaviv_iommu_ops = { .ops = { .domain_free = etnaviv_domain_free, .map = etnaviv_iommuv1_map, |