Subversion Repositories Kolibri OS

Rev

Rev 1182 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1182 Rev 1268
Line 150... Line 150...
150
            goto retry_pre_get;
150
            goto retry_pre_get;
151
        }
151
        }
Line 152... Line 152...
152
 
152
 
Line 153... Line 153...
153
        robj->vm_addr = ((uint32_t)robj->mm_node->start);
153
        robj->vm_addr = ((uint32_t)robj->mm_node->start);
154
 
154
 
Line 155... Line 155...
155
        dbgprintf("alloc vram: base %x size %x\n",
155
//        dbgprintf("alloc vram: base %x size %x\n",
Line 156... Line 156...
156
                   robj->vm_addr << PAGE_SHIFT, num_pages  << PAGE_SHIFT);
156
//                   robj->vm_addr << PAGE_SHIFT, num_pages  << PAGE_SHIFT);
157
 
157
 
Line 188... Line 188...
188
            goto retry_pre_get1;
188
            goto retry_pre_get1;
189
        }
189
        }
Line 190... Line 190...
190
 
190
 
Line 191... Line 191...
191
        robj->vm_addr = ((uint32_t)robj->mm_node->start) ;
191
        robj->vm_addr = ((uint32_t)robj->mm_node->start) ;
192
 
192
 
193
        dbgprintf("alloc gtt: base %x size %x\n",
193
//        dbgprintf("alloc gtt: base %x size %x\n",
Line 194... Line 194...
194
                   robj->vm_addr << PAGE_SHIFT, num_pages  << PAGE_SHIFT);
194
//                   robj->vm_addr << PAGE_SHIFT, num_pages  << PAGE_SHIFT);
195
    };
195
    };
196
 
196
 
Line 295... Line 295...
295
    {
295
    {
296
        robj->cpu_addr = robj->rdev->mc.aper_base +
296
        robj->cpu_addr = robj->rdev->mc.aper_base +
297
                         (robj->vm_addr << PAGE_SHIFT);
297
                         (robj->vm_addr << PAGE_SHIFT);
298
        robj->kptr = (void*)MapIoMem(robj->cpu_addr,
298
        robj->kptr = (void*)MapIoMem(robj->cpu_addr,
299
                           robj->mm_node->size << 12, PG_SW);
299
                           robj->mm_node->size << 12, PG_SW);
300
        dbgprintf("map io mem %x at %x\n", robj->cpu_addr, robj->kptr);
300
//        dbgprintf("map io mem %x at %x\n", robj->cpu_addr, robj->kptr);
Line 301... Line 301...
301
 
301
 
302
    }
302
    }
303
    else
303
    else
304
    {
304
    {