Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff4c3b76 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

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: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170303151928.23053-5-ville.syrjala@linux.intel.com


Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
parent a07102f1

drivers/gpu/drm/i915/i915_drv.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -1213,9 +1213,8 @@ int i915_driver_load(struct pci_dev *pdev, const struct pci_device_id *ent) 
	struct drm_i915_private *dev_priv;

	struct drm_i915_private *dev_priv;

	int ret;

	int ret;





	/* Enable nuclear pageflip on ILK+, except vlv/chv */

	/* Enable nuclear pageflip on ILK+ */

	if (!i915.nuclear_pageflip &&

	if (!i915.nuclear_pageflip && match_info->gen < 5)

	    (match_info->gen < 5 || match_info->has_gmch_display))

		driver.driver_features &= ~DRIVER_ATOMIC;

		driver.driver_features &= ~DRIVER_ATOMIC;





	ret = -ENOMEM;

	ret = -ENOMEM;