]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
Merge branch 'drm-next-4.15' of git://people.freedesktop.org/~agd5f/linux into drm-next
authorDave Airlie <airlied@redhat.com>
Mon, 6 Nov 2017 06:18:59 +0000 (16:18 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 6 Nov 2017 06:18:59 +0000 (16:18 +1000)
some more amd/ttm fixes.

* 'drm-next-4.15' of git://people.freedesktop.org/~agd5f/linux:
  drm/ttm: Downgrade pr_err to pr_debug for memory allocation failures
  drm/ttm: Always and only destroy bo->ttm_resv in ttm_bo_release_list
  drm/amd/amdgpu: Enabling ACP clock in hw_init (v2)
  drm/amdgpu/virt: don't dereference undefined 'module' struct


Trivial merge