Signed-off-by: Lucas Stach <l.stach at pengutronix.de>
---
drivers/staging/etnaviv/etnaviv_drv.c | 6 +++---
drivers/staging/etnaviv/etnaviv_drv.h | 7 +++----
drivers/staging/etnaviv/etnaviv_gem.c | 8 ++++----
drivers/staging/etnaviv/etnaviv_gem_submit.c | 2 +-
drivers/staging/etnaviv/etnaviv_gpu.c | 2 +-
drivers/staging/etnaviv/etnaviv_gpu.h | 4 ++--
6 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/drivers/staging/etnaviv/etnaviv_drv.c
b/drivers/staging/etnaviv/etnaviv_drv.c
index 5045dee1932d..713458bbf9c4 100644
--- a/drivers/staging/etnaviv/etnaviv_drv.c
+++ b/drivers/staging/etnaviv/etnaviv_drv.c
@@ -212,12 +212,12 @@ static int etnaviv_gem_show(struct drm_device *dev,
struct seq_file *m)
if (gpu) {
seq_printf(m, "Active Objects (%s):\n",
dev_name(gpu->dev));
- msm_gem_describe_objects(&gpu->active_list, m);
+ etnaviv_gem_describe_objects(&gpu->active_list, m);
}
}
seq_puts(m, "Inactive Objects:\n");
- msm_gem_describe_objects(&priv->inactive_list, m);
+ etnaviv_gem_describe_objects(&priv->inactive_list, m);
return 0;
}
@@ -437,7 +437,7 @@ static int etnaviv_ioctl_gem_info(struct drm_device *dev,
void *data,
if (!obj)
return -ENOENT;
- args->offset = msm_gem_mmap_offset(obj);
+ args->offset = etnaviv_gem_mmap_offset(obj);
drm_gem_object_unreference_unlocked(obj);
diff --git a/drivers/staging/etnaviv/etnaviv_drv.h
b/drivers/staging/etnaviv/etnaviv_drv.h
index c4892badb33b..36fd56cfbe40 100644
--- a/drivers/staging/etnaviv/etnaviv_drv.h
+++ b/drivers/staging/etnaviv/etnaviv_drv.h
@@ -74,7 +74,7 @@ int etnaviv_ioctl_gem_submit(struct drm_device *dev, void
*data,
int etnaviv_gem_mmap(struct file *filp, struct vm_area_struct *vma);
int etnaviv_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf);
-uint64_t msm_gem_mmap_offset(struct drm_gem_object *obj);
+uint64_t etnaviv_gem_mmap_offset(struct drm_gem_object *obj);
int etnaviv_gem_get_iova_locked(struct etnaviv_gpu *gpu,
struct drm_gem_object *obj, uint32_t *iova);
int etnaviv_gem_get_iova(struct etnaviv_gpu *gpu, struct drm_gem_object *obj,
@@ -111,9 +111,8 @@ bool etnaviv_cmd_validate_one(struct etnaviv_gpu *gpu,
struct etnaviv_gem_object *obj, unsigned int offset, unsigned int size);
#ifdef CONFIG_DEBUG_FS
-void msm_gem_describe(struct drm_gem_object *obj, struct seq_file *m);
-void msm_gem_describe_objects(struct list_head *list, struct seq_file *m);
-void msm_framebuffer_describe(struct drm_framebuffer *fb, struct seq_file *m);
+void etnaviv_gem_describe(struct drm_gem_object *obj, struct seq_file *m);
+void etnaviv_gem_describe_objects(struct list_head *list, struct seq_file *m);
#endif
void __iomem *etnaviv_ioremap(struct platform_device *pdev, const char *name,
diff --git a/drivers/staging/etnaviv/etnaviv_gem.c
b/drivers/staging/etnaviv/etnaviv_gem.c
index dd223b5e230c..053119f00b3e 100644
--- a/drivers/staging/etnaviv/etnaviv_gem.c
+++ b/drivers/staging/etnaviv/etnaviv_gem.c
@@ -288,7 +288,7 @@ static uint64_t mmap_offset(struct drm_gem_object *obj)
return drm_vma_node_offset_addr(&obj->vma_node);
}
-uint64_t msm_gem_mmap_offset(struct drm_gem_object *obj)
+uint64_t etnaviv_gem_mmap_offset(struct drm_gem_object *obj)
{
uint64_t offset;
@@ -476,7 +476,7 @@ int etnaviv_gem_cpu_fini(struct drm_gem_object *obj)
}
#ifdef CONFIG_DEBUG_FS
-void msm_gem_describe(struct drm_gem_object *obj, struct seq_file *m)
+void etnaviv_gem_describe(struct drm_gem_object *obj, struct seq_file *m)
{
struct drm_device *dev = obj->dev;
struct etnaviv_gem_object *etnaviv_obj = to_etnaviv_bo(obj);
@@ -491,7 +491,7 @@ void msm_gem_describe(struct drm_gem_object *obj, struct
seq_file *m)
off, etnaviv_obj->vaddr, obj->size);
}
-void msm_gem_describe_objects(struct list_head *list, struct seq_file *m)
+void etnaviv_gem_describe_objects(struct list_head *list, struct seq_file *m)
{
struct etnaviv_gem_object *etnaviv_obj;
int count = 0;
@@ -501,7 +501,7 @@ void msm_gem_describe_objects(struct list_head *list,
struct seq_file *m)
struct drm_gem_object *obj = &etnaviv_obj->base;
seq_puts(m, " ");
- msm_gem_describe(obj, m);
+ etnaviv_gem_describe(obj, m);
count++;
size += obj->size;
}
diff --git a/drivers/staging/etnaviv/etnaviv_gem_submit.c
b/drivers/staging/etnaviv/etnaviv_gem_submit.c
index 2edaa1262fef..0c84e8bf782c 100644
--- a/drivers/staging/etnaviv/etnaviv_gem_submit.c
+++ b/drivers/staging/etnaviv/etnaviv_gem_submit.c
@@ -24,7 +24,7 @@
*/
#define BO_INVALID_FLAGS ~(ETNA_SUBMIT_BO_READ | ETNA_SUBMIT_BO_WRITE)
-/* make sure these don't conflict w/ MSM_SUBMIT_BO_x */
+/* make sure these don't conflict w/ ETNAVIV_SUBMIT_BO_x */
#define BO_LOCKED 0x4000
#define BO_PINNED 0x2000
diff --git a/drivers/staging/etnaviv/etnaviv_gpu.c
b/drivers/staging/etnaviv/etnaviv_gpu.c
index abadfecb447d..82736f6a7c47 100644
--- a/drivers/staging/etnaviv/etnaviv_gpu.c
+++ b/drivers/staging/etnaviv/etnaviv_gpu.c
@@ -707,7 +707,7 @@ static void hangcheck_timer_reset(struct etnaviv_gpu *gpu)
{
DBG("%s", dev_name(gpu->dev));
mod_timer(&gpu->hangcheck_timer,
- round_jiffies_up(jiffies + DRM_MSM_HANGCHECK_JIFFIES));
+ round_jiffies_up(jiffies + DRM_ETNAVIV_HANGCHECK_JIFFIES));
}
static void hangcheck_handler(unsigned long data)
diff --git a/drivers/staging/etnaviv/etnaviv_gpu.h
b/drivers/staging/etnaviv/etnaviv_gpu.h
index 9465f7f56cdf..b8332a981b7d 100644
--- a/drivers/staging/etnaviv/etnaviv_gpu.h
+++ b/drivers/staging/etnaviv/etnaviv_gpu.h
@@ -124,8 +124,8 @@ struct etnaviv_gpu {
struct clk *clk_shader;
/* Hang Detction: */
-#define DRM_MSM_HANGCHECK_PERIOD 500 /* in ms */
-#define DRM_MSM_HANGCHECK_JIFFIES msecs_to_jiffies(DRM_MSM_HANGCHECK_PERIOD)
+#define DRM_ETNAVIV_HANGCHECK_PERIOD 500 /* in ms */
+#define DRM_ETNAVIV_HANGCHECK_JIFFIES
msecs_to_jiffies(DRM_ETNAVIV_HANGCHECK_PERIOD)
struct timer_list hangcheck_timer;
uint32_t hangcheck_fence;
uint32_t hangcheck_dma_addr;
--
2.1.4
