drm/amdgpu: fix build error without CONFIG_HSA_AMD (V2)

Submitted by S, Shirish on Sept. 11, 2019, 6:52 a.m.

Details

Message ID 1568184761-20949-1-git-send-email-shirish.s@amd.com
State New
Headers show
Series "drm/amdgpu: fix build error without CONFIG_HSA_AMD" ( rev: 2 ) in AMD X.Org drivers

Not browsing as part of any series.

Commit Message

S, Shirish Sept. 11, 2019, 6:52 a.m.
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")

V2: declare sched_policy in amdgpu.h and remove changes in amdgpu_device.c

Signed-off-by: Shirish S <shirish.s@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu.h | 4 ++++
 1 file changed, 4 insertions(+)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 1030cb3..6ff02bb 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -169,7 +169,11 @@  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
 
 #ifdef CONFIG_DRM_AMDGPU_SI
 extern int amdgpu_si_support;

Comments

On 2019-09-11 2:52 a.m., S, Shirish wrote:
> 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")

>

> V2: declare sched_policy in amdgpu.h and remove changes in amdgpu_device.c


Which branch is this for. V1 of this patch was already submitted to 
amd-staging-drm-next. So unless you're planning to revert v1 and submit 
v2, I was expecting to see a change that fixes up the previous patch, 
rather than a patch that replaces it.

Regards,
   Felix


>

> Signed-off-by: Shirish S <shirish.s@amd.com>

> ---

>   drivers/gpu/drm/amd/amdgpu/amdgpu.h | 4 ++++

>   1 file changed, 4 insertions(+)

>

> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h

> index 1030cb3..6ff02bb 100644

> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h

> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h

> @@ -169,7 +169,11 @@ 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

>   

>   #ifdef CONFIG_DRM_AMDGPU_SI

>   extern int amdgpu_si_support;
On 9/12/2019 3:29 AM, Kuehling, Felix wrote:
> On 2019-09-11 2:52 a.m., S, Shirish wrote:

>> 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")

>>

>> V2: declare sched_policy in amdgpu.h and remove changes in amdgpu_device.c

> Which branch is this for. V1 of this patch was already submitted to

> amd-staging-drm-next. So unless you're planning to revert v1 and submit

> v2, I was expecting to see a change that fixes up the previous patch,

> rather than a patch that replaces it.


Have sent a patch that fixes up previous patch as well.

Apparently, I did not send the revert but my plan was to revert and only 
then submit V2.

Anyways both work for me as long as the kernel builds.

Regards,

Shirish S

> Regards,

>     Felix

>

>

>> Signed-off-by: Shirish S <shirish.s@amd.com>

>> ---

>>    drivers/gpu/drm/amd/amdgpu/amdgpu.h | 4 ++++

>>    1 file changed, 4 insertions(+)

>>

>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h

>> index 1030cb3..6ff02bb 100644

>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h

>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h

>> @@ -169,7 +169,11 @@ 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

>>    

>>    #ifdef CONFIG_DRM_AMDGPU_SI

>>    extern int amdgpu_si_support;


-- 
Regards,
Shirish S
On 2019-09-12 2:58 a.m., S, Shirish wrote:
> On 9/12/2019 3:29 AM, Kuehling, Felix wrote:

>> On 2019-09-11 2:52 a.m., S, Shirish wrote:

>>> 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")

>>>

>>> V2: declare sched_policy in amdgpu.h and remove changes in amdgpu_device.c

>> Which branch is this for. V1 of this patch was already submitted to

>> amd-staging-drm-next. So unless you're planning to revert v1 and submit

>> v2, I was expecting to see a change that fixes up the previous patch,

>> rather than a patch that replaces it.

> Have sent a patch that fixes up previous patch as well.

>

> Apparently, I did not send the revert but my plan was to revert and only

> then submit V2.


Reverts must be reviewed too. If you're planning to submit a revert, 
please do include it in code review. That also avoids this type of 
confusion.

I'll review your other patch.

Thanks,
   Felix


>

> Anyways both work for me as long as the kernel builds.

>

> Regards,

>

> Shirish S

>

>> Regards,

>>      Felix

>>

>>

>>> Signed-off-by: Shirish S <shirish.s@amd.com>

>>> ---

>>>     drivers/gpu/drm/amd/amdgpu/amdgpu.h | 4 ++++

>>>     1 file changed, 4 insertions(+)

>>>

>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h

>>> index 1030cb3..6ff02bb 100644

>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h

>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h

>>> @@ -169,7 +169,11 @@ 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

>>>     

>>>     #ifdef CONFIG_DRM_AMDGPU_SI

>>>     extern int amdgpu_si_support;