diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-10-25 11:36:05 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-10-26 10:58:28 +1000 |
| commit | 96fb1a241de128d75d5335c24392b065033c2dbe (patch) | |
| tree | f42c2a922c4147de1225683740e35d1220fd4ccb /drivers/gpu/drm/radeon/r300.c | |
| parent | b8e902f24fdd16c4373ddc37a4e150c4afe9c6db (diff) | |
| parent | 0b90365e7a32317b948583c4b5c2712d84610b08 (diff) | |
| download | linux-3.10-96fb1a241de128d75d5335c24392b065033c2dbe.tar.gz linux-3.10-96fb1a241de128d75d5335c24392b065033c2dbe.tar.bz2 linux-3.10-96fb1a241de128d75d5335c24392b065033c2dbe.zip | |
Merge branch 'drm-fixes-3.7' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
Alex writes:
"Fixes pull request for radeon. The main things here are
fixing a ATPX regression from the acpi rework, fixing some
fallout from the async VM work, and fixing some module options
that were broken in certain cases. Other than that, mainly
just bug fixes."
* 'drm-fixes-3.7' of git://people.freedesktop.org/~agd5f/linux:
drm/radeon: fix ATPX regression in acpi rework
drm/radeon: fix ATPX function documentation
drm/radeon: move the retry to gem_object_create
drm/radeon: move size limits to gem_object_create.
drm/radeon: use vzalloc for gart pages
drm/radeon: fix and simplify pot argument checks v3
drm/radeon: fix header size estimation in VM code
drm/radeon: remove set_page check from VM code
drm/radeon: fix si_set_page v2
drm/radeon: fix cayman_vm_set_page v2
drm/radeon: fix PFP sync in vm_flush
drm/radeon: add error output if VM CS fails on cayman
drm/radeon: give each backlight a unique id
drm/radeon: fix sparse warning
drm/radeon: add some new SI PCI ids
Diffstat (limited to 'drivers/gpu/drm/radeon/r300.c')
0 files changed, 0 insertions, 0 deletions