WebSVN – Kolibri OS – Diff – /drivers/video/drm/i915/i915_dma.c

         value = 1;
 		break;
 	case I915_PARAM_HAS_PINNED_BATCHES:
 		value = 1;
 		break;
+	case I915_PARAM_HAS_EXEC_NO_RELOC:
+		value = 1;
+        break;
+	case I915_PARAM_HAS_EXEC_HANDLE_LUT:
+        value = 1;
+        break;
 	default:
 		DRM_DEBUG_DRIVER("Unknown parameter %d\n",
 				 param->param);
 		return -EINVAL;
+	}
 	return 0;
+}
 #endif
-static int i915_set_status_page(struct drm_device *dev, void *data,
-				struct drm_file *file_priv)
-{
-	drm_i915_private_t *dev_priv = dev->dev_private;
-	drm_i915_hws_addr_t *hws = data;
-	struct intel_ring_buffer *ring;
-	if (drm_core_check_feature(dev, DRIVER_MODESET))
-		return -ENODEV;
-	if (!I915_NEED_GFX_HWS(dev))
-		return -EINVAL;
-	if (!dev_priv) {
-		DRM_ERROR("called with no initialization\n");
-		return -EINVAL;
-	}
-	if (drm_core_check_feature(dev, DRIVER_MODESET)) {
-		WARN(1, "tried to set status page when mode setting active\n");
-		return 0;
-	}
-	DRM_DEBUG_DRIVER("set status page addr 0x%08x\n", (u32)hws->addr);
-	ring = LP_RING(dev_priv);
-	ring->status_page.gfx_addr = hws->addr & (0x1ffff<<12);
-	dev_priv->dri1.gfx_hws_cpu_addr =
-        ioremap(dev_priv->mm.gtt_base_addr + hws->addr, 4096);
-	if (dev_priv->dri1.gfx_hws_cpu_addr == NULL) {
-		i915_dma_cleanup(dev);
-		ring->status_page.gfx_addr = 0;
-		DRM_ERROR("can not ioremap virtual address for"
-				" G33 hw status page\n");
-		return -ENOMEM;
-	}
-    memset(dev_priv->dri1.gfx_hws_cpu_addr, 0, PAGE_SIZE);
-	I915_WRITE(HWS_PGA, ring->status_page.gfx_addr);
-	DRM_DEBUG_DRIVER("load hws HWS_PGA with gfx mem 0x%x\n",
-			 ring->status_page.gfx_addr);
-	DRM_DEBUG_DRIVER("load hws at %p\n",
-			 ring->status_page.page_addr);
 	return 0;
 	 */
 	ret = i915_gem_init_stolen(dev);
 	if (ret)
 		goto cleanup_vga_switcheroo;
+	ret = drm_irq_install(dev);
+	if (ret)
+		goto cleanup_gem_stolen;
+	/* Important: The output setup functions called by modeset_init need
 	 * working irqs for e.g. gmbus and dp aux transfers. */
     intel_modeset_init(dev);
 	ret = i915_gem_init(dev);
-    if (ret)
-		goto cleanup_gem_stolen;
+    if (ret)
-    intel_modeset_gem_init(dev);
 		goto cleanup_irq;
 	ret = drm_irq_install(dev);
 	if (ret)
-		goto cleanup_gem;
+    intel_modeset_gem_init(dev);
     /* Always safe in the mode setting case. */
+    /* FIXME: do pre/post-mode set stuff in core KMS code */
+    dev->vblank_disable_allowed = 1;
+    ret = intel_fbdev_init(dev);
+    if (ret)
+		goto cleanup_gem;
+	/* Only enable hotplug handling once the fbdev is fully set up. */
+	intel_hpd_init(dev);
+	/*
+	 * Some ports require correctly set-up hpd registers for detection to
+	 * work properly (leading to ghost connected connector status), e.g. VGA
+	 * on gm45.  Hence we can only set up the initial fbdev config after hpd
+	 * irqs are fully enabled. Now we should scan for the initial config
+	 * only once hotplug handling is enabled, but due to screwed-up locking
+	 * around kms/fbdev init we can't protect the fdbev initial config
+	 * scanning against hotplug events. Hence do this first and ignore the
-    /* FIXME: do pre/post-mode set stuff in core KMS code */
+	 * tiny window where we will loose hotplug notifactions.
-    dev->vblank_disable_allowed = 1;
+	 */
 	intel_fbdev_initial_config(dev);
     ret = intel_fbdev_init(dev);
+	/* Only enable hotplug handling once the fbdev is fully set up. */
+	dev_priv->enable_hotplug_processing = true;
+	drm_kms_helper_poll_init(dev);
-    if (ret)
+    /* We're off and running w/KMS */
-        goto cleanup_irq;
+    dev_priv->mm.suspended = 0;
-//    drm_kms_helper_poll_init(dev);
-    /* We're off and running w/KMS */
-    dev_priv->mm.suspended = 0;
     return 0;
-cleanup_irq:
+cleanup_gem:
-//    drm_irq_uninstall(dev);
+	mutex_lock(&dev->struct_mutex);
         DRM_ERROR("failed to map registers\n");
         ret = -EIO;
 		goto put_gmch;
+    }
-	aperture_size = dev_priv->mm.gtt->gtt_mappable_entries << PAGE_SHIFT;
-	dev_priv->mm.gtt_base_addr = dev_priv->mm.gtt->gma_bus_addr;
+	aperture_size = dev_priv->gtt.mappable_end;
      * be lost or delayed, but we use them anyways to avoid
      * stuck interrupts on some machines.
      */
     spin_lock_init(&dev_priv->irq_lock);
-    spin_lock_init(&dev_priv->error_lock);
+	spin_lock_init(&dev_priv->gpu_error.lock);
 	spin_lock_init(&dev_priv->rps.lock);
-	spin_lock_init(&dev_priv->dpio_lock);
+	mutex_init(&dev_priv->dpio_lock);
 	mutex_init(&dev_priv->rps.hw_lock);
-	mutex_init(&dev_priv->rps.hw_lock);
+	mutex_init(&dev_priv->modeset_restore_lock);
 	if (IS_IVYBRIDGE(dev) || IS_HASWELL(dev))
 //	}
 //	io_mapping_free(dev_priv->mm.gtt_mapping);
 out_rmmap:
     pci_iounmap(dev->pdev, dev_priv->regs);
 put_gmch:
-//   intel_gmch_remove();
+//	dev_priv->gtt.gtt_remove(dev);
 put_bridge:
 //    pci_dev_put(dev_priv->bridge_dev);
 free_priv:
     kfree(dev_priv);
     return ret;
 	mutex_unlock(&dev->struct_mutex);
 	/* Cancel the retire work handler, which should be idle now. */
 	cancel_delayed_work_sync(&dev_priv->mm.retire_work);
-	io_mapping_free(dev_priv->mm.gtt_mapping);
+	io_mapping_free(dev_priv->gtt.mappable);
 	if (dev_priv->mm.gtt_mtrr >= 0) {
 		mtrr_del(dev_priv->mm.gtt_mtrr,
-			 dev_priv->mm.gtt_base_addr,
+			 dev_priv->gtt.mappable_base,
-			 dev_priv->mm.gtt->gtt_mappable_entries * PAGE_SIZE);
+			 dev_priv->gtt.mappable_end);
 		dev_priv->mm.gtt_mtrr = -1;
 		vga_switcheroo_unregister_client(dev->pdev);
 		vga_client_register(dev->pdev, NULL, NULL, NULL);
+	}
 	/* Free error state after interrupts are fully disabled. */
-	del_timer_sync(&dev_priv->hangcheck_timer);
+	del_timer_sync(&dev_priv->gpu_error.hangcheck_timer);
-	cancel_work_sync(&dev_priv->error_work);
+	cancel_work_sync(&dev_priv->gpu_error.work);
 	i915_destroy_error_state(dev);
 		i915_gem_cleanup_ringbuffer(dev);
 		i915_gem_context_fini(dev);
 		mutex_unlock(&dev->struct_mutex);
 		i915_gem_cleanup_aliasing_ppgtt(dev);
 		i915_gem_cleanup_stolen(dev);
-		drm_mm_takedown(&dev_priv->mm.stolen);
-		intel_cleanup_overlay(dev);
 		if (!I915_NEED_GFX_HWS(dev))
 			i915_free_hws(dev);
 	intel_teardown_gmbus(dev);
 	intel_teardown_mchbar(dev);
+	destroy_workqueue(dev_priv->wq);
+	pm_qos_remove_request(&dev_priv->pm_qos);
 	if (dev_priv->slab)
-	destroy_workqueue(dev_priv->wq);
+		kmem_cache_destroy(dev_priv->slab);

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/i915/i915_dma.c – Rev 3298 → 3480