Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01d73a69 authored by Jordan Crouse's avatar Jordan Crouse Committed by Dave Airlie
Browse files

drm: Remove drm_resource wrappers 



Remove the drm_resource wrappers and directly use the
actual PCI and/or platform functions in their place.

[airlied: fixup nouveau properly to build]

Signed-off-by: default avatarJordan Crouse <jcrouse@codeaurora.org>
Reviewed-by: default avatarMatt Turner <mattst88@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent cf22f20a

drivers/gpu/drm/drm_bufs.c

+0 −13
Original line number Diff line number Diff line
@@ -39,19 +39,6 @@ 
#include <asm/shmparam.h>

#include "drmP.h"



resource_size_t drm_get_resource_start(struct drm_device *dev, unsigned int resource)

{

	return pci_resource_start(dev->pdev, resource);

}

EXPORT_SYMBOL(drm_get_resource_start);



resource_size_t drm_get_resource_len(struct drm_device *dev, unsigned int resource)

{

	return pci_resource_len(dev->pdev, resource);

}



EXPORT_SYMBOL(drm_get_resource_len);



static struct drm_map_list *drm_find_matching_map(struct drm_device *dev,

						  struct drm_local_map *map)

{

drivers/gpu/drm/i915/i915_dma.c

+3 −3
Original line number Diff line number Diff line
@@ -1429,7 +1429,7 @@ static int i915_load_modeset_init(struct drm_device *dev, 
	int fb_bar = IS_I9XX(dev) ? 2 : 0;

	int ret = 0;



	dev->mode_config.fb_base = drm_get_resource_start(dev, fb_bar) &

	dev->mode_config.fb_base = pci_resource_start(dev->pdev, fb_bar) &

		0xff000000;



	/* Basic memrange allocator for stolen space (aka vram) */
@@ -1612,8 +1612,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) 


	/* Add register map (needed for suspend/resume) */

	mmio_bar = IS_I9XX(dev) ? 0 : 1;

	base = drm_get_resource_start(dev, mmio_bar);

	size = drm_get_resource_len(dev, mmio_bar);

	base = pci_resource_start(dev->pdev, mmio_bar);

	size = pci_resource_len(dev->pdev, mmio_bar);



	if (i915_get_bridge_dev(dev)) {

		ret = -EIO;

drivers/gpu/drm/mga/mga_dma.c

+2 −2
Original line number Diff line number Diff line
@@ -405,8 +405,8 @@ int mga_driver_load(struct drm_device * dev, unsigned long flags) 
	dev_priv->usec_timeout = MGA_DEFAULT_USEC_TIMEOUT;

	dev_priv->chipset = flags;



	dev_priv->mmio_base = drm_get_resource_start(dev, 1);

	dev_priv->mmio_size = drm_get_resource_len(dev, 1);

	dev_priv->mmio_base = pci_resource_start(dev->pdev, 1);

	dev_priv->mmio_size = pci_resource_len(dev->pdev, 1);



	dev->counters += 3;

	dev->types[6] = _DRM_STAT_IRQ;

drivers/gpu/drm/nouveau/nouveau_bo.c

+1 −1
Original line number Diff line number Diff line
@@ -783,7 +783,7 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem) 
		break;

	case TTM_PL_VRAM:

		mem->bus.offset = mem->mm_node->start << PAGE_SHIFT;

		mem->bus.base = drm_get_resource_start(dev, 1);

		mem->bus.base = pci_resource_start(dev->pdev, 1);

		mem->bus.is_iomem = true;

		break;

	default:

drivers/gpu/drm/nouveau/nouveau_channel.c

+2 −1
Original line number Diff line number Diff line
@@ -62,7 +62,8 @@ nouveau_channel_pushbuf_ctxdma_init(struct nouveau_channel *chan) 
		 * VRAM.

		 */

		ret = nouveau_gpuobj_dma_new(chan, NV_CLASS_DMA_IN_MEMORY,

					     drm_get_resource_start(dev, 1),

					     pci_resource_start(dev->pdev,

					     1),

					     dev_priv->fb_available_size,

					     NV_DMA_ACCESS_RO,

					     NV_DMA_TARGET_PCI, &pushbuf);