Commit f3243b75 authored by Lucas De Marchi's avatar Lucas De Marchi

drm/i915: move intel_init_audio_hooks inside display

intel_init_audio_hooks() sets up hooks in the display struct and only
makes sense when we have display. Move it inside
intel_init_display_hooks() so it isn't called when we don't have
display.
Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20210213042756.953007-4-lucas.demarchi@intel.com
parent 141b415f
...@@ -12488,6 +12488,7 @@ static const struct drm_mode_config_funcs intel_mode_funcs = { ...@@ -12488,6 +12488,7 @@ static const struct drm_mode_config_funcs intel_mode_funcs = {
void intel_init_display_hooks(struct drm_i915_private *dev_priv) void intel_init_display_hooks(struct drm_i915_private *dev_priv)
{ {
intel_init_cdclk_hooks(dev_priv); intel_init_cdclk_hooks(dev_priv);
intel_init_audio_hooks(dev_priv);
intel_dpll_init_clock_hook(dev_priv); intel_dpll_init_clock_hook(dev_priv);
......
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
#include <drm/drm_probe_helper.h> #include <drm/drm_probe_helper.h>
#include "display/intel_acpi.h" #include "display/intel_acpi.h"
#include "display/intel_audio.h"
#include "display/intel_bw.h" #include "display/intel_bw.h"
#include "display/intel_cdclk.h" #include "display/intel_cdclk.h"
#include "display/intel_csr.h" #include "display/intel_csr.h"
...@@ -349,7 +348,6 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv) ...@@ -349,7 +348,6 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv)
intel_irq_init(dev_priv); intel_irq_init(dev_priv);
intel_init_display_hooks(dev_priv); intel_init_display_hooks(dev_priv);
intel_init_clock_gating_hooks(dev_priv); intel_init_clock_gating_hooks(dev_priv);
intel_init_audio_hooks(dev_priv);
intel_detect_preproduction_hw(dev_priv); intel_detect_preproduction_hw(dev_priv);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment