Merge branch 'drm-next-3.15' of git://people.freedesktop.org/~deathsimple/linux into drm-next

Browse source

- Rework of finding the right PLL numbers for display
- Couple of different bugfixes

* 'drm-next-3.15' of git://people.freedesktop.org/~deathsimple/linux:
  drm/radeon: fix typo in spectre_golden_registers
  drm/radeon: fix endian swap on hawaii clear state buffer setup
  drm/radeon: call drm_edid_to_eld when we update the edid
  drm/radeon: rework finding display PLL numbers v2
  drm/radeon: fix resuming mode in pm runtime resume path
  drm/radeon: fix runtime suspend breaking secondary GPUs
  drm/radeon: clear needs_reset flag if IB test fails

...

This commit is contained in:

Dave Airlie 2014-04-04 07:58:24 +10:00

parent 66e514c14a f1553174a2

commit a1b5fb3d34

5 changed files with 176 additions and 102 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

6

drivers/gpu/drm/radeon/cik.c

View file

10

drivers/gpu/drm/radeon/radeon_device.c

View file

248

drivers/gpu/drm/radeon/radeon_display.c

View file

17

drivers/gpu/drm/radeon/radeon_drv.c

View file

1

drivers/gpu/drm/radeon/radeon_ring.c

View file