fdo-mirrors/mesa-drm
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/drm.git synced 2026-05-06 12:58:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

VIA bugvixes by Joris van Rantwijk Initial commit.

Browse source
This commit is contained in:
Thomas Hellstrom 2005-08-14 09:52:09 +00:00
parent 4050f5066a
commit 4f5961eeee
7 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
shared-core/via_drv.c
View file

@ -39,12 +39,16 @@ static struct pci_device_id pciidlist[] = {
viadrv_PCI_IDS
};
/*
* {function, auth_needed, master, root_only}
*/
static drm_ioctl_desc_t ioctls[] = {
[DRM_IOCTL_NR(DRM_VIA_ALLOCMEM)] = {via_mem_alloc, 1, 0, 0},
[DRM_IOCTL_NR(DRM_VIA_FREEMEM)] = {via_mem_free, 1, 0, 0},
[DRM_IOCTL_NR(DRM_VIA_AGP_INIT)] = {via_agp_init, 1, 0, 0},
[DRM_IOCTL_NR(DRM_VIA_FB_INIT)] = {via_fb_init, 1, 0, 0},
[DRM_IOCTL_NR(DRM_VIA_MAP_INIT)] = {via_map_init, 1, 0, 0},
[DRM_IOCTL_NR(DRM_VIA_AGP_INIT)] = {via_agp_init, 1, 1, 0},
[DRM_IOCTL_NR(DRM_VIA_FB_INIT)] = {via_fb_init, 1, 1, 0},
[DRM_IOCTL_NR(DRM_VIA_MAP_INIT)] = {via_map_init, 1, 1, 0},
[DRM_IOCTL_NR(DRM_VIA_DEC_FUTEX)] = {via_decoder_futex, 1, 0, 0},
[DRM_IOCTL_NR(DRM_VIA_DMA_INIT)] = {via_dma_init, 1, 0, 0},
[DRM_IOCTL_NR(DRM_VIA_CMDBUFFER)] = {via_cmdbuffer, 1, 0, 0},

4
shared-core/via_drv.h
View file

@ -28,11 +28,11 @@
#define DRIVER_NAME "via"
#define DRIVER_DESC "VIA Unichrome / Pro"
#define DRIVER_DATE "20050812"
#define DRIVER_DATE "20050814"
#define DRIVER_MAJOR 2
#define DRIVER_MINOR 6
#define DRIVER_PATCHLEVEL 6
#define DRIVER_PATCHLEVEL 7
#include "via_verifier.h"

2
shared-core/via_verifier.c
View file

@ -246,7 +246,7 @@ static hazard_t table3[256];
static __inline__ int
eat_words(const uint32_t **buf, const uint32_t *buf_end, unsigned num_words)
{
if ((*buf - buf_end) >= num_words) {
if ((buf_end - *buf) >= num_words) {
*buf += num_words;
return 0;
}

3
shared-core/via_video.c
View file

@ -53,6 +53,9 @@ via_release_futex(drm_via_private_t *dev_priv, int context)
unsigned int i;
volatile int *lock;
if (!dev_priv->sarea_priv)
return;
for (i=0; i < VIA_NR_XVMC_LOCKS; ++i) {
lock = (int *) XVMCLOCKPTR(dev_priv->sarea_priv, i);
if ( (_DRM_LOCKING_CONTEXT( *lock ) == context)) {

10
shared/via.h
View file

@ -30,18 +30,18 @@
#define DRIVER_NAME "via"
#define DRIVER_DESC "VIA Unichrome / Pro"
#define DRIVER_DATE "20050715"
#define DRIVER_DATE "20050814"
#define DRIVER_MAJOR 2
#define DRIVER_MINOR 6
#define DRIVER_PATCHLEVEL 4
#define DRIVER_PATCHLEVEL 7
#define DRIVER_IOCTLS \
[DRM_IOCTL_NR(DRM_IOCTL_VIA_ALLOCMEM)] = { via_mem_alloc, 1, 0 }, \
[DRM_IOCTL_NR(DRM_IOCTL_VIA_FREEMEM)] = { via_mem_free, 1, 0 }, \
[DRM_IOCTL_NR(DRM_IOCTL_VIA_AGP_INIT)] = { via_agp_init, 1, 0 }, \
[DRM_IOCTL_NR(DRM_IOCTL_VIA_FB_INIT)] = { via_fb_init, 1, 0 }, \
[DRM_IOCTL_NR(DRM_IOCTL_VIA_MAP_INIT)] = { via_map_init, 1, 0 }, \
[DRM_IOCTL_NR(DRM_IOCTL_VIA_AGP_INIT)] = { via_agp_init, 1, 1 }, \
[DRM_IOCTL_NR(DRM_IOCTL_VIA_FB_INIT)] = { via_fb_init, 1, 1 }, \
[DRM_IOCTL_NR(DRM_IOCTL_VIA_MAP_INIT)] = { via_map_init, 1, 1 }, \
[DRM_IOCTL_NR(DRM_IOCTL_VIA_DEC_FUTEX)] = { via_decoder_futex, 1, 0}, \
[DRM_IOCTL_NR(DRM_IOCTL_VIA_DMA_INIT)] = { via_dma_init, 1, 0}, \
[DRM_IOCTL_NR(DRM_IOCTL_VIA_CMDBUFFER)] = { via_cmdbuffer, 1, 0}, \

2
shared/via_verifier.c
View file

@ -248,7 +248,7 @@ static hazard_t table3[256];
static __inline__ int
eat_words(const uint32_t **buf, const uint32_t *buf_end, unsigned num_words)
{
if ((*buf - buf_end) >= num_words) {
if ((buf_end - *buf) >= num_words) {
*buf += num_words;
return 0;
}

6
shared/via_video.c
View file

@ -54,6 +54,9 @@ via_release_futex(drm_via_private_t *dev_priv, int context)
unsigned int i;
volatile int *lock;
if (!dev_priv->sarea_priv)
return;
for (i=0; i < VIA_NR_XVMC_LOCKS; ++i) {
lock = (int *) XVMCLOCKPTR(dev_priv->sarea_priv, i);
if ( (_DRM_LOCKING_CONTEXT( *lock ) == context)) {
@ -77,7 +80,8 @@ via_decoder_futex(DRM_IOCTL_ARGS)
DRM_DEBUG("%s\n", __FUNCTION__);
DRM_COPY_FROM_USER_IOCTL(fx, (drm_via_futex_t *) data, sizeof(fx));
DRM_COPY_FROM_USER_IOCTL(fx, (drm_via_futex_t __user *) data,
sizeof(fx));
if (fx.lock > VIA_NR_XVMC_LOCKS)
return -EFAULT;