Merge branch 'drm-fixes-4.3' of git://people.freedesktop.org/~agd5f/linux into drm...
authorDave Airlie <airlied@redhat.com>
Thu, 22 Oct 2015 00:24:55 +0000 (10:24 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 22 Oct 2015 00:24:55 +0000 (10:24 +1000)
commitc50f13f911b90a722308bffbf26187ff3890aa1e
tree0a0f6a316a123be939664c19985b07c14bc5885b
parentc2a75586ff27ee7636bb2bf33ee66992a6603e49
parent677c884ff6370add1360e2b9558285355ebe2b36
Merge branch 'drm-fixes-4.3' of git://people.freedesktop.org/~agd5f/linux into drm-fixes

Just a crash fix for radeon and amdgpu if the user has forcibly disabled
dpm and tries to access the pwm sysfs controls.

* 'drm-fixes-4.3' of git://people.freedesktop.org/~agd5f/linux:
  drm/amdgpu: add missing dpm check for KV dpm late init
  drm/amdgpu/dpm: don't add pwm attributes if DPM is disabled
  drm/radeon/dpm: don't add pwm attributes if DPM is disabled