diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-02-03 11:09:25 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-02-03 11:09:36 +0100 |
| commit | 17aad8a340e6f98b62c2482d02bc3814eebde9a5 (patch) | |
| tree | b03fc5a159452bd24cde6e08f29bc66ce6bfa154 /drivers/gpu/drm/etnaviv/etnaviv_iommu.c | |
| parent | 7e6328fd1f84f366b4cc17dc757025f485139f1a (diff) | |
| parent | 99743ae4c5f52f8f8ceb17783056fcc9b4f8b64c (diff) | |
| download | op-kernel-dev-17aad8a340e6f98b62c2482d02bc3814eebde9a5.zip op-kernel-dev-17aad8a340e6f98b62c2482d02bc3814eebde9a5.tar.gz | |
Merge remote-tracking branch 'airlied/drm-next' into drm-misc-next
Yet another backmerge to get at latest etnaviv code, which is need for
Chris' drm_mm patch.
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 81f1583..7a7c97f 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, |
