]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
drm/amdgpu: fix merge of vcn_v1_0.c v2
authorChristian König <christian.koenig@amd.com>
Mon, 22 May 2017 11:22:34 +0000 (13:22 +0200)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 24 May 2017 22:21:29 +0000 (18:21 -0400)
commitf5f3b16aae4ace99c330e54afe87f32aad3932dc
tree340aeeaa4e1d1494313c303d959ed37fdbade0c7
parent9a94f5a593c05c08ee309a55f618973427c5e074
drm/amdgpu: fix merge of vcn_v1_0.c v2

That line got missed during the merge.

v2: fix vcn_v1_0_enc_ring_emit_vm_flush as well

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c