Merge tag 'exynos-drm-fixes-for-v4.17-rc2' of git://git.kernel.org/pub/scm/linux...

Remove Exynos specific framebuffer structure and
relevant functions.
- it removes exynos_drm_fb structure which is a wrapper of
  drm_framebuffer and unnecessary two exynos specific callback
  functions, exynos_drm_destory() and exynos_drm_fb_create_handle()
  because we can reuse existing drm common callback ones instead.

* tag 'exynos-drm-fixes-for-v4.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos:
  drm/exynos: exynos_drm_fb -> drm_framebuffer
  drm/exynos: Move dma_addr out of exynos_drm_fb
  drm/exynos: Move GEM BOs to drm_framebuffer
  drm/amdkfd: Deallocate SDMA queues correctly
  drm/amdkfd: Fix scratch memory with HWS enabled

diff --cc drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
index c18e048f23c6d7aa2d3e0af53ff0d3a273945253,1bd5f26b3f0023aedd902758a237bcd8d52afc54..d55d29d31da4eec6f932c0f2704dd8ca7c271b50
--- 1/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
--- 2/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
@@@ -1075,16 -838,8 +1075,16 @@@ static int create_queue_cpsch(struct de
  
        if (!mqd) {
                retval = -ENOMEM;
-               goto out;
+               goto out_deallocate_sdma_queue;
        }
 +      /*
 +       * Eviction state logic: we only mark active queues as evicted
 +       * to avoid the overhead of restoring inactive queues later
 +       */
 +      if (qpd->evicted)
 +              q->properties.is_evicted = (q->properties.queue_size > 0 &&
 +                                          q->properties.queue_percent > 0 &&
 +                                          q->properties.queue_address != 0);
  
        dqm->asic_ops.init_sdma_vm(dqm, q, qpd);
  

diff --cc drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c
Simple merge