Merge tag 'drm-intel-gt-next-2022-11-03' of git://anongit.freedesktop.org/drm/drm...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / i915 / i915_driver.c

diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index 298ed36f078a8fee225f74d268e532af585ab3ae..c3d43f9b1e45dbaefcb341a27436889ea44464bf 100644 (file)
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -81,6 +81,7 @@
 #include "i915_drm_client.h"
 #include "i915_drv.h"
 #include "i915_getparam.h"
+#include "i915_hwmon.h"
 #include "i915_ioc32.h"
 #include "i915_ioctl.h"
 #include "i915_irq.h"
@@ -764,6 +765,8 @@ static void i915_driver_register(struct drm_i915_private *dev_priv)
        for_each_gt(gt, dev_priv, i)
                intel_gt_driver_register(gt);
 
+       i915_hwmon_register(dev_priv);
+
        intel_display_driver_register(dev_priv);
 
        intel_power_domains_enable(dev_priv);
@@ -796,6 +799,8 @@ static void i915_driver_unregister(struct drm_i915_private *dev_priv)
        for_each_gt(gt, dev_priv, i)
                intel_gt_driver_unregister(gt);
 
+       i915_hwmon_unregister(dev_priv);
+
        i915_perf_unregister(dev_priv);
        i915_pmu_unregister(dev_priv);
 
@@ -1656,7 +1661,8 @@ static int intel_runtime_suspend(struct device *kdev)
 
                intel_runtime_pm_enable_interrupts(dev_priv);
 
-               intel_gt_runtime_resume(to_gt(dev_priv));
+               for_each_gt(gt, dev_priv, i)
+                       intel_gt_runtime_resume(gt);
 
                enable_rpm_wakeref_asserts(rpm);