Skip to contentSkip to conversation

drm/amdgpu: fix build error without CONFIG_HSA_AMD

PATCH In review S, Shirish 3 participants 4 messages Sep 10, 2019 – Sep 11, 2019 3 messages not in the archive

Subsystems (2)
lore
Share & tools
lore

S, Shirish

author
#0 lore raw

PATCH 1/1 drm/amdgpu: fix build error without CONFIG_HSA_AMD

If CONFIG_HSA_AMD is not set, build fails:

drivers/gpu/drm/amd/amdgpu/amdgpu_device.o: In function `amdgpu_device_ip_early_init':
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:1626: undefined reference to `sched_policy'

Use CONFIG_HSA_AMD to guard this.

Fixes 1abb680ad371 ("drm/amdgpu: disable gfxoff while use no H/W scheduling policy")
---
 drivers/gpu/drm/amd/amdgpu/amdgpu.h        | 2 ++
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +2 -0
index 1030cb30720c..a1516a3ae9a8 100644
@@ -169,7 +169,9 @@ extern int amdgpu_discovery;
 extern int amdgpu_mes;
 extern int amdgpu_noretry;
 extern int amdgpu_force_asic_type;
+#ifdef CONFIG_HSA_AMD
 extern int sched_policy;
+#endif
 
 #ifdef CONFIG_DRM_AMDGPU_SI
 extern int amdgpu_si_support;
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +5 -1
index bd423dd64e18..2535db27f821 100644
@@ -1623,7 +1623,11 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev)
 	}
 
 	adev->pm.pp_feature = amdgpu_pp_feature_mask;
-	if (amdgpu_sriov_vf(adev) || sched_policy == KFD_SCHED_POLICY_NO_HWS)
+	if (amdgpu_sriov_vf(adev)
+	    #ifdef CONFIG_HSA_AMD
+	    || sched_policy == KFD_SCHED_POLICY_NO_HWS
+	    #endif
+	    )
 		adev->pm.pp_feature &= ~PP_GFXOFF_MASK;
 
 	for (i = 0; i < adev->num_ip_blocks; i++) {
Signature · 6 lines
2.20.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): [email protected]

Reviewed-by Huang Rui
#2 lore raw
Quoted 15 lines

-----Original Message-----
From: S, Shirish <[email protected]>
Sent: Tuesday, September 10, 2019 3:54 PM
To: Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Huang, Ray <[email protected]>
Cc: [email protected]; S, Shirish <[email protected]>
Subject: [PATCH] drm/amdgpu: fix build error without CONFIG_HSA_AMD

If CONFIG_HSA_AMD is not set, build fails:

drivers/gpu/drm/amd/amdgpu/amdgpu_device.o: In function `amdgpu_device_ip_early_init':
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:1626: undefined reference to `sched_policy'

Quoted 6 lines

Use CONFIG_HSA_AMD to guard this.

Fixes 1abb680ad371 ("drm/amdgpu: disable gfxoff while use no H/W

scheduling policy")

+ Felix for his awareness.

Quoted 38 lines
---
 drivers/gpu/drm/amd/amdgpu/amdgpu.h        | 2 ++
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -0
index 1030cb30720c..a1516a3ae9a8 100644
@@ -169,7 +169,9 @@ extern int amdgpu_discovery;  extern int

amdgpu_mes; extern int amdgpu_noretry; extern int amdgpu_force_asic_type;

drivers/gpu/drm/amd/amdgpu/amdgpu.h +2 -0
+#ifdef CONFIG_HSA_AMD
 extern int sched_policy;
+#endif
 
 #ifdef CONFIG_DRM_AMDGPU_SI
 extern int amdgpu_si_support;
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +5 -1
index bd423dd64e18..2535db27f821 100644
@@ -1623,7 +1623,11 @@ static int amdgpu_device_ip_early_init(struct
 amdgpu_device *adev)
 	}
 
 	adev->pm.pp_feature = amdgpu_pp_feature_mask;
-	if (amdgpu_sriov_vf(adev) || sched_policy ==
 KFD_SCHED_POLICY_NO_HWS)
+	if (amdgpu_sriov_vf(adev)
+	    #ifdef CONFIG_HSA_AMD
+	    || sched_policy == KFD_SCHED_POLICY_NO_HWS
+	    #endif
+	    )
 		adev->pm.pp_feature &= ~PP_GFXOFF_MASK;
Quoted 3 lines

for (i = 0; i < adev->num_ip_blocks; i++) {
--
2.20.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): MN2PR12MB33099B938972C6AF2437C92BECB60-rweVpJHSKTpWdvXm18W95QdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org

#4 lore raw

This is pretty ugly. See a suggestion inline.

Quoted 30 lines · Ray
Quoted 15 lines

-----Original Message-----
From: S, Shirish <[email protected]>
Sent: Tuesday, September 10, 2019 3:54 PM
To: Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Huang, Ray <[email protected]>
Cc: [email protected]; S, Shirish <[email protected]>
Subject: [PATCH] drm/amdgpu: fix build error without CONFIG_HSA_AMD

If CONFIG_HSA_AMD is not set, build fails:

drivers/gpu/drm/amd/amdgpu/amdgpu_device.o: In function `amdgpu_device_ip_early_init':
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:1626: undefined reference to `sched_policy'

Quoted 6 lines

Use CONFIG_HSA_AMD to guard this.

Fixes 1abb680ad371 ("drm/amdgpu: disable gfxoff while use no H/W

scheduling policy")

+ Felix for his awareness.

Quoted 5 lines
---
  drivers/gpu/drm/amd/amdgpu/amdgpu.h        | 2 ++
  drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 +++++-
  2 files changed, 7 insertions(+), 1 deletion(-)
Quoted 10 lines
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -0
index 1030cb30720c..a1516a3ae9a8 100644
@@ -169,7 +169,9 @@ extern int amdgpu_discovery;  extern int

amdgpu_mes; extern int amdgpu_noretry; extern int amdgpu_force_asic_type;
+#ifdef CONFIG_HSA_AMD
extern int sched_policy;

#else
static const int sched_policy = KFD_SCHED_POLICY_HWS; #endif

This way you don't need another set of ugly #ifdefs in amdgpu_device.c.

Regards,
  Felix

Quoted 23 lines
Quoted 23 lines
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -0
+#endif
 
  #ifdef CONFIG_DRM_AMDGPU_SI
  extern int amdgpu_si_support;
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +5 -1
index bd423dd64e18..2535db27f821 100644
@@ -1623,7 +1623,11 @@ static int amdgpu_device_ip_early_init(struct
 amdgpu_device *adev)
  	}
 
  	adev->pm.pp_feature = amdgpu_pp_feature_mask;
-	if (amdgpu_sriov_vf(adev) || sched_policy ==
 KFD_SCHED_POLICY_NO_HWS)
+	if (amdgpu_sriov_vf(adev)
+	    #ifdef CONFIG_HSA_AMD
+	    || sched_policy == KFD_SCHED_POLICY_NO_HWS
+	    #endif
+	    )
  		adev->pm.pp_feature &= ~PP_GFXOFF_MASK;
Quoted 3 lines
Quoted 3 lines

for (i = 0; i < adev->num_ip_blocks; i++) {
--
2.20.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 67422930-9dbe-bac2-1636-c0b71a814acb-5C7GfCeVMHo@public.gmane.org

author
#6 lore raw

Agree, have sent V2.
My patch was actually in line to already up streamed patch:
https://lkml.org/lkml/2019/8/26/201

Regards,
Shirish S

-----Original Message-----
From: Kuehling, Felix <[email protected]>
Sent: Wednesday, September 11, 2019 9:09 AM
To: Huang, Ray <[email protected]>; S, Shirish <[email protected]>; Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>
Cc: [email protected]
Subject: Re: [PATCH] drm/amdgpu: fix build error without CONFIG_HSA_AMD

This is pretty ugly. See a suggestion inline.

Quoted 30 lines · Ray
Quoted 15 lines

-----Original Message-----
From: S, Shirish <[email protected]>
Sent: Tuesday, September 10, 2019 3:54 PM
To: Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Huang, Ray <[email protected]>
Cc: [email protected]; S, Shirish <[email protected]>
Subject: [PATCH] drm/amdgpu: fix build error without CONFIG_HSA_AMD

If CONFIG_HSA_AMD is not set, build fails:

drivers/gpu/drm/amd/amdgpu/amdgpu_device.o: In function `amdgpu_device_ip_early_init':
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:1626: undefined reference to `sched_policy'

Quoted 6 lines

Use CONFIG_HSA_AMD to guard this.

Fixes 1abb680ad371 ("drm/amdgpu: disable gfxoff while use no H/W

scheduling policy")

+ Felix for his awareness.

Quoted 5 lines
---
  drivers/gpu/drm/amd/amdgpu/amdgpu.h        | 2 ++
  drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 +++++-
  2 files changed, 7 insertions(+), 1 deletion(-)
Quoted 10 lines
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -0
index 1030cb30720c..a1516a3ae9a8 100644
@@ -169,7 +169,9 @@ extern int amdgpu_discovery;  extern int 

amdgpu_mes; extern int amdgpu_noretry; extern int amdgpu_force_asic_type;
+#ifdef CONFIG_HSA_AMD
extern int sched_policy;

#else
static const int sched_policy = KFD_SCHED_POLICY_HWS; #endif

This way you don't need another set of ugly #ifdefs in amdgpu_device.c.

Regards,
  Felix

Quoted 23 lines
Quoted 23 lines
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -0
+#endif
 
  #ifdef CONFIG_DRM_AMDGPU_SI
  extern int amdgpu_si_support;
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +5 -1
index bd423dd64e18..2535db27f821 100644
@@ -1623,7 +1623,11 @@ static int amdgpu_device_ip_early_init(struct
 amdgpu_device *adev)
  	}
 
  	adev->pm.pp_feature = amdgpu_pp_feature_mask;
-	if (amdgpu_sriov_vf(adev) || sched_policy ==
 KFD_SCHED_POLICY_NO_HWS)
+	if (amdgpu_sriov_vf(adev)
+	    #ifdef CONFIG_HSA_AMD
+	    || sched_policy == KFD_SCHED_POLICY_NO_HWS
+	    #endif
+	    )
  		adev->pm.pp_feature &= ~PP_GFXOFF_MASK;
Quoted 3 lines
Quoted 3 lines

for (i = 0; i < adev->num_ip_blocks; i++) {
--
2.20.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx