msm: kgsl: Various cleanups
Remove some uneeded code and tighten things up in
anticipation of the A3XX device.
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
diff --git a/drivers/gpu/msm/adreno.c b/drivers/gpu/msm/adreno.c
index 43fd5ee..eb8527a 100644
--- a/drivers/gpu/msm/adreno.c
+++ b/drivers/gpu/msm/adreno.c
@@ -102,13 +102,13 @@
.active_cnt = 0,
.iomemname = KGSL_3D0_REG_MEMORY,
.ftbl = &adreno_functable,
- .display_off = {
#ifdef CONFIG_HAS_EARLYSUSPEND
+ .display_off = {
.level = EARLY_SUSPEND_LEVEL_STOP_DRAWING,
.suspend = kgsl_early_suspend_driver,
.resume = kgsl_late_resume_driver,
-#endif
},
+#endif
},
.gmemspace = {
.gpu_base = 0,
@@ -118,7 +118,7 @@
.pm4_fw = NULL,
};
-static int adreno_gmeminit(struct adreno_device *adreno_dev)
+static void adreno_gmeminit(struct adreno_device *adreno_dev)
{
struct kgsl_device *device = &adreno_dev->dev;
union reg_rb_edram_info rb_edram_info;
@@ -137,25 +137,15 @@
rb_edram_info.val = 0;
rb_edram_info.f.edram_size = edram_value;
- if (!adreno_is_a22x(adreno_dev))
- rb_edram_info.f.edram_mapping_mode = 0; /* EDRAM_MAP_UPPER */
+ rb_edram_info.f.edram_mapping_mode = 0; /* EDRAM_MAP_UPPER */
/* must be aligned to size */
rb_edram_info.f.edram_range = (adreno_dev->gmemspace.gpu_base >> 14);
adreno_regwrite(device, REG_RB_EDRAM_INFO, rb_edram_info.val);
-
- return 0;
}
-static int adreno_gmemclose(struct kgsl_device *device)
-{
- adreno_regwrite(device, REG_RB_EDRAM_INFO, 0x00000000);
-
- return 0;
-}
-
-irqreturn_t adreno_isr(int irq, void *data)
+static irqreturn_t adreno_isr(int irq, void *data)
{
irqreturn_t result;
struct kgsl_device *device = data;
@@ -178,7 +168,7 @@
return result;
}
-static int adreno_cleanup_pt(struct kgsl_device *device,
+static void adreno_cleanup_pt(struct kgsl_device *device,
struct kgsl_pagetable *pagetable)
{
struct adreno_device *adreno_dev = ADRENO_DEVICE(device);
@@ -191,8 +181,6 @@
kgsl_mmu_unmap(pagetable, &device->memstore);
kgsl_mmu_unmap(pagetable, &device->mmu.dummyspace);
-
- return 0;
}
static int adreno_setup_pt(struct kgsl_device *device,
@@ -202,12 +190,6 @@
struct adreno_device *adreno_dev = ADRENO_DEVICE(device);
struct adreno_ringbuffer *rb = &adreno_dev->ringbuffer;
- BUG_ON(rb->buffer_desc.physaddr == 0);
- BUG_ON(rb->memptrs_desc.physaddr == 0);
- BUG_ON(device->memstore.physaddr == 0);
-#ifdef CONFIG_MSM_KGSL_MMU
- BUG_ON(device->mmu.dummyspace.physaddr == 0);
-#endif
result = kgsl_mmu_map_global(pagetable, &rb->buffer_desc,
GSL_PT_PAGE_RV);
if (result)
@@ -583,8 +565,6 @@
adreno_ringbuffer_stop(&adreno_dev->ringbuffer);
- adreno_gmemclose(device);
-
kgsl_mmu_stop(device);
/* Power down the device */
diff --git a/drivers/gpu/msm/kgsl.c b/drivers/gpu/msm/kgsl.c
index b26646e..3f0885a 100644
--- a/drivers/gpu/msm/kgsl.c
+++ b/drivers/gpu/msm/kgsl.c
@@ -2105,7 +2105,6 @@
kgsl_sharedmem_init_sysfs();
kgsl_cffdump_init();
- /* Generic device initialization */
INIT_LIST_HEAD(&kgsl_driver.process_list);
result = kgsl_ptdata_init();
diff --git a/drivers/gpu/msm/kgsl.h b/drivers/gpu/msm/kgsl.h
index cd11bd9..ad016e0 100644
--- a/drivers/gpu/msm/kgsl.h
+++ b/drivers/gpu/msm/kgsl.h
@@ -24,14 +24,6 @@
#define KGSL_NAME "kgsl"
-/* Flags to control whether to flush or invalidate a cached memory range */
-#define KGSL_CACHE_INV 0x00000000
-#define KGSL_CACHE_CLEAN 0x00000001
-#define KGSL_CACHE_FLUSH 0x00000002
-
-#define KGSL_CACHE_USER_ADDR 0x00000010
-#define KGSL_CACHE_VMALLOC_ADDR 0x00000020
-
/*cache coherency ops */
#define DRM_KGSL_GEM_CACHE_OP_TO_DEV 0x0001
#define DRM_KGSL_GEM_CACHE_OP_FROM_DEV 0x0002
@@ -95,8 +87,6 @@
struct kobject *prockobj;
struct kgsl_device *devp[KGSL_DEVICE_MAX];
- uint32_t flags_debug;
-
/* Global lilst of open processes */
struct list_head process_list;
/* Global list of pagetables */
diff --git a/drivers/gpu/msm/kgsl_device.h b/drivers/gpu/msm/kgsl_device.h
index afe3a6d..10e345a 100644
--- a/drivers/gpu/msm/kgsl_device.h
+++ b/drivers/gpu/msm/kgsl_device.h
@@ -84,7 +84,7 @@
unsigned int flags);
int (*setup_pt)(struct kgsl_device *device,
struct kgsl_pagetable *pagetable);
- int (*cleanup_pt)(struct kgsl_device *device,
+ void (*cleanup_pt)(struct kgsl_device *device,
struct kgsl_pagetable *pagetable);
void (*power_stats)(struct kgsl_device *device,
struct kgsl_power_stats *stats);
diff --git a/drivers/gpu/msm/z180.c b/drivers/gpu/msm/z180.c
index 7c0b6cc..cc57115 100644
--- a/drivers/gpu/msm/z180.c
+++ b/drivers/gpu/msm/z180.c
@@ -156,13 +156,13 @@
.active_cnt = 0,
.iomemname = KGSL_2D0_REG_MEMORY,
.ftbl = &z180_functable,
- .display_off = {
#ifdef CONFIG_HAS_EARLYSUSPEND
+ .display_off = {
.level = EARLY_SUSPEND_LEVEL_STOP_DRAWING,
.suspend = kgsl_early_suspend_driver,
.resume = kgsl_late_resume_driver,
-#endif
},
+#endif
},
};
@@ -253,7 +253,7 @@
return result;
}
-static int z180_cleanup_pt(struct kgsl_device *device,
+static void z180_cleanup_pt(struct kgsl_device *device,
struct kgsl_pagetable *pagetable)
{
struct z180_device *z180_dev = Z180_DEVICE(device);
@@ -263,8 +263,6 @@
kgsl_mmu_unmap(pagetable, &device->memstore);
kgsl_mmu_unmap(pagetable, &z180_dev->ringbuffer.cmdbufdesc);
-
- return 0;
}
static int z180_setup_pt(struct kgsl_device *device,