From: Dave Airlie Date: Thu, 22 Oct 2015 00:24:55 +0000 (+1000) Subject: Merge branch 'drm-fixes-4.3' of git://people.freedesktop.org/~agd5f/linux into drm... X-Git-Tag: firefly_0821_release~176^2~898^2 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=c50f13f911b90a722308bffbf26187ff3890aa1e;p=firefly-linux-kernel-4.4.55.git 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 --- c50f13f911b90a722308bffbf26187ff3890aa1e