Commit 269dc512 authored by Dave Airlie's avatar Dave Airlie Committed by Dave Airlie
Browse files

drm: bring savage inline with latest CVS 



apply some whitespace cleanup and add wrappers for MTRR for OS calls

From: Eric Anholt <anholt@freebsd.org> + Dave Airlie <airlied@linux.ie>
Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent 3528af1b

drivers/char/drm/drmP.h

+15 −0
Original line number Diff line number Diff line
@@ -750,6 +750,21 @@ static inline int drm_core_has_MTRR(struct drm_device *dev) 
{

	return drm_core_check_feature(dev, DRIVER_USE_MTRR);

}



#define DRM_MTRR_WC		MTRR_TYPE_WRCOMB



static inline int drm_mtrr_add(unsigned long offset, unsigned long size,

			       unsigned int flags)

{

	return mtrr_add(offset, size, flags, 1);

}



static inline int drm_mtrr_del(int handle, unsigned long offset,

			       unsigned long size, unsigned int flags)

{

	return mtrr_del(handle, offset, size);

}



#else

#define drm_core_has_MTRR(dev) (0)

#endif

drivers/char/drm/savage_bci.c

+12 −17
Original line number Diff line number Diff line
@@ -584,21 +584,18 @@ int savage_driver_firstopen(drm_device_t *dev) 
			dev_priv->mtrr[0].base = fb_base;

			dev_priv->mtrr[0].size = 0x01000000;

			dev_priv->mtrr[0].handle =

			    mtrr_add(dev_priv->mtrr[0].base,

				     dev_priv->mtrr[0].size, MTRR_TYPE_WRCOMB,

				     1);

			    drm_mtrr_add(dev_priv->mtrr[0].base,

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

			dev_priv->mtrr[1].base = fb_base + 0x02000000;

			dev_priv->mtrr[1].size = 0x02000000;

			dev_priv->mtrr[1].handle =

			    mtrr_add(dev_priv->mtrr[1].base,

				     dev_priv->mtrr[1].size, MTRR_TYPE_WRCOMB,

				     1);

			    drm_mtrr_add(dev_priv->mtrr[1].base,

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

			dev_priv->mtrr[2].base = fb_base + 0x04000000;

			dev_priv->mtrr[2].size = 0x04000000;

			dev_priv->mtrr[2].handle =

			    mtrr_add(dev_priv->mtrr[2].base,

				     dev_priv->mtrr[2].size, MTRR_TYPE_WRCOMB,

				     1);

			    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));
@@ -618,9 +615,8 @@ int savage_driver_firstopen(drm_device_t *dev) 
			dev_priv->mtrr[0].base = fb_base;

			dev_priv->mtrr[0].size = 0x08000000;

			dev_priv->mtrr[0].handle =

			    mtrr_add(dev_priv->mtrr[0].base,

				     dev_priv->mtrr[0].size, MTRR_TYPE_WRCOMB,

				     1);

			    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));
@@ -664,9 +660,9 @@ void savage_driver_lastclose(drm_device_t *dev) 


	for (i = 0; i < 3; ++i)

		if (dev_priv->mtrr[i].handle >= 0)

			mtrr_del(dev_priv->mtrr[i].handle,

			drm_mtrr_del(dev_priv->mtrr[i].handle,

				 dev_priv->mtrr[i].base,

				 dev_priv->mtrr[i].size);

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

}



int savage_driver_unload(drm_device_t *dev)
@@ -1008,8 +1004,7 @@ static int savage_bci_event_wait(DRM_IOCTL_ARGS) 
 * DMA buffer management

 */



static int savage_bci_get_buffers(DRMFILE filp, drm_device_t * dev,

				  drm_dma_t * d)

static int savage_bci_get_buffers(DRMFILE filp, drm_device_t *dev, drm_dma_t *d)

{

	drm_buf_t *buf;

	int i;