From: Dave Airlie Date: Wed, 20 May 2015 06:23:53 +0000 (+1000) Subject: Backmerge v4.1-rc4 into into drm-next X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bdcddf95e82b1c4e370fc1196b1f4f50f775dab4;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Backmerge v4.1-rc4 into into drm-next We picked up a silent conflict in amdkfd with drm-fixes and drm-next, backmerge v4.1-rc5 and fix the conflicts Signed-off-by: Dave Airlie Conflicts: drivers/gpu/drm/drm_irq.c --- bdcddf95e82b1c4e370fc1196b1f4f50f775dab4 diff --cc drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c index 078092c5a59f,596ee5cd3b84..4e215bd4d41f --- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c @@@ -884,6 -883,8 +885,7 @@@ static int create_queue_cpsch(struct de return -ENOMEM; } - init_sdma_vm(dqm, q, qpd); - ++ dqm->ops_asic_specific.init_sdma_vm(dqm, q, qpd); retval = mqd->init_mqd(mqd, &q->mqd, &q->mqd_mem_obj, &q->gart_mqd_addr, &q->properties); if (retval != 0)