Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 3119 → Rev 3120

/drivers/video/drm/radeon/si.c
2007,7 → 2007,7
ring->wptr = 0;
WREG32(CP_RB0_WPTR, ring->wptr);
 
/* set the wb address wether it's enabled or not */
/* set the wb address whether it's enabled or not */
WREG32(CP_RB0_RPTR_ADDR, (rdev->wb.gpu_addr + RADEON_WB_CP_RPTR_OFFSET) & 0xFFFFFFFC);
WREG32(CP_RB0_RPTR_ADDR_HI, upper_32_bits(rdev->wb.gpu_addr + RADEON_WB_CP_RPTR_OFFSET) & 0xFF);
 
2040,7 → 2040,7
ring->wptr = 0;
WREG32(CP_RB1_WPTR, ring->wptr);
 
/* set the wb address wether it's enabled or not */
/* set the wb address whether it's enabled or not */
WREG32(CP_RB1_RPTR_ADDR, (rdev->wb.gpu_addr + RADEON_WB_CP1_RPTR_OFFSET) & 0xFFFFFFFC);
WREG32(CP_RB1_RPTR_ADDR_HI, upper_32_bits(rdev->wb.gpu_addr + RADEON_WB_CP1_RPTR_OFFSET) & 0xFF);
 
2066,7 → 2066,7
ring->wptr = 0;
WREG32(CP_RB2_WPTR, ring->wptr);
 
/* set the wb address wether it's enabled or not */
/* set the wb address whether it's enabled or not */
WREG32(CP_RB2_RPTR_ADDR, (rdev->wb.gpu_addr + RADEON_WB_CP2_RPTR_OFFSET) & 0xFFFFFFFC);
WREG32(CP_RB2_RPTR_ADDR_HI, upper_32_bits(rdev->wb.gpu_addr + RADEON_WB_CP2_RPTR_OFFSET) & 0xFF);
 
3841,11 → 3841,11
if (r)
return r;
 
// r = radeon_ib_pool_init(rdev);
// if (r) {
// dev_err(rdev->dev, "IB initialization failed (%d).\n", r);
// return r;
// }
r = radeon_ib_pool_init(rdev);
if (r) {
dev_err(rdev->dev, "IB initialization failed (%d).\n", r);
return r;
}
 
// r = radeon_vm_manager_init(rdev);
// if (r) {
3857,6 → 3857,8
}
 
 
 
 
/* Plan is to move initialization in that function and use
* helper function so that radeon_device_init pretty much
* do nothing more than calling asic specific function. This