From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 7 Aug 2015 01:51:14 +0000 (+0300)
Subject: Merge branch 'drm-fixes-4.2' of git://people.freedesktop.org/~agd5f/linux
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a58997e1a6287068be2d923f5fde6102e7e08f56;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'drm-fixes-4.2' of git://people.freedesktop.org/~agd5f/linux

Pull amdgpu fixes from Alex Deucher:
 "Just a few amdgpu fixes to make sure we report the proper firmware
  information and number of render buffers to userspace and a typo in a
  debugging function"

[ Pulling directly from Alex since Dave Airlie is on vacation  - Linus ]

* 'drm-fixes-4.2' of git://people.freedesktop.org/~agd5f/linux:
  drm/amdgpu: set fw_version and feature_version for smu fw loading
  drm/amdgpu: add feature version for SDMA ucode
  drm/amdgpu: add feature version for RLC and MEC v2
  drm/amdgpu: increment queue when iterating on this variable.
  drm/amdgpu: fix rb setting for CZ
---

a58997e1a6287068be2d923f5fde6102e7e08f56