Re: [Intel-gfx] [PATCH -next] drm/i915/gt: Fix build error without CONFIG_PM

2022-05-06 Thread Andi Shyti 
Hi YueHaibing,

On Fri, May 06, 2022 at 11:26:52AM +0800, YueHaibing wrote:
> 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: 56a709cf7746 ("drm/i915/gt: Create per-tile RPS sysfs interfaces")
> Signed-off-by: YueHaibing 

Reviewed-by: Andi Shyti 

Thanks,
Andi

> ---
>  drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c 
> b/drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c
> index 26cbfa6477d1..e92990d514b2 100644
> --- a/drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c
> +++ b/drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c
> @@ -17,7 +17,6 @@
>  #include "intel_rc6.h"
>  #include "intel_rps.h"
>  
> -#ifdef CONFIG_PM
>  enum intel_gt_sysfs_op {
>   INTEL_GT_SYSFS_MIN = 0,
>   INTEL_GT_SYSFS_MAX,
> @@ -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) \
>   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)
>  {
>   intel_wakeref_t wakeref;
> -- 
> 2.17.1

Re: [Intel-gfx] [PATCH -next] drm/i915/gt: Fix build error without CONFIG_PM

2022-05-06 Thread Tvrtko Ursulin 



On 06/05/2022 04:26, YueHaibing wrote:

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: 56a709cf7746 ("drm/i915/gt: Create per-tile RPS sysfs interfaces")
Signed-off-by: YueHaibing 


Reviewed-by: Tvrtko Ursulin 

Thanks for the fix, will merge.

Regards,

Tvrtko


---
  drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c 
b/drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c
index 26cbfa6477d1..e92990d514b2 100644
--- a/drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c
+++ b/drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c
@@ -17,7 +17,6 @@
  #include "intel_rc6.h"
  #include "intel_rps.h"
  
-#ifdef CONFIG_PM

  enum intel_gt_sysfs_op {
INTEL_GT_SYSFS_MIN = 0,
INTEL_GT_SYSFS_MAX,
@@ -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) \
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)
  {
intel_wakeref_t wakeref;