genesi/linux-legacy
1
0
Fork 0
mirror of https://github.com/genesi/linux-legacy.git synced 2026-05-18 17:46:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

amd-gpu: correct opencoding of hwaccess, correct mmu in shmem init

Browse Source
This commit is contained in:
Matt Sealey
2012-12-03 17:47:07 -06:00
parent 96c73e4f6c
commit 3cf4914a73
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/mxc/amd-gpu/kgsl_sharedmem.c
View File

@@ -120,6 +120,7 @@ kgsl_sharedmem_init(struct kgsl_sharedmem *shmem)
int memspaceidx = GSL_HAL_MEM1;
aperture_id = GSL_APERTURE_EMEM;
mmu_virtualized = 0;
if (i == 1) {
memspaceidx = GSL_HAL_MEM2;
@@ -135,6 +136,9 @@ kgsl_sharedmem_init(struct kgsl_sharedmem *shmem)
gpubaseaddr = hal->memspace[memspaceidx].gpu_base;
sizebytes = hal->memspace[memspaceidx].sizebytes;
pr_info("%s: ap %d channel %d hb %08x gb %08x sb %08x idx %d mmu %d\n",
__func__, aperture_id, channel_id, hostbaseaddr, gpubaseaddr, sizebytes, memspaceidx, mmu_virtualized);
// make sure aligned to page size
DEBUG_ASSERT((gpubaseaddr & ((1 << PAGE_SHIFT) - 1)) == 0);
@@ -539,7 +543,6 @@ KGSL_MEM_VDBG( "--> int kgsl_sharedmem_read(struct kgsl_memde
{
if (copy_to_user(dst, (void *)(shmem->apertures[aperture_index].memarena->hostbaseaddr + gpuoffsetbytes), sizebytes))
{
return;
}
}
else
@@ -609,7 +612,6 @@ KGSL_MEM_VDBG( "--> int kgsl_sharedmem_write(struct kgsl_memd
{
if (copy_from_user((void *)(shmem->apertures[aperture_index].memarena->hostbaseaddr + gpuoffsetbytes), src, sizebytes))
{
return;
}
}
else