[PATCH 1/2] drm/amdgpu/atomfirmware: add function to update engine hang status

[PATCH 1/2] drm/amdgpu/atomfirmware: add function to update engine hang status

[Alex Deucher]

Update the scratch reg for when the engine is hung.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 13 +++++++++++++
 drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h |  2 ++
 2 files changed, 15 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c
index d735cd1..4bdda56 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c
@@ -88,6 +88,19 @@ void amdgpu_atomfirmware_scratch_regs_restore(struct amdgpu_device *adev)
 		WREG32(adev->bios_scratch_reg_offset + i, adev->bios_scratch[i]);
 }
 
+void amdgpu_atomfirmware_scratch_regs_engine_hung(struct amdgpu_device *adev,
+						  bool hung)
+{
+	u32 tmp = RREG32(adev->bios_scratch_reg_offset + 3);
+
+	if (hung)
+		tmp |= ATOM_S3_ASIC_GUI_ENGINE_HUNG;
+	else
+		tmp &= ~ATOM_S3_ASIC_GUI_ENGINE_HUNG;
+
+	WREG32(adev->bios_scratch_reg_offset + 3, tmp);
+}
+
 int amdgpu_atomfirmware_allocate_fb_scratch(struct amdgpu_device *adev)
 {
 	struct atom_context *ctx = adev->mode_info.atom_context;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h
index d0c4dcd..a2c3ebe 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h
@@ -28,6 +28,8 @@ bool amdgpu_atomfirmware_gpu_supports_virtualization(struct amdgpu_device *adev)
 void amdgpu_atomfirmware_scratch_regs_init(struct amdgpu_device *adev);
 void amdgpu_atomfirmware_scratch_regs_save(struct amdgpu_device *adev);
 void amdgpu_atomfirmware_scratch_regs_restore(struct amdgpu_device *adev);
+void amdgpu_atomfirmware_scratch_regs_engine_hung(struct amdgpu_device *adev,
+						  bool hung);
 int amdgpu_atomfirmware_allocate_fb_scratch(struct amdgpu_device *adev);
 
 #endif
-- 
2.5.5

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

[PATCH 2/2] drm/amdgpu/soc15: use atomfirmware for setting bios scratch for reset

[Alex Deucher]

Need to use the atomfirmware interface rather than atombios since
soc15 is atomfirmware based.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/soc15.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
index 79af896..b04f929 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
@@ -25,7 +25,7 @@
 #include <linux/module.h>
 #include "drmP.h"
 #include "amdgpu.h"
-#include "amdgpu_atombios.h"
+#include "amdgpu_atomfirmware.h"
 #include "amdgpu_ih.h"
 #include "amdgpu_uvd.h"
 #include "amdgpu_vce.h"
@@ -392,11 +392,11 @@ static void soc15_gpu_pci_config_reset(struct amdgpu_device *adev)
 
 static int soc15_asic_reset(struct amdgpu_device *adev)
 {
-	amdgpu_atombios_scratch_regs_engine_hung(adev, true);
+	amdgpu_atomfirmware_scratch_regs_engine_hung(adev, true);
 
 	soc15_gpu_pci_config_reset(adev);
 
-	amdgpu_atombios_scratch_regs_engine_hung(adev, false);
+	amdgpu_atomfirmware_scratch_regs_engine_hung(adev, false);
 
 	return 0;
 }
-- 
2.5.5

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH 1/2] drm/amdgpu/atomfirmware: add function to update engine hang status

[Alex Deucher]

On Fri, May 5, 2017 at 10:27 AM, Alex Deucher <alexdeucher@gmail.com> wrote:
> Update the scratch reg for when the engine is hung.
>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

ping on this series.

Alex

> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 13 +++++++++++++
>  drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h |  2 ++
>  2 files changed, 15 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c
> index d735cd1..4bdda56 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c
> @@ -88,6 +88,19 @@ void amdgpu_atomfirmware_scratch_regs_restore(struct amdgpu_device *adev)
>                 WREG32(adev->bios_scratch_reg_offset + i, adev->bios_scratch[i]);
>  }
>
> +void amdgpu_atomfirmware_scratch_regs_engine_hung(struct amdgpu_device *adev,
> +                                                 bool hung)
> +{
> +       u32 tmp = RREG32(adev->bios_scratch_reg_offset + 3);
> +
> +       if (hung)
> +               tmp |= ATOM_S3_ASIC_GUI_ENGINE_HUNG;
> +       else
> +               tmp &= ~ATOM_S3_ASIC_GUI_ENGINE_HUNG;
> +
> +       WREG32(adev->bios_scratch_reg_offset + 3, tmp);
> +}
> +
>  int amdgpu_atomfirmware_allocate_fb_scratch(struct amdgpu_device *adev)
>  {
>         struct atom_context *ctx = adev->mode_info.atom_context;
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h
> index d0c4dcd..a2c3ebe 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h
> @@ -28,6 +28,8 @@ bool amdgpu_atomfirmware_gpu_supports_virtualization(struct amdgpu_device *adev)
>  void amdgpu_atomfirmware_scratch_regs_init(struct amdgpu_device *adev);
>  void amdgpu_atomfirmware_scratch_regs_save(struct amdgpu_device *adev);
>  void amdgpu_atomfirmware_scratch_regs_restore(struct amdgpu_device *adev);
> +void amdgpu_atomfirmware_scratch_regs_engine_hung(struct amdgpu_device *adev,
> +                                                 bool hung);
>  int amdgpu_atomfirmware_allocate_fb_scratch(struct amdgpu_device *adev);
>
>  #endif
> --
> 2.5.5
>
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH 1/2] drm/amdgpu/atomfirmware: add function to update engine hang status

[Harry Wentland]

On 2017-05-08 02:32 PM, Alex Deucher wrote:
> On Fri, May 5, 2017 at 10:27 AM, Alex Deucher <alexdeucher@gmail.com> wrote:
>> Update the scratch reg for when the engine is hung.
>>
>> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>
> ping on this series.
>

I'm not an expert on this and haven't had a chance to look up the 
atomfirmware definitions but this looks reasonable to me.

Acked-by: Harry Wentland <harry.wentland@amd.com>

Harry


> Alex
>
>> ---
>>  drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 13 +++++++++++++
>>  drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h |  2 ++
>>  2 files changed, 15 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c
>> index d735cd1..4bdda56 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c
>> @@ -88,6 +88,19 @@ void amdgpu_atomfirmware_scratch_regs_restore(struct amdgpu_device *adev)
>>                 WREG32(adev->bios_scratch_reg_offset + i, adev->bios_scratch[i]);
>>  }
>>
>> +void amdgpu_atomfirmware_scratch_regs_engine_hung(struct amdgpu_device *adev,
>> +                                                 bool hung)
>> +{
>> +       u32 tmp = RREG32(adev->bios_scratch_reg_offset + 3);
>> +
>> +       if (hung)
>> +               tmp |= ATOM_S3_ASIC_GUI_ENGINE_HUNG;
>> +       else
>> +               tmp &= ~ATOM_S3_ASIC_GUI_ENGINE_HUNG;
>> +
>> +       WREG32(adev->bios_scratch_reg_offset + 3, tmp);
>> +}
>> +
>>  int amdgpu_atomfirmware_allocate_fb_scratch(struct amdgpu_device *adev)
>>  {
>>         struct atom_context *ctx = adev->mode_info.atom_context;
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h
>> index d0c4dcd..a2c3ebe 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h
>> @@ -28,6 +28,8 @@ bool amdgpu_atomfirmware_gpu_supports_virtualization(struct amdgpu_device *adev)
>>  void amdgpu_atomfirmware_scratch_regs_init(struct amdgpu_device *adev);
>>  void amdgpu_atomfirmware_scratch_regs_save(struct amdgpu_device *adev);
>>  void amdgpu_atomfirmware_scratch_regs_restore(struct amdgpu_device *adev);
>> +void amdgpu_atomfirmware_scratch_regs_engine_hung(struct amdgpu_device *adev,
>> +                                                 bool hung);
>>  int amdgpu_atomfirmware_allocate_fb_scratch(struct amdgpu_device *adev);
>>
>>  #endif
>> --
>> 2.5.5
>>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
>
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH 2/2] drm/amdgpu/soc15: use atomfirmware for setting bios scratch for reset

[zhoucm1]

On 2017年05月05日 22:27, Alex Deucher wrote:
> Need to use the atomfirmware interface rather than atombios since
> soc15 is atomfirmware based.
>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
The series is Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/soc15.c | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
> index 79af896..b04f929 100644
> --- a/drivers/gpu/drm/amd/amdgpu/soc15.c
> +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
> @@ -25,7 +25,7 @@
>   #include <linux/module.h>
>   #include "drmP.h"
>   #include "amdgpu.h"
> -#include "amdgpu_atombios.h"
> +#include "amdgpu_atomfirmware.h"
>   #include "amdgpu_ih.h"
>   #include "amdgpu_uvd.h"
>   #include "amdgpu_vce.h"
> @@ -392,11 +392,11 @@ static void soc15_gpu_pci_config_reset(struct amdgpu_device *adev)
>   
>   static int soc15_asic_reset(struct amdgpu_device *adev)
>   {
> -	amdgpu_atombios_scratch_regs_engine_hung(adev, true);
> +	amdgpu_atomfirmware_scratch_regs_engine_hung(adev, true);
>   
>   	soc15_gpu_pci_config_reset(adev);
>   
> -	amdgpu_atombios_scratch_regs_engine_hung(adev, false);
> +	amdgpu_atomfirmware_scratch_regs_engine_hung(adev, false);
>   
>   	return 0;
>   }

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH 1/2] drm/amdgpu/atomfirmware: add function to update engine hang status

[Christian König]

Am 08.05.2017 um 22:43 schrieb Harry Wentland:
> On 2017-05-08 02:32 PM, Alex Deucher wrote:
>> On Fri, May 5, 2017 at 10:27 AM, Alex Deucher <alexdeucher@gmail.com> 
>> wrote:
>>> Update the scratch reg for when the engine is hung.
>>>
>>> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>>
>> ping on this series.
>>
>
> I'm not an expert on this and haven't had a chance to look up the 
> atomfirmware definitions but this looks reasonable to me.

Dito. Problem is as far as I know nobody else is deeply into atombios 
and reviewing patches.

> Acked-by: Harry Wentland <harry.wentland@amd.com>

Acked-by: Christian König <christian.koenig@amd.com> as well.

Christian.

>
> Harry
>
>
>> Alex
>>
>>> ---
>>>  drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 13 +++++++++++++
>>>  drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h |  2 ++
>>>  2 files changed, 15 insertions(+)
>>>
>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c 
>>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c
>>> index d735cd1..4bdda56 100644
>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c
>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c
>>> @@ -88,6 +88,19 @@ void 
>>> amdgpu_atomfirmware_scratch_regs_restore(struct amdgpu_device *adev)
>>>                 WREG32(adev->bios_scratch_reg_offset + i, 
>>> adev->bios_scratch[i]);
>>>  }
>>>
>>> +void amdgpu_atomfirmware_scratch_regs_engine_hung(struct 
>>> amdgpu_device *adev,
>>> +                                                 bool hung)
>>> +{
>>> +       u32 tmp = RREG32(adev->bios_scratch_reg_offset + 3);
>>> +
>>> +       if (hung)
>>> +               tmp |= ATOM_S3_ASIC_GUI_ENGINE_HUNG;
>>> +       else
>>> +               tmp &= ~ATOM_S3_ASIC_GUI_ENGINE_HUNG;
>>> +
>>> +       WREG32(adev->bios_scratch_reg_offset + 3, tmp);
>>> +}
>>> +
>>>  int amdgpu_atomfirmware_allocate_fb_scratch(struct amdgpu_device 
>>> *adev)
>>>  {
>>>         struct atom_context *ctx = adev->mode_info.atom_context;
>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h 
>>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h
>>> index d0c4dcd..a2c3ebe 100644
>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h
>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h
>>> @@ -28,6 +28,8 @@ bool 
>>> amdgpu_atomfirmware_gpu_supports_virtualization(struct amdgpu_device 
>>> *adev)
>>>  void amdgpu_atomfirmware_scratch_regs_init(struct amdgpu_device 
>>> *adev);
>>>  void amdgpu_atomfirmware_scratch_regs_save(struct amdgpu_device 
>>> *adev);
>>>  void amdgpu_atomfirmware_scratch_regs_restore(struct amdgpu_device 
>>> *adev);
>>> +void amdgpu_atomfirmware_scratch_regs_engine_hung(struct 
>>> amdgpu_device *adev,
>>> +                                                 bool hung);
>>>  int amdgpu_atomfirmware_allocate_fb_scratch(struct amdgpu_device 
>>> *adev);
>>>
>>>  #endif
>>> -- 
>>> 2.5.5
>>>
>> _______________________________________________
>> amd-gfx mailing list
>> amd-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
>>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx


_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx