drm/amdgpu: fix merge of vcn_v1_0.c
Subsystems (2)
PATCH 1/1 drm/amdgpu: fix merge of vcn_v1_0.c
From: Christian König <[email protected]>
That line got missed during the merge.
--- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +1 -0
@@ -882,6 +882,7 @@ static void vcn_v1_0_dec_ring_emit_vm_flush(struct amdgpu_ring *ring,uint32_t data0, data1, mask;unsigned eng = ring->vm_inv_eng; + pd_addr = ring->adev->gart.gart_funcs->adjust_mc_addr (ring->adev, pd_addr); pd_addr = pd_addr |0x1 ;/* valid bit */ /* now only use physical base address of PDE and valid */ BUG_ON (pd_addr &0xFFFF00000000003EULL );
Signature · 6 lines
2.7.4 _______________________________________________ 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): 1495452197-23206-1-git-send-email-deathsimple-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org
Zhang, Hawking
Reviewed-by Hawking ZhangI think vcn_v1_0_enc_ring_emit_vm_flush also requires this line. With that fixed the patch is
Regards,
Hawking
-----Original Message-----
From: Christian König [mailto:[email protected]]
Sent: Monday, May 22, 2017 19:23
To: [email protected]
Cc: Zhang, Hawking <[email protected]>
Subject: [PATCH] drm/amdgpu: fix merge of vcn_v1_0.c
From: Christian König <[email protected]>
That line got missed during the merge.
--- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +1 -0
@@ -882,6 +882,7 @@ static void vcn_v1_0_dec_ring_emit_vm_flush(struct amdgpu_ring *ring,uint32_t data0, data1, mask;unsigned eng = ring->vm_inv_eng; + pd_addr = ring->adev->gart.gart_funcs->adjust_mc_addr (ring->adev, pd_addr); pd_addr = pd_addr |0x1 ;/* valid bit */ /* now only use physical base address of PDE and valid */ BUG_ON (pd_addr &0xFFFF00000000003EULL );
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Zhang, Hawking
Reviewed-by Hawking ZhangI think vcn_v1_0_enc_ring_emit_vm_flush also requires this line. With that fixed the patch is
Regards,
Hawking
-----Original Message-----
From: Christian König [mailto:[email protected]]
Sent: Monday, May 22, 2017 19:23
To: [email protected]
Cc: Zhang, Hawking <[email protected]>
Subject: [PATCH] drm/amdgpu: fix merge of vcn_v1_0.c
From: Christian König <[email protected]>
That line got missed during the merge.
--- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +1 -0
@@ -882,6 +882,7 @@ static void vcn_v1_0_dec_ring_emit_vm_flush(struct amdgpu_ring *ring,uint32_t data0, data1, mask;unsigned eng = ring->vm_inv_eng; + pd_addr = ring->adev->gart.gart_funcs->adjust_mc_addr (ring->adev, pd_addr); pd_addr = pd_addr |0x1 ;/* valid bit */ /* now only use physical base address of PDE and valid */ BUG_ON (pd_addr &0xFFFF00000000003EULL );
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx