From: Russell King rmk+kernel@arm.linux.org.uk
.../etnaviv_gem_submit.c:72:37: warning: dereference of noderef expression .../etnaviv_gem_submit.c:364:37: warning: dereference of noderef expression .../etnaviv_gem_submit.c:423:58: warning: dereference of noderef expression .../etnaviv_iommu.c:139:13: warning: symbol 'etnaviv_iommu_iova_to_phys' was not declared. Should it be static? .../etnaviv_iommu.c:156:21: warning: symbol 'etnaviv_iommu_domain_alloc' was not declared. Should it be static?
Signed-off-by: Russell King rmk+kernel@arm.linux.org.uk --- drivers/staging/etnaviv/etnaviv_iommu.c | 4 +++- drivers/staging/etnaviv/etnaviv_iommu.h | 1 + include/uapi/drm/etnaviv_drm.h | 6 +++--- 3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/etnaviv/etnaviv_iommu.c b/drivers/staging/etnaviv/etnaviv_iommu.c index d0811fb13363..5841a08f627f 100644 --- a/drivers/staging/etnaviv/etnaviv_iommu.c +++ b/drivers/staging/etnaviv/etnaviv_iommu.c @@ -22,6 +22,7 @@ #include <linux/bitops.h>
#include "etnaviv_gpu.h" +#include "etnaviv_iommu.h" #include "state_hi.xml.h"
#define PT_SIZE SZ_256K @@ -136,7 +137,8 @@ static size_t etnaviv_iommu_unmap(struct iommu_domain *domain, unsigned long iov return 0; }
-phys_addr_t etnaviv_iommu_iova_to_phys(struct iommu_domain *domain, dma_addr_t iova) +static phys_addr_t etnaviv_iommu_iova_to_phys(struct iommu_domain *domain, + dma_addr_t iova) { struct etnaviv_iommu_domain *etnaviv_domain = domain->priv;
diff --git a/drivers/staging/etnaviv/etnaviv_iommu.h b/drivers/staging/etnaviv/etnaviv_iommu.h index 3103ff3efcbe..c0c359d4f166 100644 --- a/drivers/staging/etnaviv/etnaviv_iommu.h +++ b/drivers/staging/etnaviv/etnaviv_iommu.h @@ -21,5 +21,6 @@ struct etnaviv_gpu;
struct iommu_domain *etnaviv_iommu_domain_alloc(struct etnaviv_gpu *gpu); +struct iommu_domain *etnaviv_iommu_v2_domain_alloc(struct etnaviv_gpu *gpu);
#endif /* __ETNAVIV_IOMMU_H__ */ diff --git a/include/uapi/drm/etnaviv_drm.h b/include/uapi/drm/etnaviv_drm.h index f7b5ac6f3842..a9f020ed71ea 100644 --- a/include/uapi/drm/etnaviv_drm.h +++ b/include/uapi/drm/etnaviv_drm.h @@ -154,7 +154,7 @@ struct drm_etnaviv_gem_submit_cmd { uint32_t size; /* in, cmdstream size */ uint32_t pad; uint32_t nr_relocs; /* in, number of submit_reloc's */ - uint64_t __user relocs; /* in, ptr to array of submit_reloc's */ + uint64_t relocs; /* in, ptr to array of submit_reloc's */ };
/* Each buffer referenced elsewhere in the cmdstream submit (ie. the @@ -185,8 +185,8 @@ struct drm_etnaviv_gem_submit { uint32_t fence; /* out */ uint32_t nr_bos; /* in, number of submit_bo's */ uint32_t nr_cmds; /* in, number of submit_cmd's */ - uint64_t __user bos; /* in, ptr to array of submit_bo's */ - uint64_t __user cmds; /* in, ptr to array of submit_cmd's */ + uint64_t bos; /* in, ptr to array of submit_bo's */ + uint64_t cmds; /* in, ptr to array of submit_cmd's */ };
/* The normal way to synchronize with the GPU is just to CPU_PREP on