From: Dave Airlie Date: Tue, 9 Jul 2013 00:49:39 +0000 (+1000) Subject: Merge branch 'drm-next-3.11' of git://people.freedesktop.org/~agd5f/linux into drm... X-Git-Tag: v3.12-rc1~464^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=774d8e34e46506222bb5e2888e3ef42b2775715f;p=kernel%2Fkernel-generic.git Merge branch 'drm-next-3.11' of git://people.freedesktop.org/~agd5f/linux into drm-next A few more DPM fixes based on user testing. * 'drm-next-3.11' of git://people.freedesktop.org/~agd5f/linux: drm/radeon/dpm: implement vblank_too_short callback for si drm/radeon/dpm: implement vblank_too_short callback for cayman drm/radeon/dpm: implement vblank_too_short callback for btc drm/radeon/dpm: implement vblank_too_short callback for evergreen drm/radeon/dpm: implement vblank_too_short callback for 7xx drm/radeon/dpm: add checks against vblank time drm/radeon/dpm: add helper to calculate vblank time drm/radeon: remove stray line in old pm code drm/radeon/dpm: fix display_gap programming on rv7xx drm/radeon/dpm: implement force performance level for TN drm/radeon/dpm: implement force performance level for ON/LN drm/radeon/dpm: implement force performance level for SI drm/radeon/dpm: implement force performance level for cayman drm/radeon/dpm: implement force performance levels for 7xx/eg/btc drm/radeon/dpm: add infrastructure to force performance levels drm/radeon: fix surface setup on r1xx drm/radeon: add support for 3d perf states on older asics drm/radeon: set default clocks for SI when DPM is disabled --- 774d8e34e46506222bb5e2888e3ef42b2775715f