summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/i915/intel_clock_gating.c
diff options
context:
space:
mode:
authorMatt Roper <matthew.d.roper@intel.com>2023-09-06 16:47:37 -0700
committerMatt Roper <matthew.d.roper@intel.com>2023-09-08 15:45:46 -0700
commitda1bc5cc3b55af2d785c6dd02c3b461f89f51adf (patch)
tree61bd95e2958bb49b780533322e85df9218ba1b11 /drivers/gpu/drm/i915/intel_clock_gating.c
parent53dd7b1fb4e54d5f029824636b6d17504a4fe80c (diff)
drm/i915/display: Apply workarounds during display init
Rather than applying display workarounds as part of intel_clock_gating_init() (which in turn is confusingly called from i915_gem_init during device probe), handle them at the point we're actually initializing the display hardware. This will also ensure that these workarounds are properly applied during display initialization on the Xe driver, which re-uses i915's display code, but does not call i915's gem init. Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20230906234732.3728630-10-matthew.d.roper@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_clock_gating.c')
-rw-r--r--drivers/gpu/drm/i915/intel_clock_gating.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_clock_gating.c b/drivers/gpu/drm/i915/intel_clock_gating.c
index 7b0c1bcaa05d..6589bb04e788 100644
--- a/drivers/gpu/drm/i915/intel_clock_gating.c
+++ b/drivers/gpu/drm/i915/intel_clock_gating.c
@@ -28,7 +28,6 @@
#include "display/intel_de.h"
#include "display/intel_display.h"
#include "display/intel_display_trace.h"
-#include "display/intel_display_wa.h"
#include "display/skl_watermark.h"
#include "gt/intel_engine_regs.h"
@@ -758,8 +757,6 @@ static void i830_init_clock_gating(struct drm_i915_private *i915)
void intel_clock_gating_init(struct drm_i915_private *i915)
{
i915->clock_gating_funcs->init_clock_gating(i915);
-
- intel_display_wa_apply(i915);
}
static void nop_init_clock_gating(struct drm_i915_private *i915)