From: Dave Airlie <airlied@redhat.com>
Date: Wed, 7 Jul 2010 08:37:35 +0000 (+1000)
Subject: Merge branch 'drm-platform' into drm-testing
X-Git-Tag: v2.6.36-rc1~540^2~39
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=db8cc27b804f89e8fd5f9d5385161956a777c471;p=karo-tx-linux.git

Merge branch 'drm-platform' into drm-testing

* drm-platform:
  drm: Make sure the DRM offset matches the CPU
  drm: Add __arm defines to DRM
  drm: Add support for platform devices to register as DRM devices
  drm: Remove drm_resource wrappers
---

db8cc27b804f89e8fd5f9d5385161956a777c471
diff --cc drivers/gpu/drm/radeon/radeon_bios.c
index 2c9213739999,91f5b5a29a9f..654787ec43f4
--- a/drivers/gpu/drm/radeon/radeon_bios.c
+++ b/drivers/gpu/drm/radeon/radeon_bios.c
@@@ -48,12 -48,8 +48,12 @@@ static bool igp_read_bios_from_vram(str
  	resource_size_t vram_base;
  	resource_size_t size = 256 * 1024; /* ??? */
  
 +	if (!(rdev->flags & RADEON_IS_IGP))
 +		if (!radeon_card_posted(rdev))
 +			return false;
 +
  	rdev->bios = NULL;
- 	vram_base = drm_get_resource_start(rdev->ddev, 0);
+ 	vram_base = pci_resource_start(rdev->pdev, 0);
  	bios = ioremap(vram_base, size);
  	if (!bios) {
  		return false;