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

Browse source

two radeon fixes
	one MST fix,
	one query addition, destined for stable, and to fix a regression
* 'drm-fixes-4.1' of git://people.freedesktop.org/~deathsimple/linux:
  drm/radeon: don't probe MST on hw we don't support it on
  drm/radeon: Add RADEON_INFO_VA_UNMAP_WORKING query

...

This commit is contained in:

Dave Airlie 2015-06-19 11:55:29 +10:00

parent 25161084b1 7f017e5677

commit 031fea4367

3 changed files with 9 additions and 0 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/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