* [PATCH] drm/amdgpu/vcn2.5: fix warning
@ 2020-02-07 13:17 James Zhu
2020-02-10 14:10 ` Zhu, James
2020-02-10 14:39 ` Leo Liu
0 siblings, 2 replies; 3+ messages in thread
From: James Zhu @ 2020-02-07 13:17 UTC (permalink / raw)
To: amd-gfx; +Cc: jamesz
Fix warning during switching to dpg pause mode for
VCN firmware Version ENC: 1.1 DEC: 1 VEP: 0 Revision: 16
Signed-off-by: James Zhu <James.Zhu@amd.com>
---
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
index 97ab44c..2d64ba1 100644
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
@@ -1407,7 +1407,7 @@ static int vcn_v2_5_pause_dpg_mode(struct amdgpu_device *adev,
RREG32_SOC15(UVD, inst_idx, mmUVD_SCRATCH2) & 0x7FFFFFFF);
SOC15_WAIT_ON_RREG(UVD, inst_idx, mmUVD_POWER_STATUS,
- 0x0, UVD_POWER_STATUS__UVD_POWER_STATUS_MASK, ret_code);
+ UVD_PGFSM_CONFIG__UVDM_UVDU_PWR_ON, UVD_POWER_STATUS__UVD_POWER_STATUS_MASK, ret_code);
}
} else {
/* unpause dpg, no need to wait */
--
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] 3+ messages in thread* Re: [PATCH] drm/amdgpu/vcn2.5: fix warning
2020-02-07 13:17 [PATCH] drm/amdgpu/vcn2.5: fix warning James Zhu
@ 2020-02-10 14:10 ` Zhu, James
2020-02-10 14:39 ` Leo Liu
1 sibling, 0 replies; 3+ messages in thread
From: Zhu, James @ 2020-02-10 14:10 UTC (permalink / raw)
To: amd-gfx@lists.freedesktop.org
[-- Attachment #1.1: Type: text/plain, Size: 1447 bytes --]
[AMD Official Use Only - Internal Distribution Only]
ping
________________________________
From: Zhu, James <James.Zhu@amd.com>
Sent: Friday, February 7, 2020 8:17 AM
To: amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org>
Cc: Zhu, James <James.Zhu@amd.com>
Subject: [PATCH] drm/amdgpu/vcn2.5: fix warning
Fix warning during switching to dpg pause mode for
VCN firmware Version ENC: 1.1 DEC: 1 VEP: 0 Revision: 16
Signed-off-by: James Zhu <James.Zhu@amd.com>
---
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
index 97ab44c..2d64ba1 100644
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
@@ -1407,7 +1407,7 @@ static int vcn_v2_5_pause_dpg_mode(struct amdgpu_device *adev,
RREG32_SOC15(UVD, inst_idx, mmUVD_SCRATCH2) & 0x7FFFFFFF);
SOC15_WAIT_ON_RREG(UVD, inst_idx, mmUVD_POWER_STATUS,
- 0x0, UVD_POWER_STATUS__UVD_POWER_STATUS_MASK, ret_code);
+ UVD_PGFSM_CONFIG__UVDM_UVDU_PWR_ON, UVD_POWER_STATUS__UVD_POWER_STATUS_MASK, ret_code);
}
} else {
/* unpause dpg, no need to wait */
--
2.7.4
[-- Attachment #1.2: Type: text/html, Size: 3819 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 related [flat|nested] 3+ messages in thread* Re: [PATCH] drm/amdgpu/vcn2.5: fix warning
2020-02-07 13:17 [PATCH] drm/amdgpu/vcn2.5: fix warning James Zhu
2020-02-10 14:10 ` Zhu, James
@ 2020-02-10 14:39 ` Leo Liu
1 sibling, 0 replies; 3+ messages in thread
From: Leo Liu @ 2020-02-10 14:39 UTC (permalink / raw)
To: James Zhu, amd-gfx; +Cc: jamesz
Acked-by: Leo Liu <leo.liu@amd.com>
On 2020-02-07 8:17 a.m., James Zhu wrote:
> Fix warning during switching to dpg pause mode for
> VCN firmware Version ENC: 1.1 DEC: 1 VEP: 0 Revision: 16
>
> Signed-off-by: James Zhu <James.Zhu@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
> index 97ab44c..2d64ba1 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
> @@ -1407,7 +1407,7 @@ static int vcn_v2_5_pause_dpg_mode(struct amdgpu_device *adev,
> RREG32_SOC15(UVD, inst_idx, mmUVD_SCRATCH2) & 0x7FFFFFFF);
>
> SOC15_WAIT_ON_RREG(UVD, inst_idx, mmUVD_POWER_STATUS,
> - 0x0, UVD_POWER_STATUS__UVD_POWER_STATUS_MASK, ret_code);
> + UVD_PGFSM_CONFIG__UVDM_UVDU_PWR_ON, UVD_POWER_STATUS__UVD_POWER_STATUS_MASK, ret_code);
> }
> } else {
> /* unpause dpg, no need to wait */
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-02-10 14:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-07 13:17 [PATCH] drm/amdgpu/vcn2.5: fix warning James Zhu
2020-02-10 14:10 ` Zhu, James
2020-02-10 14:39 ` Leo Liu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox