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

Commit 443448d0 authored by Dave Airlie's avatar Dave Airlie Committed by Dave Airlie
Browse files

drm: via driver update to CVS version 



This updates the DRM via driver to the latest CVS version, which contains
support for DMA blitting.

It also contains some whitespace and other minor fixes

From: Thomas Hellstrom <unichrome@shipmail.org>
Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent a7a2cc31

drivers/char/drm/via_dma.c

+3 −1
Original line number Diff line number Diff line
@@ -736,7 +736,9 @@ drm_ioctl_desc_t via_ioctls[] = { 
	[DRM_IOCTL_NR(DRM_VIA_FLUSH)] = {via_flush_ioctl, DRM_AUTH},

	[DRM_IOCTL_NR(DRM_VIA_PCICMD)] = {via_pci_cmdbuffer, DRM_AUTH},

	[DRM_IOCTL_NR(DRM_VIA_CMDBUF_SIZE)] = {via_cmdbuf_size, DRM_AUTH},

	[DRM_IOCTL_NR(DRM_VIA_WAIT_IRQ)] = {via_wait_irq, DRM_AUTH}

	[DRM_IOCTL_NR(DRM_VIA_WAIT_IRQ)] = {via_wait_irq, DRM_AUTH},

	[DRM_IOCTL_NR(DRM_VIA_DMA_BLIT)] = {via_dma_blit, DRM_AUTH},

	[DRM_IOCTL_NR(DRM_VIA_BLIT_SYNC)] = {via_dma_blit_sync, DRM_AUTH}

};



int via_max_ioctl = DRM_ARRAY_SIZE(via_ioctls);

drivers/char/drm/via_dmablit.c

0 → 100644
+805 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/char/drm/via_dmablit.h

0 → 100644
+138 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/char/drm/via_drm.h

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ 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:

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

	 */

	unsigned int pfCurrentOffset;

} drm_via_sarea_t;

drivers/char/drm/via_drv.h

+2 −2
Original line number Diff line number Diff line
@@ -28,11 +28,11 @@ 


#define DRIVER_NAME		"via"

#define DRIVER_DESC		"VIA Unichrome / Pro"

#define DRIVER_DATE		"20051022"

#define DRIVER_DATE		"20051116"



#define DRIVER_MAJOR		2

#define DRIVER_MINOR		7

#define DRIVER_PATCHLEVEL	2

#define DRIVER_PATCHLEVEL	4



#include "via_verifier.h"