From: Dave Airlie <airlied@redhat.com>
Date: Sun, 19 Nov 2017 20:14:14 +0000 (+1000)
Subject: Merge branch 'drm-next-4.15' of git://people.freedesktop.org/~agd5f/linux into drm... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1220a3e5698238c9d5f75dbaacd3938b60048496;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'drm-next-4.15' of git://people.freedesktop.org/~agd5f/linux into drm-next

Misc fixes for 4.15.

* 'drm-next-4.15' of git://people.freedesktop.org/~agd5f/linux:
  drm/amd/pp: fix dpm randomly failed on Vega10
  drm/amdgpu: set f_mapping on exported DMA-bufs
  drm/amdgpu: Properly allocate VM invalidate eng v2
  drm/amd/amdgpu: if visible VRAM allocation fail, fall back to invisible try again
  drm/amd/amdgpu: Fix wave mask in amdgpu_debugfs_wave_read() (v2)
  drm/amdgpu: make AMDGPU_VA_RESERVED_SIZE 64bit
  drm/amdgpu/gfx9: implement wave VGPR reading
  drm/amdgpu: Add common golden settings for GFX9
  drm/amd/powerplay: fix copy-n-paste error on vddci_buf index
  drm/amdgpu: Fix null pointer issue in amdgpu_cs_wait_any_fence
  drm/amdgpu: Remove check which is not valid for certain VBIOS
---

1220a3e5698238c9d5f75dbaacd3938b60048496