Subversion Repositories Kolibri OS

Rev

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

Rev 1430 Rev 1630
Line 563... Line 563...
563 
	atom_card_info->mc_write = cail_mc_write;
 563 
	atom_card_info->mc_write = cail_mc_write;
564 
	atom_card_info->pll_read = cail_pll_read;
 564 
	atom_card_info->pll_read = cail_pll_read;
565 
	atom_card_info->pll_write = cail_pll_write;
 565 
	atom_card_info->pll_write = cail_pll_write;
Line 566... Line 566...
566 
 
 566 
 
- 
 
 567 
	rdev->mode_info.atom_context = atom_parse(atom_card_info, rdev->bios);
567 
	rdev->mode_info.atom_context = atom_parse(atom_card_info, rdev->bios);
 568 
	mutex_init(&rdev->mode_info.atom_context->mutex);
568 
    radeon_atom_initialize_bios_scratch_regs(rdev->ddev);
 569 
    radeon_atom_initialize_bios_scratch_regs(rdev->ddev);
569 
	atom_allocate_fb_scratch(rdev->mode_info.atom_context);
 570 
	atom_allocate_fb_scratch(rdev->mode_info.atom_context);
570 
    return 0;
 571 
    return 0;
Line 709... Line 710...
709 
    rdev->mc.gtt_size = radeon_gart_size * 1024 * 1024;
 710 
    rdev->mc.gtt_size = radeon_gart_size * 1024 * 1024;
710 
    rdev->gpu_lockup = false;
 711 
    rdev->gpu_lockup = false;
711 
	rdev->accel_working = false;
 712 
	rdev->accel_working = false;
712 
    /* mutex initialization are all done here so we
 713 
    /* mutex initialization are all done here so we
713 
     * can recall function without having locking issues */
 714 
     * can recall function without having locking issues */
714 
 //   mutex_init(&rdev->cs_mutex);
 715 
    mutex_init(&rdev->cs_mutex);
715 
 //   mutex_init(&rdev->ib_pool.mutex);
 716 
    mutex_init(&rdev->ib_pool.mutex);
716 
 //   mutex_init(&rdev->cp.mutex);
 717 
    mutex_init(&rdev->cp.mutex);
- 
 
 718 
	mutex_init(&rdev->dc_hw_i2c_mutex);
- 
 
 719 
	mutex_init(&rdev->gem.mutex);
- 
 
 720 
	mutex_init(&rdev->pm.mutex);
717 
 //   rwlock_init(&rdev->fence_drv.lock);
 721 
 //   rwlock_init(&rdev->fence_drv.lock);
Line 718... Line 722...
718 
 
 722 
 
719 
	/* Set asic functions */
 723 
	/* Set asic functions */
720 
	r = radeon_asic_init(rdev);
 724 
	r = radeon_asic_init(rdev);
Line 757... Line 761...
757 
        return -ENOMEM;
 761 
        return -ENOMEM;
758 
    }
 762 
    }
759 
    DRM_INFO("register mmio base: 0x%08X\n", (uint32_t)rdev->rmmio_base);
 763 
    DRM_INFO("register mmio base: 0x%08X\n", (uint32_t)rdev->rmmio_base);
760 
    DRM_INFO("register mmio size: %u\n", (unsigned)rdev->rmmio_size);
 764 
    DRM_INFO("register mmio size: %u\n", (unsigned)rdev->rmmio_size);
Line 761... Line -...
761 
 
 - 
 
762 
	/* if we have > 1 VGA cards, then disable the radeon VGA resources */
 - 
 
763 
	/* this will fail for cards that aren't VGA class devices, just
 - 
 
764 
	 * ignore it */
 - 
 
765 
//	r = vga_client_register(rdev->pdev, rdev, NULL, radeon_vga_set_decode);
 - 
 
766 
//	if (r) {
 - 
 
767 
//		return -EINVAL;
 - 
 
768 
//	}
 - 
 
769 
 
 765 
 
770 
	r = radeon_init(rdev);
 766 
	r = radeon_init(rdev);
771 
	if (r)
 767 
	if (r)
Line 772... Line 768...
772 
            return r;
 768 
            return r;
Line 870... Line 866...
870 
 
 866 
 
871 
    dev->pdev = pdev;
 867 
    dev->pdev = pdev;
872 
    dev->pci_device = pdev->device;
 868 
    dev->pci_device = pdev->device;
Line -... Line 869...
- 
 
 869 
    dev->pci_vendor = pdev->vendor;
- 
 
 870 
 
- 
 
 871 
    INIT_LIST_HEAD(&dev->filelist);
- 
 
 872 
    INIT_LIST_HEAD(&dev->ctxlist);
- 
 
 873 
    INIT_LIST_HEAD(&dev->vmalist);
- 
 
 874 
    INIT_LIST_HEAD(&dev->maplist);
- 
 
 875 
 
- 
 
 876 
    spin_lock_init(&dev->count_lock);
- 
 
 877 
    spin_lock_init(&dev->drw_lock);
- 
 
 878 
    mutex_init(&dev->struct_mutex);
- 
 
 879 
    mutex_init(&dev->ctxlist_mutex);
873 
    dev->pci_vendor = pdev->vendor;
 880 
 
874 
 
 881 
 
875 
    ret = radeon_driver_load_kms(dev, ent->driver_data );
 882 
    ret = radeon_driver_load_kms(dev, ent->driver_data );
Line 876... Line 883...
876 
    if (ret)
 883 
    if (ret)
Line 1035... Line 1042...
1035 
        };
 1042 
        };
1036 
    }
 1043 
    }
1037 
    dbgprintf("Radeon RC10 cmdline %s\n", cmdline);
 1044 
    dbgprintf("Radeon RC10 cmdline %s\n", cmdline);
Line 1038... Line 1045...
1038 
 
 1045 
 
1039 
    enum_pci_devices();
 - 
 
1040 
 
 1046 
    enum_pci_devices();
Line 1041... Line 1047...
1041 
    ent = find_pci_device(&device, pciidlist);
 1047 
    ent = find_pci_device(&device, pciidlist);
1042 
 
 1048 
 
1043 
    if( unlikely(ent == NULL) )
 1049 
    if( unlikely(ent == NULL) )