From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> The watermark code for ctg/elk has been atomic ready for a long time so let's just flip the switch now that some of the last CxSR issues have been sorted out (which granted was a problem for vlv/chv as well despite them already having atomic enabled by default). Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> --- drivers/gpu/drm/i915/i915_driver.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c index 0e224761d0ed..d4e544d6b28f 100644 --- a/drivers/gpu/drm/i915/i915_driver.c +++ b/drivers/gpu/drm/i915/i915_driver.c @@ -841,8 +841,11 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent) if (IS_ERR(i915)) return PTR_ERR(i915); - /* Disable nuclear pageflip by default on pre-ILK */ - if (!i915->params.nuclear_pageflip && match_info->graphics.ver < 5) + /* Disable nuclear pageflip by default on pre-CTG/ELK */ + if (!i915->params.nuclear_pageflip && + match_info->display.ver < 5 && + match_info->platform != INTEL_G45 && + match_info->platform != INTEL_GM45) i915->drm.driver_features &= ~DRIVER_ATOMIC; ret = pci_enable_device(pdev); -- 2.35.1
