summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/i915/intel_device_info.c
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2022-10-08 00:11:08 +0300
committerVille Syrjälä <ville.syrjala@linux.intel.com>2022-10-10 20:24:37 +0300
commitbfc82b2277db8e2210aa31492998d6e806eae9e4 (patch)
tree5858dae96b63cddeb4ec92f7715f76403d3eb8b3 /drivers/gpu/drm/i915/intel_device_info.c
parentf38f614fa995f9555d7238df50253d550a7b5607 (diff)
downloadlinux-bfc82b2277db8e2210aa31492998d6e806eae9e4.tar.xz
drm/i915: Enable atomic by default on ctg/elk
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). v2: Rebase Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20221007211108.3883-2-ville.syrjala@linux.intel.com Acked-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_device_info.c')
-rw-r--r--drivers/gpu/drm/i915/intel_device_info.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
index b691b7c8c254..090097bb3c0a 100644
--- a/drivers/gpu/drm/i915/intel_device_info.c
+++ b/drivers/gpu/drm/i915/intel_device_info.c
@@ -508,8 +508,9 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv)
runtime->has_dsc = false;
}
- /* Disable nuclear pageflip by default on pre-ILK */
- if (!dev_priv->params.nuclear_pageflip && DISPLAY_VER(dev_priv) < 5)
+ /* Disable nuclear pageflip by default on pre-g4x */
+ if (!dev_priv->params.nuclear_pageflip &&
+ DISPLAY_VER(dev_priv) < 5 && !IS_G4X(dev_priv))
dev_priv->drm.driver_features &= ~DRIVER_ATOMIC;
}