diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-01-03 11:39:21 -0500 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-01-11 15:37:06 -0500 |
commit | 759010728b1323aec03c5baae13fde8f76e44a99 (patch) | |
tree | 1a9da2a6e114c45f2140aebc458b8e1833256478 /drivers/gpu/drm | |
parent | dbdc647927a0f4b34e7cf486889d8f671f73d2e5 (diff) |
drm/i915: Remove impossible test
As has_gem is unconditionally set to true, the conditional immediately
following that assignment is superfluous.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 0568dbdc10ef..844f3c972b04 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c | |||
@@ -1962,13 +1962,6 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) | |||
1962 | /* enable GEM by default */ | 1962 | /* enable GEM by default */ |
1963 | dev_priv->has_gem = 1; | 1963 | dev_priv->has_gem = 1; |
1964 | 1964 | ||
1965 | if (dev_priv->has_gem == 0 && | ||
1966 | drm_core_check_feature(dev, DRIVER_MODESET)) { | ||
1967 | DRM_ERROR("kernel modesetting requires GEM, disabling driver.\n"); | ||
1968 | ret = -ENODEV; | ||
1969 | goto out_workqueue_free; | ||
1970 | } | ||
1971 | |||
1972 | dev->driver->get_vblank_counter = i915_get_vblank_counter; | 1965 | dev->driver->get_vblank_counter = i915_get_vblank_counter; |
1973 | dev->max_vblank_count = 0xffffff; /* only 24 bits of frame count */ | 1966 | dev->max_vblank_count = 0xffffff; /* only 24 bits of frame count */ |
1974 | if (IS_G4X(dev) || IS_GEN5(dev) || IS_GEN6(dev)) { | 1967 | if (IS_G4X(dev) || IS_GEN5(dev) || IS_GEN6(dev)) { |
@@ -2055,7 +2048,6 @@ out_gem_unload: | |||
2055 | 2048 | ||
2056 | intel_teardown_gmbus(dev); | 2049 | intel_teardown_gmbus(dev); |
2057 | intel_teardown_mchbar(dev); | 2050 | intel_teardown_mchbar(dev); |
2058 | out_workqueue_free: | ||
2059 | destroy_workqueue(dev_priv->wq); | 2051 | destroy_workqueue(dev_priv->wq); |
2060 | out_iomapfree: | 2052 | out_iomapfree: |
2061 | io_mapping_free(dev_priv->mm.gtt_mapping); | 2053 | io_mapping_free(dev_priv->mm.gtt_mapping); |