Commit 17fa6463 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: Remove DRIVER_MODESET checks in load/unload/close code 



UMS is gone, this is dead code.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 686135da

drivers/gpu/drm/i915/i915_dma.c

+37 −58
Original line number Diff line number Diff line
@@ -722,17 +722,6 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) 


	info = (struct intel_device_info *) flags;



	/* Refuse to load on gen6+ without kms enabled. */

	if (info->gen >= 6 && !drm_core_check_feature(dev, DRIVER_MODESET)) {

		DRM_INFO("Your hardware requires kernel modesetting (KMS)\n");

		DRM_INFO("See CONFIG_DRM_I915_KMS, nomodeset, and i915.modeset parameters\n");

		return -ENODEV;

	}



	/* UMS needs agp support. */

	if (!drm_core_check_feature(dev, DRIVER_MODESET) && !dev->agp)

		return -EINVAL;



	dev_priv = kzalloc(sizeof(*dev_priv), GFP_KERNEL);

	if (dev_priv == NULL)

		return -ENOMEM;
@@ -802,7 +791,6 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) 
	if (ret)

		goto out_regs;



	if (drm_core_check_feature(dev, DRIVER_MODESET)) {

	/* WARNING: Apparently we must kick fbdev drivers before vgacon,

	 * otherwise the vga fbdev driver falls over. */

	ret = i915_kick_out_firmware_fb(dev_priv);
@@ -816,7 +804,6 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) 
		DRM_ERROR("failed to remove conflicting VGA console\n");

		goto out_gtt;

	}

	}



	pci_set_master(dev->pdev);
@@ -919,13 +906,11 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) 


	intel_power_domains_init(dev_priv);



	if (drm_core_check_feature(dev, DRIVER_MODESET)) {

	ret = i915_load_modeset_init(dev);

	if (ret < 0) {

		DRM_ERROR("failed to init modeset\n");

		goto out_power_well;

	}

	}



	/*

	 * Notify a valid surface after modesetting,
@@ -1013,12 +998,10 @@ int i915_driver_unload(struct drm_device *dev) 


	acpi_video_unregister();



	if (drm_core_check_feature(dev, DRIVER_MODESET))

	intel_fbdev_fini(dev);



	drm_vblank_cleanup(dev);



	if (drm_core_check_feature(dev, DRIVER_MODESET)) {

	intel_modeset_cleanup(dev);



	/*
@@ -1033,7 +1016,6 @@ int i915_driver_unload(struct drm_device *dev) 


	vga_switcheroo_unregister_client(dev->pdev);

	vga_client_register(dev->pdev, NULL, NULL, NULL);

	}



	/* Free error state after interrupts are fully disabled. */

	cancel_delayed_work_sync(&dev_priv->gpu_error.hangcheck_work);
@@ -1044,7 +1026,6 @@ int i915_driver_unload(struct drm_device *dev) 


	intel_opregion_fini(dev);



	if (drm_core_check_feature(dev, DRIVER_MODESET)) {

	/* Flush any outstanding unpin_work. */

	flush_workqueue(dev_priv->wq);
@@ -1054,7 +1035,6 @@ int i915_driver_unload(struct drm_device *dev) 
	i915_gem_context_fini(dev);

	mutex_unlock(&dev->struct_mutex);

	i915_gem_cleanup_stolen(dev);

	}



	intel_teardown_gmbus(dev);

	intel_teardown_mchbar(dev);
@@ -1115,7 +1095,6 @@ void i915_driver_preclose(struct drm_device *dev, struct drm_file *file) 
	i915_gem_release(dev, file);

	mutex_unlock(&dev->struct_mutex);



	if (drm_core_check_feature(dev, DRIVER_MODESET))

	intel_modeset_preclose(dev, file);

}