Rev 1246 | Rev 1275 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 1246 | Rev 1268 | ||
---|---|---|---|
Line 45... | Line 45... | ||
45 | int radeon_benchmarking = 0; |
45 | int radeon_benchmarking = 0; |
46 | int radeon_connector_table = 0; |
46 | int radeon_connector_table = 0; |
47 | int radeon_tv = 0; |
47 | int radeon_tv = 0; |
48 | int radeon_modeset = 1; |
48 | int radeon_modeset = 1; |
Line 49... | Line 49... | ||
49 | 49 | ||
50 | void parse_cmdline(char *cmdline, mode_t *mode, char *log); |
50 | void parse_cmdline(char *cmdline, mode_t *mode, char *log, int *kms); |
51 | int init_display(struct radeon_device *rdev, mode_t *mode); |
51 | int init_display(struct radeon_device *rdev, mode_t *mode); |
Line 52... | Line 52... | ||
52 | int init_display_kms(struct radeon_device *rdev, mode_t *mode); |
52 | int init_display_kms(struct radeon_device *rdev, mode_t *mode); |
53 | 53 | ||
Line 476... | Line 476... | ||
476 | 476 | ||
477 | r = RREG32(reg*4); |
477 | r = RREG32(reg*4); |
478 | return r; |
478 | return r; |
Line 479... | Line -... | ||
479 | } |
- | |
480 | - | ||
481 | static struct card_info atom_card_info = { |
- | |
482 | .dev = NULL, |
- | |
483 | .reg_read = cail_reg_read, |
- | |
484 | .reg_write = cail_reg_write, |
- | |
485 | .mc_read = cail_mc_read, |
- | |
486 | .mc_write = cail_mc_write, |
- | |
487 | .pll_read = cail_pll_read, |
- | |
488 | .pll_write = cail_pll_write, |
- | |
489 | }; |
479 | } |
490 | 480 | ||
- | 481 | int radeon_atombios_init(struct radeon_device *rdev) |
|
- | 482 | { |
|
- | 483 | struct card_info *atom_card_info = |
|
- | 484 | kzalloc(sizeof(struct card_info), GFP_KERNEL); |
|
491 | int radeon_atombios_init(struct radeon_device *rdev) |
485 | |
- | 486 | if (!atom_card_info) |
|
- | 487 | return -ENOMEM; |
|
- | 488 | ||
- | 489 | rdev->mode_info.atom_card_info = atom_card_info; |
|
- | 490 | atom_card_info->dev = rdev->ddev; |
|
- | 491 | atom_card_info->reg_read = cail_reg_read; |
|
- | 492 | atom_card_info->reg_write = cail_reg_write; |
|
- | 493 | atom_card_info->mc_read = cail_mc_read; |
|
- | 494 | atom_card_info->mc_write = cail_mc_write; |
|
Line 492... | Line -... | ||
492 | { |
- | |
493 | ENTER(); |
495 | atom_card_info->pll_read = cail_pll_read; |
494 | 496 | atom_card_info->pll_write = cail_pll_write; |
|
495 | atom_card_info.dev = rdev->ddev; |
497 | |
496 | rdev->mode_info.atom_context = atom_parse(&atom_card_info, rdev->bios); |
498 | rdev->mode_info.atom_context = atom_parse(atom_card_info, rdev->bios); |
Line 497... | Line 499... | ||
497 | radeon_atom_initialize_bios_scratch_regs(rdev->ddev); |
499 | radeon_atom_initialize_bios_scratch_regs(rdev->ddev); |
498 | return 0; |
500 | return 0; |
499 | } |
501 | } |
- | 502 | ||
500 | 503 | void radeon_atombios_fini(struct radeon_device *rdev) |
|
Line 501... | Line 504... | ||
501 | void radeon_atombios_fini(struct radeon_device *rdev) |
504 | { |
502 | { |
505 | kfree(rdev->mode_info.atom_context); |
503 | kfree(rdev->mode_info.atom_context); |
506 | kfree(rdev->mode_info.atom_card_info); |
Line 884... | Line 887... | ||
884 | 887 | ||
885 | if( GetService("DISPLAY") != 0 ) |
888 | if( GetService("DISPLAY") != 0 ) |
Line 886... | Line 889... | ||
886 | return 0; |
889 | return 0; |
887 | 890 | ||
Line 888... | Line 891... | ||
888 | if( cmdline && *cmdline ) |
891 | if( cmdline && *cmdline ) |
889 | parse_cmdline(cmdline, &usermode, log); |
892 | parse_cmdline(cmdline, &usermode, log, &radeon_modeset); |
890 | 893 | ||
Line 896... | Line 899... | ||
896 | { |
899 | { |
897 | printf("Can't open %s\nExit\n", log); |
900 | printf("Can't open %s\nExit\n", log); |
898 | return 0; |
901 | return 0; |
899 | }; |
902 | }; |
900 | } |
903 | } |
901 | dbgprintf("Radeon RC05 cmdline %s\n", cmdline); |
904 | dbgprintf("Radeon RC06 cmdline %s\n", cmdline); |
Line 902... | Line 905... | ||
902 | 905 | ||
Line 903... | Line 906... | ||
903 | enum_pci_devices(); |
906 | enum_pci_devices(); |