renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-20 11:13:58 +08:00
Code

drm/sis: fixup sis_mm ioctl structs

Browse Source 
Userspace uses long in quite a few places more than the kernel. Which
gives me neat proof that I'm the only guy on this side of the galaxy
who ever tried to run glxgears on a 64bit machine with sis graphics on
linux.

Note that the longs in drm_sis_mem_t aren't aligned properly, so this
won't even work with 32bit userspace on 64bit kernel as-is. Hence the
patch can't break that, either.

Nope, I'm not nuts enough to write the 32bit ioctl compat layer for
this and test it with some wine app. Even though hunting the ebay
dungeons for a sis card actually supported by the mesa drivers casts
some doubts on this ...

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Daniel Vetter 2012-06-24 19:57:24 +02:00 committed by Dave Airlie
parent 26587e6994
commit 83bc5fd29a
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/sis/sis_mm.c
View File

@ -74,7 +74,7 @@ static int sis_fb_init(struct drm_device *dev, void *data, struct drm_file *file
dev_priv->vram_offset = fb->offset; dev_priv->vram_offset = fb->offset;
mutex_unlock(&dev->struct_mutex); mutex_unlock(&dev->struct_mutex);
DRM_DEBUG("offset = %u, size = %u\n", fb->offset, fb->size); DRM_DEBUG("offset = %lu, size = %lu\n", fb->offset, fb->size);
return 0; return 0;
} }
@ -161,7 +161,7 @@ fail_alloc:
mem->size = 0; mem->size = 0;
mem->free = 0; mem->free = 0;
DRM_DEBUG("alloc %d, size = %d, offset = %d\n", pool, mem->size, DRM_DEBUG("alloc %d, size = %ld, offset = %ld\n", pool, mem->size,
mem->offset); mem->offset);
return retval; return retval;
@ -215,7 +215,7 @@ static int sis_ioctl_agp_init(struct drm_device *dev, void *data,
dev_priv->agp_offset = agp->offset; dev_priv->agp_offset = agp->offset;
mutex_unlock(&dev->struct_mutex); mutex_unlock(&dev->struct_mutex);
DRM_DEBUG("offset = %u, size = %u\n", agp->offset, agp->size); DRM_DEBUG("offset = %lu, size = %lu\n", agp->offset, agp->size);
return 0; return 0;
} }

8
include/drm/sis_drm.h
View File

@ -51,17 +51,17 @@
typedef struct { typedef struct {
int context; int context;
unsigned int offset; unsigned long offset;
unsigned int size; unsigned long size;
unsigned long free; unsigned long free;
} drm_sis_mem_t; } drm_sis_mem_t;
typedef struct { typedef struct {
unsigned int offset, size; unsigned long offset, size;
} drm_sis_agp_t; } drm_sis_agp_t;
typedef struct { typedef struct {
unsigned int offset, size; unsigned long offset, size;
} drm_sis_fb_t; } drm_sis_fb_t;
struct sis_file_private { struct sis_file_private {