Skip to content

Commit

Permalink
drm/sis: fixup sis_mm ioctl structs
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Daniel Vetter authored and Dave Airlie committed Jul 20, 2012
1 parent 26587e6 commit 83bc5fd
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions drivers/gpu/drm/sis/sis_mm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

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;
}
Expand Down Expand Up @@ -161,7 +161,7 @@ static int sis_drm_alloc(struct drm_device *dev, struct drm_file *file,
mem->size = 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);

return retval;
Expand Down Expand Up @@ -215,7 +215,7 @@ static int sis_ioctl_agp_init(struct drm_device *dev, void *data,
dev_priv->agp_offset = agp->offset;
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;
}

Expand Down
8 changes: 4 additions & 4 deletions include/drm/sis_drm.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,17 +51,17 @@

typedef struct {
int context;
unsigned int offset;
unsigned int size;
unsigned long offset;
unsigned long size;
unsigned long free;
} drm_sis_mem_t;

typedef struct {
unsigned int offset, size;
unsigned long offset, size;
} drm_sis_agp_t;

typedef struct {
unsigned int offset, size;
unsigned long offset, size;
} drm_sis_fb_t;

struct sis_file_private {
Expand Down

0 comments on commit 83bc5fd

Please sign in to comment.