msm: kgsl: Cleanup a superfluous structure in kgsl_device.h
struct kgsl_memregion was used to store the MMIO and GMEM
addressing for KGSL and adreno but it didn't serve much
purpose other than another level of redirection in the
structures. Remove it and add the necessary pointer and
size members directly to the KGSL and adreno structs.
Change-Id: Ic0dedbad8ec3f0a2c63383fa451cc39a25cab087
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
diff --git a/drivers/gpu/msm/z180.c b/drivers/gpu/msm/z180.c
index bc5c960..cff7fec 100644
--- a/drivers/gpu/msm/z180.c
+++ b/drivers/gpu/msm/z180.c
@@ -700,10 +700,9 @@
{
unsigned int *reg;
- BUG_ON(offsetwords * sizeof(uint32_t) >= device->regspace.sizebytes);
+ BUG_ON(offsetwords * sizeof(uint32_t) >= device->reg_len);
- reg = (unsigned int *)(device->regspace.mmio_virt_base
- + (offsetwords << 2));
+ reg = (unsigned int *)(device->reg_virt + (offsetwords << 2));
/*ensure this read finishes before the next one.
* i.e. act like normal readl() */
@@ -718,10 +717,9 @@
{
unsigned int *reg;
- BUG_ON(offsetwords*sizeof(uint32_t) >= device->regspace.sizebytes);
+ BUG_ON(offsetwords*sizeof(uint32_t) >= device->reg_len);
- reg = (unsigned int *)(device->regspace.mmio_virt_base
- + (offsetwords << 2));
+ reg = (unsigned int *)(device->reg_virt + (offsetwords << 2));
kgsl_cffdump_regwrite(device->id, offsetwords << 2, value);
/*ensure previous writes post before this one,
* i.e. act like normal writel() */