drm/amd/amdgpu: Fix gfxv6 driver issues from porting to new headers
Subsystems (2)
PATCH 1/1 drm/amd/amdgpu: Fix gfxv6 driver issues from porting to new headers
This patch fixes a couple of bugs that fell out from the porting effort.
--- drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -3
@@ -1607,10 +1607,10 @@ err1:static void gfx_v6_0_cp_gfx_enable (struct amdgpu_device *adev,bool enable) {int i; -if (enable) +if (enable) {WREG32 (mmCP_ME_CNTL,0 ); -else { -WREG32 (mmCP_ME_CNTL, (CP_ME_CNTL__CE_HALT_MASK | + }else { +WREG32 (mmCP_ME_CNTL, (CP_ME_CNTL__ME_HALT_MASK |CP_ME_CNTL__PFP_HALT_MASK |CP_ME_CNTL__CE_HALT_MASK ));WREG32 (mmSCRATCH_UMSK,0 );
@@ -1899,6 +1899,7 @@ static int gfx_v6_0_cp_compute_resume(struct amdgpu_device *adev) r =amdgpu_ring_test_ring (&adev->gfx.compute_ring[i]);if (r)return r; + adev->gfx.compute_ring[i].ready = true; }return 0 ;
Signature · 6 lines
2.10.0 _______________________________________________ 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]
Am 10.11.2016 um 15:06 schrieb Tom St Denis:
Quoted 4 lines
This patch fixes a couple of bugs that fell out from the porting effort.
Signed-off-by Tom St Denis <[email protected]>
Patch is Reviewed-by: Christian König <[email protected]>.
Quoted 23 lines
--- drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +3
-3@@ -1607,10 +1607,10 @@ err1:static void gfx_v6_0_cp_gfx_enable (struct amdgpu_device *adev,bool enable) {int i; -if (enable) +if (enable) {WREG32 (mmCP_ME_CNTL,0 ); -else { -WREG32 (mmCP_ME_CNTL, (CP_ME_CNTL__CE_HALT_MASK | + }else { +WREG32 (mmCP_ME_CNTL, (CP_ME_CNTL__ME_HALT_MASK |CP_ME_CNTL__PFP_HALT_MASK |CP_ME_CNTL__CE_HALT_MASK ));WREG32 (mmSCRATCH_UMSK,0 );
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c static int gfx_v6_0_cp_compute_resume(struct amdgpu_device *adev) · line 1905
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +1
-0@@ -1899,6 +1899,7 @@ static int gfx_v6_0_cp_compute_resume(struct amdgpu_device *adev) r =amdgpu_ring_test_ring (&adev->gfx.compute_ring[i]);if (r)return r; + adev->gfx.compute_ring[i].ready = true; }return 0 ;
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Deucher, Alexander
Reviewed-by Alex DeucherQuoted 9 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Tom St Denis
Sent: Thursday, November 10, 2016 9:07 AM
To: [email protected]
Cc: StDenis, Tom
Subject: [PATCH] drm/amd/amdgpu: Fix gfxv6 driver issues from porting to new headers
Quoted 4 lines
This patch fixes a couple of bugs that fell out from the porting effort.
Signed-off-by Tom St Denis <[email protected]>
Quoted 38 lines
--- drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +1
-3@@ -1607,10 +1607,10 @@ err1:static void gfx_v6_0_cp_gfx_enable (struct amdgpu_device *adev,bool enable) {int i; -if (enable) +if (enable) {WREG32 (mmCP_ME_CNTL,0 ); -else { - WREG32(mmCP_ME_CNTL, (CP_ME_CNTL__CE_HALT_MASK|
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2
-0+ }else { + WREG32(mmCP_ME_CNTL,(
CP_ME_CNTL__ME_HALT_MASK|drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +1
-0CP_ME_CNTL__PFP_HALT_MASK | CP_ME_CNTL__CE_HALT_MASK));WREG32 (mmSCRATCH_UMSK,0 );@@ -1899,6 +1899,7 @@ static int gfx_v6_0_cp_compute_resume(struct amdgpu_device *adev) r =amdgpu_ring_test_ring (&adev->gfx.compute_ring[i]);if (r)return r; + adev->gfx.compute_ring[i].ready = true; }return 0;
--
2.10.0
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx