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

Commit 92514243 authored by Dave Airlie's avatar Dave Airlie Committed by Dave Airlie
Browse files

drm: update VIA driver to 2.7.2 



Add PCI DMA blitengine to VIA DRM
Add portability code for porting VIA to FreeBSD.
Sync via_drm.h with 3d driver

From: Thomas Hellstrom <unichrome@shipmail.org>, Eric Anholt <anholt@freebsd.org>
Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent 792d2b9a

drivers/char/drm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o 
ffb-objs    := ffb_drv.o ffb_context.o

sis-objs    := sis_drv.o sis_ds.o sis_mm.o

savage-objs := savage_drv.o savage_bci.o savage_state.o

via-objs    := via_irq.o via_drv.o via_ds.o via_map.o via_mm.o via_dma.o via_verifier.o via_video.o

via-objs    := via_irq.o via_drv.o via_ds.o via_map.o via_mm.o via_dma.o via_verifier.o via_video.o via_dmablit.o



ifeq ($(CONFIG_COMPAT),y)

drm-objs    += drm_ioc32.o

drivers/char/drm/drm_os_linux.h

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#define DRM_ERR(d)			-(d)

/** Current process ID */

#define DRM_CURRENTPID			current->pid

#define DRM_SUSER(p)			capable(CAP_SYS_ADMIN)

#define DRM_UDELAY(d)			udelay(d)

/** Read a byte from a MMIO region */

#define DRM_READ8(map, offset)		readb(((void __iomem *)(map)->handle) + (offset))

drivers/char/drm/via_dma.c

+26 −10
Original line number Diff line number Diff line
@@ -213,7 +213,9 @@ static int via_initialize(drm_device_t * dev, 
	dev_priv->dma_wrap = init->size;

	dev_priv->dma_offset = init->offset;

	dev_priv->last_pause_ptr = NULL;

	dev_priv->hw_addr_ptr = dev_priv->mmio->handle + init->reg_pause_addr;

	dev_priv->hw_addr_ptr =

		(volatile uint32_t *)((char *)dev_priv->mmio->handle +

		init->reg_pause_addr);



	via_cmdbuf_start(dev_priv);
@@ -232,13 +234,13 @@ int via_dma_init(DRM_IOCTL_ARGS) 


	switch (init.func) {

	case VIA_INIT_DMA:

		if (!capable(CAP_SYS_ADMIN))

		if (!DRM_SUSER(DRM_CURPROC))

			retcode = DRM_ERR(EPERM);

		else

			retcode = via_initialize(dev, dev_priv, &init);

		break;

	case VIA_CLEANUP_DMA:

		if (!capable(CAP_SYS_ADMIN))

		if (!DRM_SUSER(DRM_CURPROC))

			retcode = DRM_ERR(EPERM);

		else

			retcode = via_dma_cleanup(dev);
@@ -349,9 +351,6 @@ int via_cmdbuffer(DRM_IOCTL_ARGS) 
	return 0;

}



extern int

via_parse_command_stream(drm_device_t * dev, const uint32_t * buf,

			 unsigned int size);

static int via_dispatch_pci_cmdbuffer(drm_device_t * dev,

				      drm_via_cmdbuffer_t * cmd)

{
@@ -450,9 +449,9 @@ static int via_hook_segment(drm_via_private_t * dev_priv, 
	if ((count <= 8) && (count >= 0)) {

		uint32_t rgtr, ptr;

		rgtr = *(dev_priv->hw_addr_ptr);

		ptr = ((char *)dev_priv->last_pause_ptr - dev_priv->dma_ptr) +

		    dev_priv->dma_offset + (uint32_t) dev_priv->agpAddr + 4 -

		    CMDBUF_ALIGNMENT_SIZE;

		ptr = ((volatile char *)dev_priv->last_pause_ptr -

		      dev_priv->dma_ptr) + dev_priv->dma_offset +

		      (uint32_t) dev_priv->agpAddr + 4 - CMDBUF_ALIGNMENT_SIZE;

		if (rgtr <= ptr) {

			DRM_ERROR

			    ("Command regulator\npaused at count %d, address %x, "
@@ -472,7 +471,7 @@ static int via_hook_segment(drm_via_private_t * dev_priv, 
		       && count--) ;



		rgtr = *(dev_priv->hw_addr_ptr);

		ptr = ((char *)paused_at - dev_priv->dma_ptr) +

		ptr = ((volatile char *)paused_at - dev_priv->dma_ptr) +

		    dev_priv->dma_offset + (uint32_t) dev_priv->agpAddr + 4;



		ptr_low = (ptr > 3 * CMDBUF_ALIGNMENT_SIZE) ?
@@ -724,3 +723,20 @@ int via_cmdbuf_size(DRM_IOCTL_ARGS) 
			       sizeof(d_siz));

	return ret;

}



drm_ioctl_desc_t via_ioctls[] = {

	[DRM_IOCTL_NR(DRM_VIA_ALLOCMEM)] = {via_mem_alloc, 1, 0},

	[DRM_IOCTL_NR(DRM_VIA_FREEMEM)] = {via_mem_free, 1, 0},

	[DRM_IOCTL_NR(DRM_VIA_AGP_INIT)] = {via_agp_init, 1, 0},

	[DRM_IOCTL_NR(DRM_VIA_FB_INIT)] = {via_fb_init, 1, 0},

	[DRM_IOCTL_NR(DRM_VIA_MAP_INIT)] = {via_map_init, 1, 0},

	[DRM_IOCTL_NR(DRM_VIA_DEC_FUTEX)] = {via_decoder_futex, 1, 0},

	[DRM_IOCTL_NR(DRM_VIA_DMA_INIT)] = {via_dma_init, 1, 0},

	[DRM_IOCTL_NR(DRM_VIA_CMDBUFFER)] = {via_cmdbuffer, 1, 0},

	[DRM_IOCTL_NR(DRM_VIA_FLUSH)] = {via_flush_ioctl, 1, 0},

	[DRM_IOCTL_NR(DRM_VIA_PCICMD)] = {via_pci_cmdbuffer, 1, 0},

	[DRM_IOCTL_NR(DRM_VIA_CMDBUF_SIZE)] = {via_cmdbuf_size, 1, 0},

	[DRM_IOCTL_NR(DRM_VIA_WAIT_IRQ)] = {via_wait_irq, 1, 0}

};



int via_max_ioctl = DRM_ARRAY_SIZE(via_ioctls);

drivers/char/drm/via_drm.h

+43 −17
Original line number Diff line number Diff line
@@ -75,6 +75,8 @@ 
#define DRM_VIA_CMDBUF_SIZE	0x0b

#define NOT_USED

#define DRM_VIA_WAIT_IRQ        0x0d

#define DRM_VIA_DMA_BLIT        0x0e

#define DRM_VIA_BLIT_SYNC       0x0f



#define DRM_IOCTL_VIA_ALLOCMEM	  DRM_IOWR(DRM_COMMAND_BASE + DRM_VIA_ALLOCMEM, drm_via_mem_t)

#define DRM_IOCTL_VIA_FREEMEM	  DRM_IOW( DRM_COMMAND_BASE + DRM_VIA_FREEMEM, drm_via_mem_t)
@@ -89,6 +91,8 @@ 
#define DRM_IOCTL_VIA_CMDBUF_SIZE DRM_IOWR( DRM_COMMAND_BASE + DRM_VIA_CMDBUF_SIZE, \

					    drm_via_cmdbuf_size_t)

#define DRM_IOCTL_VIA_WAIT_IRQ    DRM_IOWR( DRM_COMMAND_BASE + DRM_VIA_WAIT_IRQ, drm_via_irqwait_t)

#define DRM_IOCTL_VIA_DMA_BLIT    DRM_IOW(DRM_COMMAND_BASE + DRM_VIA_DMA_BLIT, drm_via_dmablit_t)

#define DRM_IOCTL_VIA_BLIT_SYNC   DRM_IOW(DRM_COMMAND_BASE + DRM_VIA_BLIT_SYNC, drm_via_blitsync_t)



/* Indices into buf.Setup where various bits of state are mirrored per

 * context and per buffer.  These can be fired at the card as a unit,
@@ -103,8 +107,12 @@ 
#define VIA_BACK    0x2

#define VIA_DEPTH   0x4

#define VIA_STENCIL 0x8

#define VIDEO 0

#define AGP 1

#define VIA_MEM_VIDEO   0	/* matches drm constant */

#define VIA_MEM_AGP     1	/* matches drm constant */

#define VIA_MEM_SYSTEM  2

#define VIA_MEM_MIXED   3

#define VIA_MEM_UNKNOWN 4



typedef struct {

	uint32_t offset;

	uint32_t size;
@@ -192,6 +200,9 @@ typedef struct _drm_via_sarea { 
	unsigned int XvMCSubPicOn[VIA_NR_XVMC_PORTS];

	unsigned int XvMCCtxNoGrabbed;	/* Last context to hold decoder */



	/* Used bt the 3d driver only at this point, for pageflipping:

	 */

	unsigned int pfCurrentOffset;

} drm_via_sarea_t;



typedef struct _drm_via_cmdbuf_size {
@@ -212,6 +223,16 @@ typedef enum { 


#define VIA_IRQ_FLAGS_MASK 0xF0000000



enum drm_via_irqs {

	drm_via_irq_hqv0 = 0,

	drm_via_irq_hqv1,

	drm_via_irq_dma0_dd,

	drm_via_irq_dma0_td,

	drm_via_irq_dma1_dd,

	drm_via_irq_dma1_td,

	drm_via_irq_num

};



struct drm_via_wait_irq_request {

	unsigned irq;

	via_irq_seq_type_t type;
@@ -224,20 +245,25 @@ typedef union drm_via_irqwait { 
	struct drm_wait_vblank_reply reply;

} drm_via_irqwait_t;



#ifdef __KERNEL__



int via_fb_init(DRM_IOCTL_ARGS);

int via_mem_alloc(DRM_IOCTL_ARGS);

int via_mem_free(DRM_IOCTL_ARGS);

int via_agp_init(DRM_IOCTL_ARGS);

int via_map_init(DRM_IOCTL_ARGS);

int via_decoder_futex(DRM_IOCTL_ARGS);

int via_dma_init(DRM_IOCTL_ARGS);

int via_cmdbuffer(DRM_IOCTL_ARGS);

int via_flush_ioctl(DRM_IOCTL_ARGS);

int via_pci_cmdbuffer(DRM_IOCTL_ARGS);

int via_cmdbuf_size(DRM_IOCTL_ARGS);

int via_wait_irq(DRM_IOCTL_ARGS);

typedef struct drm_via_blitsync {

	uint32_t sync_handle;

	unsigned engine;

} drm_via_blitsync_t;



typedef struct drm_via_dmablit {

	uint32_t num_lines;

	uint32_t line_length;

	

	uint32_t fb_addr;

	uint32_t fb_stride;



	unsigned char *mem_addr;

	uint32_t mem_stride;



	int bounce_buffer;

	int to_fb;



	drm_via_blitsync_t sync;

} drm_via_dmablit_t;



#endif

#endif				/* _VIA_DRM_H_ */

drivers/char/drm/via_drv.c

+4 −17
Original line number Diff line number Diff line
@@ -38,25 +38,12 @@ static struct pci_device_id pciidlist[] = { 
	viadrv_PCI_IDS

};



static drm_ioctl_desc_t ioctls[] = {

	[DRM_IOCTL_NR(DRM_VIA_ALLOCMEM)] = {via_mem_alloc, 1, 0},

	[DRM_IOCTL_NR(DRM_VIA_FREEMEM)] = {via_mem_free, 1, 0},

	[DRM_IOCTL_NR(DRM_VIA_AGP_INIT)] = {via_agp_init, 1, 0},

	[DRM_IOCTL_NR(DRM_VIA_FB_INIT)] = {via_fb_init, 1, 0},

	[DRM_IOCTL_NR(DRM_VIA_MAP_INIT)] = {via_map_init, 1, 0},

	[DRM_IOCTL_NR(DRM_VIA_DEC_FUTEX)] = {via_decoder_futex, 1, 0},

	[DRM_IOCTL_NR(DRM_VIA_DMA_INIT)] = {via_dma_init, 1, 0},

	[DRM_IOCTL_NR(DRM_VIA_CMDBUFFER)] = {via_cmdbuffer, 1, 0},

	[DRM_IOCTL_NR(DRM_VIA_FLUSH)] = {via_flush_ioctl, 1, 0},

	[DRM_IOCTL_NR(DRM_VIA_PCICMD)] = {via_pci_cmdbuffer, 1, 0},

	[DRM_IOCTL_NR(DRM_VIA_CMDBUF_SIZE)] = {via_cmdbuf_size, 1, 0},

	[DRM_IOCTL_NR(DRM_VIA_WAIT_IRQ)] = {via_wait_irq, 1, 0}

};



static struct drm_driver driver = {

	.driver_features =

	    DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_HAVE_IRQ |

	    DRIVER_IRQ_SHARED | DRIVER_IRQ_VBL,

	.load = via_driver_load,

	.unload = via_driver_unload,

	.context_ctor = via_init_context,

	.context_dtor = via_final_context,

	.vblank_wait = via_driver_vblank_wait,
@@ -69,8 +56,7 @@ static struct drm_driver driver = { 
	.reclaim_buffers = drm_core_reclaim_buffers,

	.get_map_ofs = drm_core_get_map_ofs,

	.get_reg_ofs = drm_core_get_reg_ofs,

	.ioctls = ioctls,

	.num_ioctls = DRM_ARRAY_SIZE(ioctls),

	.ioctls = via_ioctls,

	.fops = {

		 .owner = THIS_MODULE,

		 .open = drm_open,
@@ -95,6 +81,7 @@ static struct drm_driver driver = { 


static int __init via_init(void)

{

	driver.num_ioctls = via_max_ioctl;

	via_init_command_verifier();

	return drm_init(&driver);

}