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

Commit d883f7f1 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Dave Airlie
Browse files

drm: Use resource_size_t for drm_get_resource_{start, len} 



The DRM uses its own wrappers to obtain resources from PCI devices,
which currently convert the resource_size_t into an unsigned long.

This is broken on 32-bit platforms with >32-bit physical address
space.

This fixes them, along with a few occurences of unsigned long used
to store such a resource in drivers.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent 041b6237

drivers/gpu/drm/drm_bufs.c

+2 −2
Original line number Diff line number Diff line
@@ -36,13 +36,13 @@ 
#include <linux/vmalloc.h>

#include "drmP.h"



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

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);



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

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

{

	return pci_resource_len(dev->pdev, resource);

}

drivers/gpu/drm/i915/i915_dma.c

+1 −1
Original line number Diff line number Diff line
@@ -1057,7 +1057,7 @@ void i915_master_destroy(struct drm_device *dev, struct drm_master *master) 
int i915_driver_load(struct drm_device *dev, unsigned long flags)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	unsigned long base, size;

	resource_size_t base, size;

	int ret = 0, mmio_bar = IS_I9XX(dev) ? 0 : 1;



	/* i915 has 4 more counters */

drivers/gpu/drm/mga/mga_drv.h

+2 −2
Original line number Diff line number Diff line
@@ -113,8 +113,8 @@ typedef struct drm_mga_private { 
	 * \sa drm_mga_private_t::mmio

	 */

	/*@{ */

	u32 mmio_base;		   /**< Bus address of base of MMIO. */

	u32 mmio_size;		   /**< Size of the MMIO region. */

	resource_size_t mmio_base;	   /**< Bus address of base of MMIO. */

	resource_size_t mmio_size;	   /**< Size of the MMIO region. */

	/*@} */



	u32 clear_cmd;

drivers/gpu/drm/radeon/radeon_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ typedef struct drm_radeon_private { 


	/* starting from here on, data is preserved accross an open */

	uint32_t flags;		/* see radeon_chip_flags */

	unsigned long fb_aper_offset;

	resource_size_t fb_aper_offset;



	int num_gb_pipes;

	int track_flush;

drivers/gpu/drm/savage/savage_bci.c

+4 −4
Original line number Diff line number Diff line
@@ -599,8 +599,8 @@ int savage_driver_firstopen(struct drm_device *dev) 
			    drm_mtrr_add(dev_priv->mtrr[2].base,

					 dev_priv->mtrr[2].size, DRM_MTRR_WC);

		} else {

			DRM_ERROR("strange pci_resource_len %08lx\n",

				  drm_get_resource_len(dev, 0));

			DRM_ERROR("strange pci_resource_len %08llx\n",

				  (unsigned long long)drm_get_resource_len(dev, 0));

		}

	} else if (dev_priv->chipset != S3_SUPERSAVAGE &&

		   dev_priv->chipset != S3_SAVAGE2000) {
@@ -620,8 +620,8 @@ int savage_driver_firstopen(struct drm_device *dev) 
			    drm_mtrr_add(dev_priv->mtrr[0].base,

					 dev_priv->mtrr[0].size, DRM_MTRR_WC);

		} else {

			DRM_ERROR("strange pci_resource_len %08lx\n",

				  drm_get_resource_len(dev, 1));

			DRM_ERROR("strange pci_resource_len %08llx\n",

				  (unsigned long long)drm_get_resource_len(dev, 1));

		}

	} else {

		mmio_base = drm_get_resource_start(dev, 0);