Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 2997 → Rev 2996

/drivers/video/drm/radeon/rs400.c
77,7 → 77,7
{
int r;
 
if (rdev->gart.ptr) {
if (rdev->gart.table.ram.ptr) {
WARN(1, "RS400 GART already initialized\n");
return 0;
}
182,9 → 182,6
/* Enable gart */
WREG32_MC(RS480_AGP_ADDRESS_SPACE_SIZE, (RS480_GART_EN | size_reg));
rs400_gart_tlb_flush(rdev);
DRM_INFO("PCIE GART of %uM enabled (table at 0x%016llX).\n",
(unsigned)(rdev->mc.gtt_size >> 20),
(unsigned long long)rdev->gart.table_addr);
rdev->gart.ready = true;
return 0;
}
212,7 → 209,6
int rs400_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr)
{
uint32_t entry;
u32 *gtt = rdev->gart.ptr;
 
if (i < 0 || i > rdev->gart.num_gpu_pages) {
return -EINVAL;
222,7 → 218,7
((upper_32_bits(addr) & 0xff) << 4) |
RS400_PTE_WRITEABLE | RS400_PTE_READABLE;
entry = cpu_to_le32(entry);
gtt[i] = entry;
rdev->gart.table.ram.ptr[i] = entry;
return 0;
}
 
242,7 → 238,7
return -1;
}
 
static void rs400_gpu_init(struct radeon_device *rdev)
void rs400_gpu_init(struct radeon_device *rdev)
{
/* FIXME: is this correct ? */
r420_pipes_init(rdev);
252,7 → 248,7
}
}
 
static void rs400_mc_init(struct radeon_device *rdev)
void rs400_mc_init(struct radeon_device *rdev)
{
u64 base;
 
370,7 → 366,7
#endif
}
 
static void rs400_mc_program(struct radeon_device *rdev)
void rs400_mc_program(struct radeon_device *rdev)
{
struct r100_mc_save save;
 
419,13 → 415,11
dev_err(rdev->dev, "failed initializing CP (%d).\n", r);
return r;
}
 
r = radeon_ib_pool_init(rdev);
r = r100_ib_init(rdev);
if (r) {
dev_err(rdev->dev, "IB initialization failed (%d).\n", r);
dev_err(rdev->dev, "failed initializing IB (%d).\n", r);
return r;
}
 
return 0;
}
 
488,7 → 482,6
if (r)
return r;
r300_set_reg_safe(rdev);
 
rdev->accel_working = true;
r = rs400_startup(rdev);
if (r) {