lkml.org 
[lkml]   [2020]   [Aug]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 32/49] staging: hikey9xx/gpu: get rid of iommu_format
Date
Those aren't needed anymore.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
---
drivers/staging/hikey9xx/gpu/kirin960_dpe_reg.h | 1 -
drivers/staging/hikey9xx/gpu/kirin970_dpe_reg.h | 1 -
drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.h | 2 --
3 files changed, 4 deletions(-)

diff --git a/drivers/staging/hikey9xx/gpu/kirin960_dpe_reg.h b/drivers/staging/hikey9xx/gpu/kirin960_dpe_reg.h
index a0f7732063a3..7b9da796a671 100644
--- a/drivers/staging/hikey9xx/gpu/kirin960_dpe_reg.h
+++ b/drivers/staging/hikey9xx/gpu/kirin960_dpe_reg.h
@@ -3087,7 +3087,6 @@ struct dss_hw_ctx {
struct iommu_domain *mmu_domain;
struct ion_client *ion_client;
struct ion_handle *ion_handle;
- struct iommu_map_format iommu_format;
char __iomem *screen_base;
unsigned long smem_start;
unsigned long screen_size;
diff --git a/drivers/staging/hikey9xx/gpu/kirin970_dpe_reg.h b/drivers/staging/hikey9xx/gpu/kirin970_dpe_reg.h
index 84293d2d462e..9c1b62831733 100644
--- a/drivers/staging/hikey9xx/gpu/kirin970_dpe_reg.h
+++ b/drivers/staging/hikey9xx/gpu/kirin970_dpe_reg.h
@@ -4100,7 +4100,6 @@ struct dss_hw_ctx {
struct iommu_domain *mmu_domain;
struct ion_client *ion_client;
struct ion_handle *ion_handle;
- struct iommu_map_format iommu_format;
char __iomem *screen_base;
unsigned long smem_start;
unsigned long screen_size;
diff --git a/drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.h b/drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.h
index 261259cb8f5f..54b4ddc2fe42 100644
--- a/drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.h
+++ b/drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.h
@@ -18,7 +18,6 @@
#include <drm/drm_print.h>

#include <linux/iommu.h>
-#include <linux/hisi/hisi-iommu.h>

#define MAX_CRTC 2

@@ -41,7 +40,6 @@ struct kirin_fbdev {

struct ion_client *ion_client;
struct ion_handle *ion_handle;
- struct iommu_map_format iommu_format;
void *screen_base;
unsigned long smem_start;
unsigned long screen_size;
--
2.26.2
\
 
 \ /
  Last update: 2020-08-19 14:06    [W:0.514 / U:0.028 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site