Merge remote branch 'korg/drm-radeon-testing' into drm-linus

Browse source

* korg/drm-radeon-testing:
  drm/radeon/kms: Use radeon_agp_disable when disabling AGP
  drm/radeon/kms: Disable AGP is aperture size < 32M
  drm/radeon/kms: Fix r600 blit cleanup path
  drm/radeon/kms: Do not unpin buffer in fb destruction
  drm/radeon/kms: fix displayport->dvi connector DDC.

...

This commit is contained in:

Dave Airlie 2010-01-15 15:40:39 +10:00

parent 79b7dcb2af 700a0cc088

commit 8471a26b9c

9 changed files with 45 additions and 31 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

4

drivers/gpu/drm/radeon/r100.c

View file

4

drivers/gpu/drm/radeon/r420.c

View file

21

drivers/gpu/drm/radeon/r600.c

View file

14

drivers/gpu/drm/radeon/r600_blit_kms.c

View file

2

drivers/gpu/drm/radeon/radeon.h

View file

7

drivers/gpu/drm/radeon/radeon_agp.c

View file

1

drivers/gpu/drm/radeon/radeon_device.c

View file

4

drivers/gpu/drm/radeon/radeon_display.c

View file

19

drivers/gpu/drm/radeon/rv770.c

View file