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

Browse source

Pull drm fixes from Dave Airlie:
 "A smattering of fixes,

  mgag200:
      don't accept modes that aren't aligned properly as hw can't do it

  i915:
      two regression fixes

  radeon:
      one query to allow userspace fixes
      one oops fixer for older hw with new options enabled"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/radeon: don't probe MST on hw we don't support it on
  drm/radeon: Add RADEON_INFO_VA_UNMAP_WORKING query
  drm/mgag200: Reject non-character-cell-aligned mode widths
  Revert "drm/i915: Don't skip request retirement if the active list is empty"
  drm/i915: Always reset vma->ggtt_view.pages cache on unbinding

...

This commit is contained in:

Linus Torvalds 2015-06-20 13:54:22 -07:00

parent bb16140a2c fcee3c73a2

commit 8f4ce072bf

5 changed files with 18 additions and 1 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

5

drivers/gpu/drm/i915/i915_gem.c

View file

5

drivers/gpu/drm/mgag200/mgag200_mode.c

View file

5

drivers/gpu/drm/radeon/radeon_dp_mst.c

View file

3

drivers/gpu/drm/radeon/radeon_kms.c

View file

1

include/uapi/drm/radeon_drm.h

View file