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

diff --cc drivers/gpu/drm/drm_bufs.c
Simple merge

diff --cc drivers/gpu/drm/drm_sysfs.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_dma.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_drv.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_drv.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_mem.c
Simple merge

diff --cc drivers/gpu/drm/radeon/evergreen.c
Simple merge

diff --cc drivers/gpu/drm/radeon/r100.c
Simple merge

diff --cc drivers/gpu/drm/radeon/r600.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_bios.c
index 2c92137,91f5b5a..654787e
--- 1/drivers/gpu/drm/radeon/radeon_bios.c
--- 2/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;

diff --cc drivers/gpu/drm/radeon/radeon_device.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_drv.c
Simple merge

diff --cc drivers/gpu/drm/radeon/rs600.c
Simple merge

diff --cc drivers/gpu/drm/radeon/rs690.c
Simple merge

diff --cc drivers/gpu/drm/radeon/rv770.c
Simple merge

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
Simple merge