Commit 43ab20c5 authored by YueHaibing's avatar YueHaibing Committed by Jani Nikula

drm/i915/gt: Fix build error without CONFIG_PM

drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c: In function ‘act_freq_mhz_show’:
drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c:276:20: error: implicit declaration of function ‘sysfs_gt_attribute_r_max_func’ [-Werror=implicit-function-declaration]
  276 |  u32 actual_freq = sysfs_gt_attribute_r_max_func(dev, attr,
      |                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Move sysfs_gt_attribute_* macros out of #ifdef block to fix this.

Fixes: 56a709cf ("drm/i915/gt: Create per-tile RPS sysfs interfaces")
Signed-off-by: default avatarYueHaibing <yuehaibing@huawei.com>
Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220506032652.1856-1-yuehaibing@huawei.com
(cherry picked from commit 09708b6d)
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent f83493f7
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
#include "intel_rc6.h" #include "intel_rc6.h"
#include "intel_rps.h" #include "intel_rps.h"
#ifdef CONFIG_PM
enum intel_gt_sysfs_op { enum intel_gt_sysfs_op {
INTEL_GT_SYSFS_MIN = 0, INTEL_GT_SYSFS_MIN = 0,
INTEL_GT_SYSFS_MAX, INTEL_GT_SYSFS_MAX,
...@@ -92,6 +91,7 @@ sysfs_gt_attribute_r_func(struct device *dev, struct device_attribute *attr, ...@@ -92,6 +91,7 @@ sysfs_gt_attribute_r_func(struct device *dev, struct device_attribute *attr,
#define sysfs_gt_attribute_r_max_func(d, a, f) \ #define sysfs_gt_attribute_r_max_func(d, a, f) \
sysfs_gt_attribute_r_func(d, a, f, INTEL_GT_SYSFS_MAX) sysfs_gt_attribute_r_func(d, a, f, INTEL_GT_SYSFS_MAX)
#ifdef CONFIG_PM
static u32 get_residency(struct intel_gt *gt, i915_reg_t reg) static u32 get_residency(struct intel_gt *gt, i915_reg_t reg)
{ {
intel_wakeref_t wakeref; intel_wakeref_t wakeref;
......
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