From: Dave Airlie <airlied@gmail.com>
Date: Fri, 4 Sep 2015 21:46:09 +0000 (+1000)
Subject: Merge branch 'drm-next-4.3' of git://people.freedesktop.org/~agd5f/linux into drm... 
X-Git-Tag: v4.14-rc1~4701^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=73bf1b7be7aab60d7c651402441dd0b0b4991098;p=platform%2Fkernel%2Flinux-rpi.git

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

A few more fixes for amdgpu from the last few days:
- Fix several copy paste typos
- Resume from suspend fixes for VCE
- Fix the GPU scheduler warning in kfifo_out
- Re-enable GPUVM fault interrupts which were inadvertently disabled
- GPUVM page table hang fix when paging

* 'drm-next-4.3' of git://people.freedesktop.org/~agd5f/linux:
  drm/amdgpu: rename gmc_v8_0_init_compute_vmid
  drm/amdgpu: fix vce3 instance handling
  drm/amdgpu: remove ib test for the second VCE Ring
  drm/amdgpu: properly enable VM fault interrupts
  drm/amdgpu: fix warning in scheduler
  drm/amdgpu: fix buffer placement under memory pressure
  drm/amdgpu/cz: fix cz_dpm_update_low_memory_pstate logic
  drm/amdgpu: fix typo in dce11 watermark setup
  drm/amdgpu: fix typo in dce10 watermark setup
  drm/amdgpu: use top down allocation for non-CPU accessible vram
  drm/amdgpu: be explicit about cpu vram access for driver BOs (v2)
---

73bf1b7be7aab60d7c651402441dd0b0b4991098