Subversion Repositories Kolibri OS

Rev

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

Rev 1126 Rev 1128
Line 248... Line 248...
248 
    rdev->pciep_rreg = &radeon_invalid_rreg;
 248 
    rdev->pciep_rreg = &radeon_invalid_rreg;
249 
    rdev->pciep_wreg = &radeon_invalid_wreg;
 249 
    rdev->pciep_wreg = &radeon_invalid_wreg;
Line 250... Line 250...
250 
 
 250 
 
251 
    /* Don't change order as we are overridding accessor. */
 251 
    /* Don't change order as we are overridding accessor. */
252 
    if (rdev->family < CHIP_RV515) {
 252 
    if (rdev->family < CHIP_RV515) {
253 
//        rdev->pcie_rreg = &rv370_pcie_rreg;
 253 
        rdev->pcie_rreg = &rv370_pcie_rreg;
254 
//        rdev->pcie_wreg = &rv370_pcie_wreg;
 254 
        rdev->pcie_wreg = &rv370_pcie_wreg;
255 
    }
 255 
    }
256 
    if (rdev->family >= CHIP_RV515) {
 256 
    if (rdev->family >= CHIP_RV515) {
257 
        rdev->pcie_rreg = &rv515_pcie_rreg;
 257 
        rdev->pcie_rreg = &rv515_pcie_rreg;
258 
        rdev->pcie_wreg = &rv515_pcie_wreg;
 258 
        rdev->pcie_wreg = &rv515_pcie_wreg;
Line 265... Line 265...
265 
    if (rdev->family >= CHIP_RV515) {
 265 
    if (rdev->family >= CHIP_RV515) {
266 
        rdev->mc_rreg = &rv515_mc_rreg;
 266 
        rdev->mc_rreg = &rv515_mc_rreg;
267 
        rdev->mc_wreg = &rv515_mc_wreg;
 267 
        rdev->mc_wreg = &rv515_mc_wreg;
268 
    }
 268 
    }
269 
    if (rdev->family == CHIP_RS400 || rdev->family == CHIP_RS480) {
 269 
    if (rdev->family == CHIP_RS400 || rdev->family == CHIP_RS480) {
270 
//        rdev->mc_rreg = &rs400_mc_rreg;
 270 
        rdev->mc_rreg = &rs400_mc_rreg;
271 
//        rdev->mc_wreg = &rs400_mc_wreg;
 271 
        rdev->mc_wreg = &rs400_mc_wreg;
272 
    }
 272 
    }
273 
    if (rdev->family == CHIP_RS690 || rdev->family == CHIP_RS740) {
 273 
    if (rdev->family == CHIP_RS690 || rdev->family == CHIP_RS740) {
274 
//        rdev->mc_rreg = &rs690_mc_rreg;
 274 
        rdev->mc_rreg = &rs690_mc_rreg;
275 
//        rdev->mc_wreg = &rs690_mc_wreg;
 275 
        rdev->mc_wreg = &rs690_mc_wreg;
276 
    }
 276 
    }
277 
    if (rdev->family == CHIP_RS600) {
 277 
    if (rdev->family == CHIP_RS600) {
278 
//        rdev->mc_rreg = &rs600_mc_rreg;
 278 
        rdev->mc_rreg = &rs600_mc_rreg;
279 
//        rdev->mc_wreg = &rs600_mc_wreg;
 279 
        rdev->mc_wreg = &rs600_mc_wreg;
280 
    }
 280 
    }
281 
    if (rdev->family >= CHIP_R600) {
 281 
    if (rdev->family >= CHIP_R600) {
282 
//        rdev->pciep_rreg = &r600_pciep_rreg;
 282 
        rdev->pciep_rreg = &r600_pciep_rreg;
283 
//        rdev->pciep_wreg = &r600_pciep_wreg;
 283 
        rdev->pciep_wreg = &r600_pciep_wreg;
284 
    }
 284 
    }
285 
}
 285 
}
Line 286... Line 286...
286 
 
 286 
 
Line 302... Line 302...
302 
	case CHIP_RS200:
 302 
	case CHIP_RS200:
303 
	case CHIP_R200:
 303 
	case CHIP_R200:
304 
	case CHIP_RV250:
 304 
	case CHIP_RV250:
305 
	case CHIP_RS300:
 305 
	case CHIP_RS300:
306 
	case CHIP_RV280:
 306 
	case CHIP_RV280:
307 
//       rdev->asic = &r100_asic;
 307 
        rdev->asic = &r100_asic;
308 
		break;
 308 
		break;
309 
	case CHIP_R300:
 309 
	case CHIP_R300:
310 
	case CHIP_R350:
 310 
	case CHIP_R350:
311 
	case CHIP_RV350:
 311 
	case CHIP_RV350:
312 
	case CHIP_RV380:
 312 
	case CHIP_RV380:
313 
//       rdev->asic = &r300_asic;
 313 
        rdev->asic = &r300_asic;
314 
		break;
 314 
		break;
315 
	case CHIP_R420:
 315 
	case CHIP_R420:
316 
	case CHIP_R423:
 316 
	case CHIP_R423:
317 
	case CHIP_RV410:
 317 
	case CHIP_RV410:
318 
//       rdev->asic = &r420_asic;
 318 
        rdev->asic = &r420_asic;
319 
		break;
 319 
		break;
320 
	case CHIP_RS400:
 320 
	case CHIP_RS400:
321 
	case CHIP_RS480:
 321 
	case CHIP_RS480:
322 
//       rdev->asic = &rs400_asic;
 322 
       rdev->asic = &rs400_asic;
323 
		break;
 323 
		break;
324 
	case CHIP_RS600:
 324 
	case CHIP_RS600:
325 
//       rdev->asic = &rs600_asic;
 325 
       rdev->asic = &rs600_asic;
326 
		break;
 326 
		break;
327 
	case CHIP_RS690:
 327 
	case CHIP_RS690:
328 
	case CHIP_RS740:
 328 
	case CHIP_RS740:
329 
//       rdev->asic = &rs690_asic;
 329 
        rdev->asic = &rs690_asic;
330 
		break;
 330 
		break;
331 
	case CHIP_RV515:
 331 
	case CHIP_RV515:
332 
//       rdev->asic = &rv515_asic;
 332 
        rdev->asic = &rv515_asic;
333 
		break;
 333 
		break;
334 
	case CHIP_R520:
 334 
	case CHIP_R520:
335 
	case CHIP_RV530:
 335 
	case CHIP_RV530:
336 
	case CHIP_RV560:
 336 
	case CHIP_RV560:
337 
	case CHIP_RV570:
 337 
	case CHIP_RV570:
Line 452... Line 452...
452 
	kfree(rdev->mode_info.atom_context);
 452 
	kfree(rdev->mode_info.atom_context);
453 
}
 453 
}
Line 454... Line 454...
454 
 
 454 
 
455 
int radeon_combios_init(struct radeon_device *rdev)
 455 
int radeon_combios_init(struct radeon_device *rdev)
456 
{
 456 
{
457 
//	radeon_combios_initialize_bios_scratch_regs(rdev->ddev);
 457 
	radeon_combios_initialize_bios_scratch_regs(rdev->ddev);
458 
	return 0;
 458 
	return 0;
Line 459... Line 459...
459 
}
 459 
}
460 
 
 460 
 
Line 867... Line 867...
867 
 
 867 
 
868 
 //   DRM_INFO("Initialized %s %d.%d.%d %s for %s on minor %d\n",
 868 
 //   DRM_INFO("Initialized %s %d.%d.%d %s for %s on minor %d\n",
869 
 //        driver->name, driver->major, driver->minor, driver->patchlevel,
 869 
 //        driver->name, driver->major, driver->minor, driver->patchlevel,
Line 870... Line 870...
870 
 //        driver->date, pci_name(pdev), dev->primary->index);
 870 
 //        driver->date, pci_name(pdev), dev->primary->index);
871 
 
 - 
 
Line 872... Line 871...
872 
      drm_helper_resume_force_mode(dev);
 871 
 
Line 873... Line 872...
873 
 
 872 
      set_mode(dev, 1024, 768);
874 
 
 873 
 
Line 929... Line 928...
929 
 
 928 
 
930 
        *n = res;
 929 
        *n = res;
931 
        return rem;
 930 
        return rem;
Line -... Line 931...
- 
 
 931 
}
- 
 
 932