WebSVN – Kolibri OS – Diff – /drivers/video/drm/radeon/radeon_device.c

     DRM_ERROR("Invalid callback to write register 0x%04X with 0x%08X\n",
           reg, v);
     BUG_ON(1);
+}
 void radeon_register_accessor_init(struct radeon_device *rdev)
+{
     if (rdev->family < CHIP_RV515) {
 //        rdev->pcie_rreg = &rv370_pcie_rreg;
 //        rdev->pcie_wreg = &rv370_pcie_wreg;
+    }
     if (rdev->family >= CHIP_RV515) {
-//        rdev->pcie_rreg = &rv515_pcie_rreg;
+        rdev->pcie_rreg = &rv515_pcie_rreg;
-//        rdev->pcie_wreg = &rv515_pcie_wreg;
+        rdev->pcie_wreg = &rv515_pcie_wreg;
+    }
     /* FIXME: not sure here */
     if (rdev->family <= CHIP_R580) {
-//        rdev->pll_rreg = &r100_pll_rreg;
+        rdev->pll_rreg = &r100_pll_rreg;
-//        rdev->pll_wreg = &r100_pll_wreg;
+        rdev->pll_wreg = &r100_pll_wreg;
+    }
     if (rdev->family >= CHIP_RV515) {
         rdev->mc_rreg = &rv515_mc_rreg;
         rdev->mc_wreg = &rv515_mc_wreg;
+    }
     return 0;
+}
 void radeon_atombios_fini(struct radeon_device *rdev)
 {
-	free(rdev->mode_info.atom_context);
+	kfree(rdev->mode_info.atom_context);
+}
 int radeon_combios_init(struct radeon_device *rdev)
+}
 int radeon_modeset_init(struct radeon_device *rdev);
-void radeon_modeset_fini(struct radeon_device *rdev);
+void radeon_modeset_fini(struct radeon_device *rdev);
 void *ring_buffer;
 /*
  * Radeon device.
  */
  //   mutex_init(&rdev->cs_mutex);
  //   mutex_init(&rdev->ib_pool.mutex);
  //   mutex_init(&rdev->cp.mutex);
  //   rwlock_init(&rdev->fence_drv.lock);
+    ring_buffer = CreateRingBuffer( 1024*1024, PG_SW );
     if (radeon_agpmode == -1) {
         rdev->flags &= ~RADEON_IS_AGP;
         if (rdev->family > CHIP_RV515 ||
             rdev->family == CHIP_RV380 ||
     if (r) {
         return r;
+    }
     /* Report DMA addressing limitation */
-//    r = pci_set_dma_mask(rdev->pdev, DMA_BIT_MASK(32));
+    r = pci_set_dma_mask(rdev->pdev, DMA_BIT_MASK(32));
-//    if (r) {
+    if (r) {
-//        printk(KERN_WARNING "radeon: No suitable DMA available.\n");
+        printk(KERN_WARNING "radeon: No suitable DMA available.\n");
 //    }
     /* Registers mapping */
         r = radeon_combios_init(rdev);
         if (r) {
             return r;
+        }
+    }
     /* Reset gpu before posting otherwise ATOM will enter infinite loop */
     if (radeon_gpu_reset(rdev)) {
         /* FIXME: what do we want to do here ? */
+    }
     /* check if cards are posted or not */
     if (!radeon_card_posted(rdev) && rdev->bios) {
         DRM_INFO("GPU not posted. posting now...\n");
         if (rdev->is_atom_bios) {
             atom_asic_init(rdev->mode_info.atom_context);
     r = radeon_clocks_init(rdev);
     if (r) {
         return r;
+    }
-#if 0
     /* Initialize memory controller (also test AGP) */
     r = radeon_mc_init(rdev);
     if (r) {
         return r;
+    };
     /* Fence driver */
-    r = radeon_fence_driver_init(rdev);
+//    r = radeon_fence_driver_init(rdev);
-    if (r) {
+//    if (r) {
-        return r;
+//        return r;
-    }
+//    }
-    r = radeon_irq_kms_init(rdev);
+//    r = radeon_irq_kms_init(rdev);
-    if (r) {
+//    if (r) {
-        return r;
+//        return r;
 //    }
     /* Memory manager */
-    r = radeon_object_init(rdev);
+//    r = radeon_object_init(rdev);
-    if (r) {
+//    if (r) {
-        return r;
+//        return r;
 //    }
     /* Initialize GART (initialize after TTM so we can allocate
      * memory through TTM but finalize after TTM) */
     r = radeon_gart_enable(rdev);
-    if (!r) {
+//    if (!r) {
-        r = radeon_gem_init(rdev);
+//        r = radeon_gem_init(rdev);
 //    }
     /* 1M ring buffer */
     if (!r) {
         r = radeon_cp_init(rdev, 1024 * 1024);
     }
-    if (!r) {
+//    if (!r) {
-        r = radeon_wb_init(rdev);
+//        r = radeon_wb_init(rdev);
-        if (r) {
+//        if (r) {
-            DRM_ERROR("radeon: failled initializing WB (%d).\n", r);
+//            DRM_ERROR("radeon: failled initializing WB (%d).\n", r);
-            return r;
+//            return r;
+//        }
+//    }
 #if 0
     if (!r) {
         r = radeon_ib_pool_init(rdev);
         if (r) {

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/radeon/radeon_device.c – Rev 1117 → 1119