From: Dave Airlie Date: Thu, 5 Dec 2013 02:18:35 +0000 (+1000) Subject: Merge branch 'drm-fixes-3.13' of git://people.freedesktop.org/~agd5f/linux into drm... X-Git-Tag: firefly_0821_release~176^2~4807^2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9255ce80f88ba885c38c0bbd235db7c24392e22e;p=firefly-linux-kernel-4.4.55.git Merge branch 'drm-fixes-3.13' of git://people.freedesktop.org/~agd5f/linux into drm-fixes Some additional fixes for 3.13. Regression fixes for audio and hw_i2c, vram fix for some SI PX cards, race fix in the hwmon code, and a few other odds and ends. * 'drm-fixes-3.13' of git://people.freedesktop.org/~agd5f/linux: drm/radeon/atom: fix bus probes when hw_i2c is set (v2) drm/radeon: fix null pointer dereference in dce6+ audio code drm/radeon: fixup bad vram size on SI drm/radeon: fix VGT_GS_INSTANCE_CNT register drm/radeon: Fix a typo in Cayman and Evergreen registers drm/radeon/dpm: simplify state adjust logic for NI drm/radeon: add radeon_vm_bo_update trace point drm/radeon: add VMID allocation trace point drm/radeon/dpm: Convert to use devm_hwmon_register_with_groups drm/radeon: program DCE2 audio dto just like DCE3 drm/radeon: fix typo in fetching mpll params --- 9255ce80f88ba885c38c0bbd235db7c24392e22e