diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2018-09-26 11:24:04 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2018-09-26 11:24:04 +0300 |
| commit | 2863b00941bc3062ea3299ed4057acfd9e52c335 (patch) | |
| tree | bf378837a55e57e4189e9877170fd2b0d288f587 /drivers/gpu/drm/i915/i915_drv.c | |
| parent | fc3fed5d297b51f9e2c7d4f969c95c0d6e50ca57 (diff) | |
| parent | 36c9c3c91128e2b892c9be0dd9ee9bd82cbe82ad (diff) | |
| download | linux-2863b00941bc3062ea3299ed4057acfd9e52c335.tar.bz2 | |
Merge drm/drm-next into drm-intel-next-queued
Catch up in general, and get DP_EXTENDED_RECEIVER_CAP_FIELD_PRESENT
specifically.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index dbe40b21fef8..44e2c0f5ec50 100644 --- 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; |