diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2017-03-03 17:19:28 +0200 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2017-04-05 13:22:37 +0300 |
| commit | ff4c3b76eefe3c9c52326250c6701149d0985fb6 (patch) | |
| tree | 46e900c812f09b72e438534fdc19b6e5e33d0e87 /drivers/gpu/drm/i915/i915_drv.c | |
| parent | a07102f1cce6ebf11f8d880665eb6f6353b16177 (diff) | |
| download | op-kernel-dev-ff4c3b76eefe3c9c52326250c6701149d0985fb6.zip op-kernel-dev-ff4c3b76eefe3c9c52326250c6701149d0985fb6.tar.gz | |
drm/i915: Enable atomic on VLV/CHV
VLV/CHV watermarks are now able to handle the radiation, so
mark these platforms as ready for atomic.
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Suggested-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170303151928.23053-5-ville.syrjala@linux.intel.com
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 0b38116..0595600 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -1213,9 +1213,8 @@ 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+, except vlv/chv */ - if (!i915.nuclear_pageflip && - (match_info->gen < 5 || match_info->has_gmch_display)) + /* Enable nuclear pageflip on ILK+ */ + if (!i915.nuclear_pageflip && match_info->gen < 5) driver.driver_features &= ~DRIVER_ATOMIC; ret = -ENOMEM; |
