| 45,12 → 45,9 |
|---|
| int radeon_benchmarking = 0; |
| int radeon_connector_table = 0; |
| int radeon_tv = 0; |
| int radeon_modeset = 1; |
| |
| void parse_cmdline(char *cmdline, mode_t *mode, char *log); |
| int init_display(struct radeon_device *rdev, mode_t *mode); |
| int init_display_kms(struct radeon_device *rdev, mode_t *mode); |
| |
| int get_modes(mode_t *mode, int *count); |
| int set_user_mode(mode_t *mode); |
| |
| 693,13 → 690,10 |
|---|
| * otherwise it should provide enough functionalities |
| * for shadowfb to run |
| */ |
| if( radeon_modeset ) |
| { |
| r = radeon_modeset_init(rdev); |
| if (r) { |
| return r; |
| } |
| }; |
| return 0; |
| } |
| |
| 708,12 → 702,12 |
|---|
| |
| int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent) |
| { |
| static struct drm_device *dev; |
| struct drm_device *dev; |
| int ret; |
| |
| ENTER(); |
| |
| dev = kzalloc(sizeof(*dev), 0); |
| dev = malloc(sizeof(*dev)); |
| if (!dev) |
| return -ENOMEM; |
| |
| 742,9 → 736,6 |
|---|
| // 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 |
| init_display(dev->dev_private, &usermode); |
| |
| LEAVE(); |
| 845,8 → 836,7 |
|---|
| dbgprintf("SRV_ENUM_MODES inp %x inp_size %x out_size %x\n", |
| inp, io->inp_size, io->out_size ); |
| |
| if( radeon_modeset && |
| (outp != NULL) && (io->out_size == 4) && |
| if( (outp != NULL) && (io->out_size == 4) && |
| (io->inp_size == *outp * sizeof(mode_t)) ) |
| { |
| retval = get_modes((mode_t*)inp, outp); |
| 854,28 → 844,25 |
|---|
| break; |
| |
| case SRV_SET_MODE: |
| dbgprintf("SRV_SET_MODE inp %x inp_size %x\n", |
| inp, io->inp_size); |
| |
| if( radeon_modeset && |
| (inp != NULL) && |
| if( (inp != NULL) && |
| (io->inp_size == sizeof(mode_t)) ) |
| { |
| retval = set_user_mode((mode_t*)inp); |
| }; |
| break; |
| |
| }; |
| |
| return retval; |
| } |
| |
| u32_t drvEntry(int action, char *cmdline) |
| { |
| static char log[256]; |
| static dev_t device; |
| |
| u32_t drvEntry(int action, char *cmdline) |
| { |
| struct pci_device_id *ent; |
| |
| dev_t device; |
| int err; |
| u32_t retval = 0; |
| |
| 898,7 → 885,6 |
|---|
| return 0; |
| }; |
| } |
| dbgprintf("Radeon RC05 cmdline %s\n", cmdline); |
| |
| enum_pci_devices(); |
| |
| 915,10 → 901,6 |
|---|
| |
| err = drm_get_dev(&device.pci_dev, ent); |
| |
| err = RegService("DISPLAY", display_handler); |
| return RegService("DISPLAY", display_handler); |
| |
| if( err != 0) |
| dbgprintf("Set DISPLAY handler\n"); |
| |
| return err; |
| }; |