All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/amdgpu: Maintain suspend-resume call consistency in gpu recovery
@ 2018-02-01 19:44 mikita.lipski-5C7GfCeVMHo
       [not found] ` <1517514258-30312-1-git-send-email-mikita.lipski-5C7GfCeVMHo@public.gmane.org>
  0 siblings, 1 reply; 6+ messages in thread
From: mikita.lipski-5C7GfCeVMHo @ 2018-02-01 19:44 UTC (permalink / raw)
  To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
  Cc: andrey.grodzovsky-5C7GfCeVMHo, Mikita Lipski

From: Mikita Lipski <mikita.lipski@amd.com>

Call dm_suspend function instead of drm_kms suspend function in
order to cache current state

Call DM_resume first to restore dc hardware, then amdgpu_dm_display_resume
to restore dal's cached state.

Signed-off-by: Mikita Lipski <mikita.lipski@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 850453e..b55c929 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -2616,7 +2616,6 @@ static int amdgpu_device_reset_sriov(struct amdgpu_device *adev,
 int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
 			      struct amdgpu_job *job, bool force)
 {
-	struct drm_atomic_state *state = NULL;
 	uint64_t reset_flags = 0;
 	int i, r, resched;
 
@@ -2640,9 +2639,9 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
 	/* block TTM */
 	resched = ttm_bo_lock_delayed_workqueue(&adev->mman.bdev);
 	/* store modesetting */
-	if (amdgpu_device_has_dc_support(adev))
-		state = drm_atomic_helper_suspend(adev->ddev);
-
+	if (amdgpu_device_has_dc_support(adev)){
+		adev->ip_blocks[5].version->funcs->suspend(adev);
+	}
 	/* block scheduler */
 	for (i = 0; i < AMDGPU_MAX_RINGS; ++i) {
 		struct amdgpu_ring *ring = adev->rings[i];
@@ -2727,8 +2726,7 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
 	}
 
 	if (amdgpu_device_has_dc_support(adev)) {
-		if (drm_atomic_helper_resume(adev->ddev, state))
-			dev_info(adev->dev, "drm resume failed:%d\n", r);
+		adev->ip_blocks[5].version->funcs->resume(adev);
 		amdgpu_dm_display_resume(adev);
 	} else {
 		drm_helper_resume_force_mode(adev->ddev);
-- 
2.7.4

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

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH] drm/amdgpu: Maintain suspend-resume call consistency in gpu recovery
       [not found] ` <1517514258-30312-1-git-send-email-mikita.lipski-5C7GfCeVMHo@public.gmane.org>
@ 2018-02-01 19:53   ` Andrey Grodzovsky
  2018-02-01 19:53   ` Alex Deucher
  2018-02-01 20:02   ` Alex Deucher
  2 siblings, 0 replies; 6+ messages in thread
From: Andrey Grodzovsky @ 2018-02-01 19:53 UTC (permalink / raw)
  To: mikita.lipski-5C7GfCeVMHo, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW



On 02/01/2018 02:44 PM, mikita.lipski@amd.com wrote:
> From: Mikita Lipski <mikita.lipski@amd.com>
>
> Call dm_suspend function instead of drm_kms suspend function in
> order to cache current state
>
> Call DM_resume first to restore dc hardware, then amdgpu_dm_display_resume
> to restore dal's cached state.
>
> Signed-off-by: Mikita Lipski <mikita.lipski@amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 10 ++++------
>   1 file changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> index 850453e..b55c929 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -2616,7 +2616,6 @@ static int amdgpu_device_reset_sriov(struct amdgpu_device *adev,
>   int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
>   			      struct amdgpu_job *job, bool force)
>   {
> -	struct drm_atomic_state *state = NULL;
>   	uint64_t reset_flags = 0;
>   	int i, r, resched;
>   
> @@ -2640,9 +2639,9 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
>   	/* block TTM */
>   	resched = ttm_bo_lock_delayed_workqueue(&adev->mman.bdev);
>   	/* store modesetting */
> -	if (amdgpu_device_has_dc_support(adev))
> -		state = drm_atomic_helper_suspend(adev->ddev);
> -
> +	if (amdgpu_device_has_dc_support(adev)){
> +		adev->ip_blocks[5].version->funcs->suspend(adev);
> +	}

Use if(adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_DCE instead)

Thanks,
Andrey

>   	/* block scheduler */
>   	for (i = 0; i < AMDGPU_MAX_RINGS; ++i) {
>   		struct amdgpu_ring *ring = adev->rings[i];
> @@ -2727,8 +2726,7 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
>   	}
>   
>   	if (amdgpu_device_has_dc_support(adev)) {
> -		if (drm_atomic_helper_resume(adev->ddev, state))
> -			dev_info(adev->dev, "drm resume failed:%d\n", r);
> +		adev->ip_blocks[5].version->funcs->resume(adev);
>   		amdgpu_dm_display_resume(adev);
>   	} else {
>   		drm_helper_resume_force_mode(adev->ddev);

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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] drm/amdgpu: Maintain suspend-resume call consistency in gpu recovery
       [not found] ` <1517514258-30312-1-git-send-email-mikita.lipski-5C7GfCeVMHo@public.gmane.org>
  2018-02-01 19:53   ` Andrey Grodzovsky
@ 2018-02-01 19:53   ` Alex Deucher
  2018-02-01 20:02   ` Alex Deucher
  2 siblings, 0 replies; 6+ messages in thread
From: Alex Deucher @ 2018-02-01 19:53 UTC (permalink / raw)
  To: mikita.lipski-5C7GfCeVMHo; +Cc: Andrey Grodzovsky, amd-gfx list

On Thu, Feb 1, 2018 at 2:44 PM,  <mikita.lipski@amd.com> wrote:
> From: Mikita Lipski <mikita.lipski@amd.com>
>
> Call dm_suspend function instead of drm_kms suspend function in
> order to cache current state
>
> Call DM_resume first to restore dc hardware, then amdgpu_dm_display_resume
> to restore dal's cached state.
>
> Signed-off-by: Mikita Lipski <mikita.lipski@amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 10 ++++------
>  1 file changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> index 850453e..b55c929 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -2616,7 +2616,6 @@ static int amdgpu_device_reset_sriov(struct amdgpu_device *adev,
>  int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
>                               struct amdgpu_job *job, bool force)
>  {
> -       struct drm_atomic_state *state = NULL;
>         uint64_t reset_flags = 0;
>         int i, r, resched;
>
> @@ -2640,9 +2639,9 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
>         /* block TTM */
>         resched = ttm_bo_lock_delayed_workqueue(&adev->mman.bdev);
>         /* store modesetting */
> -       if (amdgpu_device_has_dc_support(adev))
> -               state = drm_atomic_helper_suspend(adev->ddev);
> -
> +       if (amdgpu_device_has_dc_support(adev)){
> +               adev->ip_blocks[5].version->funcs->suspend(adev);
> +       }

Please don't hardcode the ip_block index.  The indicies don't
correspond to a specific IP.  Use amdgpu_device_ip_get_ip_block(adev,
AMD_IP_BLOCK_TYPE_DCE) to fetch the IP block.

Alex

>         /* block scheduler */
>         for (i = 0; i < AMDGPU_MAX_RINGS; ++i) {
>                 struct amdgpu_ring *ring = adev->rings[i];
> @@ -2727,8 +2726,7 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
>         }
>
>         if (amdgpu_device_has_dc_support(adev)) {
> -               if (drm_atomic_helper_resume(adev->ddev, state))
> -                       dev_info(adev->dev, "drm resume failed:%d\n", r);
> +               adev->ip_blocks[5].version->funcs->resume(adev);
>                 amdgpu_dm_display_resume(adev);
>         } else {
>                 drm_helper_resume_force_mode(adev->ddev);
> --
> 2.7.4
>
> _______________________________________________
> 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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] drm/amdgpu: Maintain suspend-resume call consistency in gpu recovery
       [not found] ` <1517514258-30312-1-git-send-email-mikita.lipski-5C7GfCeVMHo@public.gmane.org>
  2018-02-01 19:53   ` Andrey Grodzovsky
  2018-02-01 19:53   ` Alex Deucher
@ 2018-02-01 20:02   ` Alex Deucher
       [not found]     ` <CADnq5_P4qBT=jouUaNPA5C66iKoTHPhEt31vFBDtpO1WNz7S5A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
  2 siblings, 1 reply; 6+ messages in thread
From: Alex Deucher @ 2018-02-01 20:02 UTC (permalink / raw)
  To: mikita.lipski-5C7GfCeVMHo; +Cc: Andrey Grodzovsky, amd-gfx list

On Thu, Feb 1, 2018 at 2:44 PM,  <mikita.lipski@amd.com> wrote:
> From: Mikita Lipski <mikita.lipski@amd.com>
>
> Call dm_suspend function instead of drm_kms suspend function in
> order to cache current state
>
> Call DM_resume first to restore dc hardware, then amdgpu_dm_display_resume
> to restore dal's cached state.

We already call the IP block suspend and resume functions in
amdgpu_device_ip_suspend() which is called by amdgpu_device_reset(),
at least when we do a hard reset.  They will end up getting called
twice in that case with this change.  Perhaps a better solution would
be to only call the drm_atomic_helper_* functions when we have a hard
reset rather than a soft one.

Alex


>
> Signed-off-by: Mikita Lipski <mikita.lipski@amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 10 ++++------
>  1 file changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> index 850453e..b55c929 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -2616,7 +2616,6 @@ static int amdgpu_device_reset_sriov(struct amdgpu_device *adev,
>  int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
>                               struct amdgpu_job *job, bool force)
>  {
> -       struct drm_atomic_state *state = NULL;
>         uint64_t reset_flags = 0;
>         int i, r, resched;
>
> @@ -2640,9 +2639,9 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
>         /* block TTM */
>         resched = ttm_bo_lock_delayed_workqueue(&adev->mman.bdev);
>         /* store modesetting */
> -       if (amdgpu_device_has_dc_support(adev))
> -               state = drm_atomic_helper_suspend(adev->ddev);
> -
> +       if (amdgpu_device_has_dc_support(adev)){
> +               adev->ip_blocks[5].version->funcs->suspend(adev);
> +       }
>         /* block scheduler */
>         for (i = 0; i < AMDGPU_MAX_RINGS; ++i) {
>                 struct amdgpu_ring *ring = adev->rings[i];
> @@ -2727,8 +2726,7 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
>         }
>
>         if (amdgpu_device_has_dc_support(adev)) {
> -               if (drm_atomic_helper_resume(adev->ddev, state))
> -                       dev_info(adev->dev, "drm resume failed:%d\n", r);
> +               adev->ip_blocks[5].version->funcs->resume(adev);
>                 amdgpu_dm_display_resume(adev);
>         } else {
>                 drm_helper_resume_force_mode(adev->ddev);
> --
> 2.7.4
>
> _______________________________________________
> 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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] drm/amdgpu: Maintain suspend-resume call consistency in gpu recovery
       [not found]     ` <CADnq5_P4qBT=jouUaNPA5C66iKoTHPhEt31vFBDtpO1WNz7S5A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
@ 2018-02-01 20:34       ` Harry Wentland
       [not found]         ` <0b3fc698-954b-e5bc-d3e4-0f6ccfd2d777-5C7GfCeVMHo@public.gmane.org>
  0 siblings, 1 reply; 6+ messages in thread
From: Harry Wentland @ 2018-02-01 20:34 UTC (permalink / raw)
  To: Alex Deucher, mikita.lipski-5C7GfCeVMHo; +Cc: Andrey Grodzovsky, amd-gfx list



On 2018-02-01 03:02 PM, Alex Deucher wrote:
> On Thu, Feb 1, 2018 at 2:44 PM,  <mikita.lipski@amd.com> wrote:
>> From: Mikita Lipski <mikita.lipski@amd.com>
>>
>> Call dm_suspend function instead of drm_kms suspend function in
>> order to cache current state
>>
>> Call DM_resume first to restore dc hardware, then amdgpu_dm_display_resume
>> to restore dal's cached state.
> 
> We already call the IP block suspend and resume functions in
> amdgpu_device_ip_suspend() which is called by amdgpu_device_reset(),
> at least when we do a hard reset.  They will end up getting called

I missed that. I think we just need to drop the existing DC and drm_atomic_helper_* calls in amdgpu_device_gpu_recover and call amdgpu_dm_display_resume after amdgpu_device_ip_resume_phase2 in amdgpu_device_reset.

I really don't like the way we call amdgpu_dm_display_resume separately from the .resume hook now. We initially implemented it because in amdgpu_device_resume we need cursor pinning to happen before really resuming DC. Not sure if we can move the cursor pinning to before amdgpu_device_ip_resume in that function. If we can we can just move amdgpu_dm_display_resume into the proper .resume hook, and clean up both resume and gpu_recover code.

> twice in that case with this change.  Perhaps a better solution would
> be to only call the drm_atomic_helper_* functions when we have a hard
> reset rather than a soft one.

amdgpu_dm_display_resume will already call the drm_atomic_helper_ functions. We should really call them in gpu_recover, unless we need to re-apply the state on a soft reset, but then we probably want to block this call from a hard reset.

Harry

> 
> Alex
> 
> 
>>
>> Signed-off-by: Mikita Lipski <mikita.lipski@amd.com>
>> ---
>>  drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 10 ++++------
>>  1 file changed, 4 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>> index 850453e..b55c929 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>> @@ -2616,7 +2616,6 @@ static int amdgpu_device_reset_sriov(struct amdgpu_device *adev,
>>  int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
>>                               struct amdgpu_job *job, bool force)
>>  {
>> -       struct drm_atomic_state *state = NULL;
>>         uint64_t reset_flags = 0;
>>         int i, r, resched;
>>
>> @@ -2640,9 +2639,9 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
>>         /* block TTM */
>>         resched = ttm_bo_lock_delayed_workqueue(&adev->mman.bdev);
>>         /* store modesetting */
>> -       if (amdgpu_device_has_dc_support(adev))
>> -               state = drm_atomic_helper_suspend(adev->ddev);
>> -
>> +       if (amdgpu_device_has_dc_support(adev)){
>> +               adev->ip_blocks[5].version->funcs->suspend(adev);
>> +       }
>>         /* block scheduler */
>>         for (i = 0; i < AMDGPU_MAX_RINGS; ++i) {
>>                 struct amdgpu_ring *ring = adev->rings[i];
>> @@ -2727,8 +2726,7 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
>>         }
>>
>>         if (amdgpu_device_has_dc_support(adev)) {
>> -               if (drm_atomic_helper_resume(adev->ddev, state))
>> -                       dev_info(adev->dev, "drm resume failed:%d\n", r);
>> +               adev->ip_blocks[5].version->funcs->resume(adev);
>>                 amdgpu_dm_display_resume(adev);
>>         } else {
>>                 drm_helper_resume_force_mode(adev->ddev);
>> --
>> 2.7.4
>>
>> _______________________________________________
>> 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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] drm/amdgpu: Maintain suspend-resume call consistency in gpu recovery
       [not found]         ` <0b3fc698-954b-e5bc-d3e4-0f6ccfd2d777-5C7GfCeVMHo@public.gmane.org>
@ 2018-02-01 20:46           ` Lipski, Mikita
  0 siblings, 0 replies; 6+ messages in thread
From: Lipski, Mikita @ 2018-02-01 20:46 UTC (permalink / raw)
  To: Wentland, Harry, Alex Deucher; +Cc: Grodzovsky, Andrey, amd-gfx list


[-- Attachment #1.1: Type: text/plain, Size: 4312 bytes --]


On 2018-02-01 03:02 PM, Alex Deucher wrote:
> On Thu, Feb 1, 2018 at 2:44 PM,  <mikita.lipski-5C7GfCeVMHo@public.gmane.org> wrote:
>> From: Mikita Lipski <mikita.lipski-5C7GfCeVMHo@public.gmane.org>
>>
>> Call dm_suspend function instead of drm_kms suspend function in
>> order to cache current state
>>
>> Call DM_resume first to restore dc hardware, then amdgpu_dm_display_resume
>> to restore dal's cached state.
>
>> We already call the IP block suspend and resume functions in
> amdgpu_device_ip_suspend() which is called by amdgpu_device_reset(),
>> at least when we do a hard reset.  They will end up getting called

>I missed that. I think we just need to drop the existing DC and drm_atomic_helper_* calls in amdgpu_device_gpu_recover and call amdgpu_dm_display_resume after amdgpu_device_ip_resume_phase2 in amdgpu_device_reset.

>I really don't like the way we call amdgpu_dm_display_resume separately from the .resume hook now. We initially implemented it because in amdgpu_device_resume we need cursor pinning to happen before really resuming DC. Not sure if we can move the cursor pinning to before amdgpu_device_ip_resume in that function. If we can we can just move amdgpu_dm_display_resume into the proper .resume hook, and clean up both resume and gpu_recover code.

>> twice in that case with this change.  Perhaps a better solution would
>> be to only call the drm_atomic_helper_* functions when we have a hard
>> reset rather than a soft one.

>amdgpu_dm_display_resume will already call the drm_atomic_helper_ functions. We should really call them in gpu_recover, unless we need to re-apply the state on a soft reset, but then we probably want to block this call from a hard reset.

>Harry

If cursor pinning doesn't need powering DC beforehand - we can introduce phase 3 ip resume, as you suggested earlier, and call it after pinning the cursor instead of phase2.

Nick

>>
>> Alex
>>
>>
>>
>> Signed-off-by: Mikita Lipski <mikita.lipski-5C7GfCeVMHo@public.gmane.org>
>> ---
>>  drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 10 ++++------
>>  1 file changed, 4 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>> index 850453e..b55c929 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>> @@ -2616,7 +2616,6 @@ static int amdgpu_device_reset_sriov(struct amdgpu_device *adev,
>>  int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
>>                               struct amdgpu_job *job, bool force)
>>  {
>> -       struct drm_atomic_state *state = NULL;
>>         uint64_t reset_flags = 0;
>>         int i, r, resched;
>>
>> @@ -2640,9 +2639,9 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
>>         /* block TTM */
>>         resched = ttm_bo_lock_delayed_workqueue(&adev->mman.bdev);
>>         /* store modesetting */
>> -       if (amdgpu_device_has_dc_support(adev))
>> -               state = drm_atomic_helper_suspend(adev->ddev);
>> -
>> +       if (amdgpu_device_has_dc_support(adev)){
>> +               adev->ip_blocks[5].version->funcs->suspend(adev);
>> +       }
>>         /* block scheduler */
>>         for (i = 0; i < AMDGPU_MAX_RINGS; ++i) {
>>                 struct amdgpu_ring *ring = adev->rings[i];
>> @@ -2727,8 +2726,7 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
>>         }
>>
>>         if (amdgpu_device_has_dc_support(adev)) {
>> -               if (drm_atomic_helper_resume(adev->ddev, state))
>> -                       dev_info(adev->dev, "drm resume failed:%d\n", r);
>> +               adev->ip_blocks[5].version->funcs->resume(adev);
>>                 amdgpu_dm_display_resume(adev);
>>         } else {
>>                 drm_helper_resume_force_mode(adev->ddev);
>> --
>> 2.7.4
>>
>> _______________________________________________
>> amd-gfx mailing list
>> amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
>> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
> _______________________________________________
> amd-gfx mailing list
> amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
>

[-- Attachment #1.2: Type: text/html, Size: 8312 bytes --]

[-- Attachment #2: Type: text/plain, Size: 154 bytes --]

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

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2018-02-01 20:46 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-01 19:44 [PATCH] drm/amdgpu: Maintain suspend-resume call consistency in gpu recovery mikita.lipski-5C7GfCeVMHo
     [not found] ` <1517514258-30312-1-git-send-email-mikita.lipski-5C7GfCeVMHo@public.gmane.org>
2018-02-01 19:53   ` Andrey Grodzovsky
2018-02-01 19:53   ` Alex Deucher
2018-02-01 20:02   ` Alex Deucher
     [not found]     ` <CADnq5_P4qBT=jouUaNPA5C66iKoTHPhEt31vFBDtpO1WNz7S5A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2018-02-01 20:34       ` Harry Wentland
     [not found]         ` <0b3fc698-954b-e5bc-d3e4-0f6ccfd2d777-5C7GfCeVMHo@public.gmane.org>
2018-02-01 20:46           ` Lipski, Mikita

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.