Merge tag 'drm-intel-next-2018-09-21' of git://anongit.freedesktop.org/drm/drm-intel...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / i915 / i915_drv.c

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index dbe40b21fef884a40349932ccef60485aee2712e..44e2c0f5ec502bc1a6c27007c77d56df89019ce3 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1684,14 +1684,14 @@ 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;
-
        dev_priv = i915_driver_create(pdev, ent);
        if (!dev_priv)
                return -ENOMEM;
 
+       /* 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;