Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

Browse source

* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/fb: fix FBIOGET/PUT_VSCREENINFO pixel clock handling
  drm: make sure page protections are updated after changing vm_flags
  drm/radeon/kms: Report vga connector is connected according to ddc_probe
  drm: mm always protect change to unused_nodes with unused_lock spinlock
  drm/radeon/kms: Disable TV load detect on RS400,RC410,RS480
  drm/radeon/kms: read back register before writing in IIO.
  drm/radeon/kms: fix handling of d1/d2 vga
  drm: work around EDIDs with bad htotal/vtotal values
  drm/radeon/kms: resume AGP by calling init.

...

This commit is contained in:

Linus Torvalds 2009-11-30 13:54:10 -08:00

parent f507334503 5349ef3127

commit 23e041dbaa

10 changed files with 51 additions and 13 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

6

drivers/gpu/drm/drm_edid.c

View file

6

drivers/gpu/drm/drm_fb_helper.c

View file

2

drivers/gpu/drm/drm_gem.c

View file

9

drivers/gpu/drm/drm_mm.c

View file

1

drivers/gpu/drm/radeon/atom.c

View file

1

drivers/gpu/drm/radeon/radeon.h

View file

12

drivers/gpu/drm/radeon/radeon_agp.c

View file

16

drivers/gpu/drm/radeon/radeon_connectors.c

View file

2

drivers/gpu/drm/radeon/radeon_device.c

View file

9

drivers/gpu/drm/radeon/rv515.c

View file