diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2023-01-25 10:41:16 +0100 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2023-01-25 10:41:16 +0100 |
| commit | 902ecddc95c68efe71be733c57e8976948537926 (patch) | |
| tree | cab01d5d8595a2fd554d1a18658e13e205294ce5 /drivers/gpu/drm/i915/selftests/i915_gem.c | |
| parent | drm/i915/dmc: Use unversioned path for ADLP (diff) | |
| parent | Merge tag 'drm-misc-next-2023-01-24' of git://anongit.freedesktop.org/drm/drm... (diff) | |
| download | linux-902ecddc95c68efe71be733c57e8976948537926.tar.xz linux-902ecddc95c68efe71be733c57e8976948537926.zip | |
Merge drm/drm-next into drm-intel-next
Backmerge to get the EDID handling changes.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/selftests/i915_gem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/selftests/i915_gem.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/selftests/i915_gem.c b/drivers/gpu/drm/i915/selftests/i915_gem.c index 0917315a67de..d91d0ade8abd 100644 --- a/drivers/gpu/drm/i915/selftests/i915_gem.c +++ b/drivers/gpu/drm/i915/selftests/i915_gem.c @@ -127,6 +127,8 @@ static void igt_pm_resume(struct drm_i915_private *i915) */ with_intel_runtime_pm(&i915->runtime_pm, wakeref) { i915_ggtt_resume(to_gt(i915)->ggtt); + if (GRAPHICS_VER(i915) >= 8) + setup_private_pat(to_gt(i915)); i915_gem_resume(i915); } } |