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

Browse source

Pull drm fixes from Dave Airlie:
 "i915 and radeon fixes:

  i915:
      fix for connector oops regression
      DDC probing fix

  radeon:
      two radeon reverts, along with a freeze workaround and a fix"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/radeon: Make sure radeon_vm_bo_set_addr always unreserves the BO
  Revert "drm/radeon: adjust pll when audio is not enabled"
  Revert "drm/radeon: don't share plls if monitors differ in audio support"
  drm/radeon: fix freeze for laptop with Turks/Thames GPU.
  drm/i915: Fix DDC probe for passive adapters
  drm/i915: Properly initialize SDVO analog connectors

...

This commit is contained in:

Linus Torvalds 2015-06-11 17:35:14 -07:00

parent cff100f5d7 6e2eb00fc5

commit df5f415841

5 changed files with 46 additions and 15 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

20

drivers/gpu/drm/i915/intel_i2c.c

View file

2

drivers/gpu/drm/i915/intel_sdvo.c

View file

7

drivers/gpu/drm/radeon/atombios_crtc.c

View file

15

drivers/gpu/drm/radeon/radeon_device.c

View file

17

drivers/gpu/drm/radeon/radeon_vm.c

View file