leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/i915: Probe whether SAGV works on pre-icl

Browse Source 
Instead of leaving the SAGV enable/disable to the first commit
let's try to disable it first thing to see if we can do it or
not (disabling SAGV is a safe thing to at any time). This avoids
running the code in this funny intermediate state where we don't
know if SAGV is available or not.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220309164948.10671-4-ville.syrjala@linux.intel.com
Reviewed-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
This commit is contained in:
Ville Syrjälä
2022-03-09 18:49:43 +02:00
parent c0074e71bf
commit 15fc156f22
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/gpu/drm/i915/intel_pm.c
View File

@@ -57,6 +57,8 @@
#include "vlv_sideband.h" #include "vlv_sideband.h"
#include "../../../platform/x86/intel_ips.h" #include "../../../platform/x86/intel_ips.h"
static int intel_disable_sagv(struct drm_i915_private *dev_priv);
struct drm_i915_clock_gating_funcs { struct drm_i915_clock_gating_funcs {
void (*init_clock_gating)(struct drm_i915_private *i915); void (*init_clock_gating)(struct drm_i915_private *i915);
}; };
@@ -3697,6 +3699,18 @@ intel_sagv_block_time(struct drm_i915_private *dev_priv)
static void intel_sagv_init(struct drm_i915_private *i915) static void intel_sagv_init(struct drm_i915_private *i915)
{ {
if (!intel_has_sagv(i915))
i915->sagv_status = I915_SAGV_NOT_CONTROLLED;
/*
* Probe to see if we have working SAGV control.
* For icl+ this was already determined by intel_bw_init_hw().
*/
if (DISPLAY_VER(i915) < 11)
intel_disable_sagv(i915);
drm_WARN_ON(&i915->drm, i915->sagv_status == I915_SAGV_UNKNOWN);
i915->sagv_block_time_us = intel_sagv_block_time(i915); i915->sagv_block_time_us = intel_sagv_block_time(i915);
drm_dbg_kms(&i915->drm, "SAGV supported: %s, original SAGV block time: %u us\n", drm_dbg_kms(&i915->drm, "SAGV supported: %s, original SAGV block time: %u us\n",