[PATCH] drm/amdgpu: fix merge of vcn_v1_0.c

Zhang, Hawking Hawking.Zhang at amd.com
Mon May 22 17:08:51 UTC 2017

I think vcn_v1_0_enc_ring_emit_vm_flush also requires this line. With that fixed the patch is 
Reviewed-by: Hawking Zhang <Hawking.Zhang at amd.com>


-----Original Message-----
From: Christian König [mailto:deathsimple at vodafone.de] 
Sent: Monday, May 22, 2017 19:23
To: amd-gfx at lists.freedesktop.org
Cc: Zhang, Hawking <Hawking.Zhang at amd.com>
Subject: [PATCH] drm/amdgpu: fix merge of vcn_v1_0.c

From: Christian König <christian.koenig at amd.com>

That line got missed during the merge.

Signed-off-by: Christian König <christian.koenig at amd.com>
 drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
index ad1862f..6fcf770 100644
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
@@ -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);

More information about the amd-gfx mailing list