Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 1413 → Rev 1414

/drivers/video/drm/radeon/fwblob.asm
44,6 → 44,10
dd RS690CP_START
dd (RS690CP_END - RS690CP_START)
 
dd FIRMWARE_R600_ME
dd R600ME_START
dd (R600ME_END - R600ME_START)
 
dd FIRMWARE_RS780_ME
dd RS780ME_START
dd (RS780ME_END - RS780ME_START)
142,6 → 146,7
FIRMWARE_RS780_ME db 'radeon/RS780_me.bin',0
FIRMWARE_RS780_PFP db 'radeon/RS780_pfp.bin',0
 
FIRMWARE_R600_ME db 'radeon/RV600_me.bin',0
FIRMWARE_RV610_ME db 'radeon/RV610_me.bin',0
FIRMWARE_RV620_ME db 'radeon/RV620_me.bin',0
FIRMWARE_RV630_ME db 'radeon/RV630_me.bin',0
151,6 → 156,7
FIRMWARE_RV730_ME db 'radeon/RV730_me.bin',0
FIRMWARE_RV770_ME db 'radeon/RV770_me.bin',0
 
FIRMWARE_R600_PFP db 'radeon/R600_pfp.bin',0
FIRMWARE_RV610_PFP db 'radeon/RV610_pfp.bin',0
FIRMWARE_RV620_PFP db 'radeon/RV620_pfp.bin',0
FIRMWARE_RV630_PFP db 'radeon/RV630_pfp.bin',0
210,6 → 216,11
RS780PFP_END:
 
align 16
R600ME_START:
file 'firmware/r600_me.bin'
R600ME_END:
 
align 16
RV610ME_START:
file 'firmware/rv610_me.bin'
RV610ME_END:
/drivers/video/drm/radeon/r100.c
2980,7 → 2980,6
if (r) {
/* Somethings want wront with the accel init stop accel */
dev_err(rdev->dev, "Disabling GPU acceleration\n");
// r100_suspend(rdev);
// r100_cp_fini(rdev);
// r100_wb_fini(rdev);
// r100_ib_fini(rdev);
/drivers/video/drm/radeon/r300.c
1381,7 → 1381,6
if (r) {
/* Somethings want wront with the accel init stop accel */
dev_err(rdev->dev, "Disabling GPU acceleration\n");
// r300_suspend(rdev);
// r100_cp_fini(rdev);
// r100_wb_fini(rdev);
// r100_ib_fini(rdev);
/drivers/video/drm/radeon/radeon_device.c
825,12 → 825,6
if (ret)
goto err_g4;
 
// list_add_tail(&dev->driver_item, &driver->device_list);
 
// DRM_INFO("Initialized %s %d.%d.%d %s for %s on minor %d\n",
// driver->name, driver->major, driver->minor, driver->patchlevel,
// driver->date, pci_name(pdev), dev->primary->index);
 
if( radeon_modeset )
init_display_kms(dev->dev_private, &usermode);
else