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

Browse source

Pull radeon drm fixes from Dave Airlie:
 "This is just radeon fixes, primarily the two pll fix and the aux fix,
  it also disables dpm on rv770 gpus, fixes driver reloading, and fixes
  two issues with runtime PM on some GPUS"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/radeon: don't allow runpm=1 on systems with out ATPX
  drm/radeon: fix ATPX detection on non-VGA GPUs
  drm/radeon/pm: don't walk the crtc list before it has been initialized (v2)
  drm/radeon: properly unregister hwmon interface (v2)
  drm/radeon: fix count in cik_sdma_ring_test()
  drm/radeon/aux: fix hpd assignment for aux bus
  drm/radeon: improve PLL limit handling in post div calculation
  drm/radeon: use fixed PPL ref divider if needed
  drm/radeon: disable dpm on rv770 by default

...

This commit is contained in:

Linus Torvalds 2014-04-23 07:46:12 -07:00

parent 1b17844b29 abaafc0af9

commit 6db8148cc5

7 changed files with 120 additions and 68 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

drivers/gpu/drm/radeon/atombios_dp.c

View file

2

drivers/gpu/drm/radeon/cik_sdma.c

View file

35

drivers/gpu/drm/radeon/r600_dpm.c

View file

7

drivers/gpu/drm/radeon/radeon_atpx_handler.c

View file

84

drivers/gpu/drm/radeon/radeon_display.c

View file

8

drivers/gpu/drm/radeon/radeon_kms.c

View file

51

drivers/gpu/drm/radeon/radeon_pm.c

View file