|
@@ -1336,10 +1336,6 @@ int i915_driver_load(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
|
struct drm_i915_private *dev_priv;
|
|
|
int ret;
|
|
|
|
|
|
- /* Enable nuclear pageflip on ILK+ */
|
|
|
- if (!i915_modparams.nuclear_pageflip && match_info->gen < 5)
|
|
|
- driver.driver_features &= ~DRIVER_ATOMIC;
|
|
|
-
|
|
|
ret = -ENOMEM;
|
|
|
dev_priv = kzalloc(sizeof(*dev_priv), GFP_KERNEL);
|
|
|
if (dev_priv)
|
|
@@ -1352,6 +1348,10 @@ int i915_driver_load(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
|
dev_priv->drm.pdev = pdev;
|
|
|
dev_priv->drm.dev_private = dev_priv;
|
|
|
|
|
|
+ /* Disable nuclear pageflip by default on pre-ILK */
|
|
|
+ if (!i915_modparams.nuclear_pageflip && match_info->gen < 5)
|
|
|
+ dev_priv->drm.driver_features &= ~DRIVER_ATOMIC;
|
|
|
+
|
|
|
ret = pci_enable_device(pdev);
|
|
|
if (ret)
|
|
|
goto out_fini;
|