[CI 23/23] drm/i915: Enable atomic on g4x

[Harish Chegondi]

From: Ville Syrjälä <ville.syrjala at linux.intel.com>

With all known CxSR issus sorted it's time to enbable DRIVER_ATOMIC
on g4x. We already did that on vlv/chv long ago even though they
were mostly suffering from the CxSR issues.

Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
---
 drivers/gpu/drm/i915/i915_drv.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 1ad88e6d7c04..03d98c5e31f7 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1856,9 +1856,11 @@ int i915_driver_load(struct pci_dev *pdev, const struct pci_device_id *ent)
 	if (IS_ERR(dev_priv))
 		return PTR_ERR(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;
+	/* Enable nuclear pageflip on g4x+ */
+	if (!i915_modparams.nuclear_pageflip &&
+	    match_info->gen < 5 &&
+	    !(match_info->platform & (BIT(INTEL_G45) | BIT(INTEL_GM45))))
+		driver.driver_features &= ~DRIVER_ATOMIC;
 
 	ret = pci_enable_device(pdev);
 	if (ret)
-- 
2.20.1