talexander
/
freebsd_amp_hwpstate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/radeon: Add 32bit ioctls support 

This allows to run 32bit applications on a 64bit host. This was tested
successfully with Wine (emulators/i386-wine-devel) and StarCraft II.

Submitted by:	Jan Kokemüller <jan.kokemueller@gmail.com>
MFC after:	1 week
This commit is contained in:
Jean-Sébastien Pédron 2014-05-03 11:23:10 +00:00
parent d3e6a7f8d4
commit b5cd65d1c7
3 changed files with 151 additions and 241 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/drm2/radeon/radeon_drv.c
View File

@ -85,6 +85,10 @@ extern int radeon_get_crtc_scanoutpos(struct drm_device *dev, int crtc,
int *vpos, int *hpos);
extern struct drm_ioctl_desc radeon_ioctls_kms[];
extern int radeon_max_kms_ioctl;
#ifdef COMPAT_FREEBSD32
extern struct drm_ioctl_desc radeon_compat_ioctls[];
extern int radeon_num_compat_ioctls;
#endif
#ifdef DUMBBELL_WIP
int radeon_mmap(struct file *filp, struct vm_area_struct *vma);
#endif /* DUMBBELL_WIP */
@ -466,6 +470,10 @@ radeon_attach(device_t kdev)
if (radeon_modeset == 1) {
kms_driver.driver_features |= DRIVER_MODESET;
kms_driver.max_ioctl = radeon_max_kms_ioctl;
#ifdef COMPAT_FREEBSD32
kms_driver.compat_ioctls = radeon_compat_ioctls;
kms_driver.compat_ioctls_nr = &radeon_num_compat_ioctls;
#endif
radeon_register_atpx_handler();
}
dev->driver = &kms_driver;

379
sys/dev/drm2/radeon/radeon_ioc32.c
View File

@ -31,10 +31,13 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <linux/compat.h>
#include "opt_compat.h"
#include <drm/drmP.h>
#include <drm/radeon_drm.h>
#ifdef COMPAT_FREEBSD32
#include <dev/drm2/drmP.h>
#include <dev/drm2/drm.h>
#include <dev/drm2/radeon/radeon_drm.h>
#include "radeon_drv.h"
typedef struct drm_radeon_init32 {
@ -60,42 +63,37 @@ typedef struct drm_radeon_init32 {
u32 gart_textures_offset;
} drm_radeon_init32_t;
static int compat_radeon_cp_init(struct file *file, unsigned int cmd,
unsigned long arg)
static int compat_radeon_cp_init(struct drm_device *dev, void *arg,
struct drm_file *file_priv)
{
drm_radeon_init32_t init32;
drm_radeon_init_t __user *init;
drm_radeon_init32_t *init32;
drm_radeon_init_t __user init;
if (copy_from_user(&init32, (void __user *)arg, sizeof(init32)))
return -EFAULT;
init32 = arg;
init = compat_alloc_user_space(sizeof(*init));
if (!access_ok(VERIFY_WRITE, init, sizeof(*init))
|| __put_user(init32.func, &init->func)
|| __put_user(init32.sarea_priv_offset, &init->sarea_priv_offset)
|| __put_user(init32.is_pci, &init->is_pci)
|| __put_user(init32.cp_mode, &init->cp_mode)
|| __put_user(init32.gart_size, &init->gart_size)
|| __put_user(init32.ring_size, &init->ring_size)
|| __put_user(init32.usec_timeout, &init->usec_timeout)
|| __put_user(init32.fb_bpp, &init->fb_bpp)
|| __put_user(init32.front_offset, &init->front_offset)
|| __put_user(init32.front_pitch, &init->front_pitch)
|| __put_user(init32.back_offset, &init->back_offset)
|| __put_user(init32.back_pitch, &init->back_pitch)
|| __put_user(init32.depth_bpp, &init->depth_bpp)
|| __put_user(init32.depth_offset, &init->depth_offset)
|| __put_user(init32.depth_pitch, &init->depth_pitch)
|| __put_user(init32.fb_offset, &init->fb_offset)
|| __put_user(init32.mmio_offset, &init->mmio_offset)
|| __put_user(init32.ring_offset, &init->ring_offset)
|| __put_user(init32.ring_rptr_offset, &init->ring_rptr_offset)
|| __put_user(init32.buffers_offset, &init->buffers_offset)
|| __put_user(init32.gart_textures_offset,
&init->gart_textures_offset))
return -EFAULT;
init.func = init32->func;
init.sarea_priv_offset = (unsigned long)init32->sarea_priv_offset;
init.is_pci = init32->is_pci;
init.cp_mode = init32->cp_mode;
init.gart_size = init32->gart_size;
init.ring_size = init32->ring_size;
init.usec_timeout = init32->usec_timeout;
init.fb_bpp = init32->fb_bpp;
init.front_offset = init32->front_offset;
init.front_pitch = init32->front_pitch;
init.back_offset = init32->back_offset;
init.back_pitch = init32->back_pitch;
init.depth_bpp = init32->depth_bpp;
init.depth_offset = init32->depth_offset;
init.depth_pitch = init32->depth_pitch;
init.fb_offset = (unsigned long)init32->fb_offset;
init.mmio_offset = (unsigned long)init32->mmio_offset;
init.ring_offset = (unsigned long)init32->ring_offset;
init.ring_rptr_offset = (unsigned long)init32->ring_rptr_offset;
init.buffers_offset = (unsigned long)init32->buffers_offset;
init.gart_textures_offset = (unsigned long)init32->gart_textures_offset;
return drm_ioctl(file, DRM_IOCTL_RADEON_CP_INIT, (unsigned long)init);
return radeon_cp_init(dev, &init, file_priv);
}
typedef struct drm_radeon_clear32 {
@ -107,50 +105,37 @@ typedef struct drm_radeon_clear32 {
u32 depth_boxes;
} drm_radeon_clear32_t;
static int compat_radeon_cp_clear(struct file *file, unsigned int cmd,
unsigned long arg)
static int compat_radeon_cp_clear(struct drm_device *dev, void *arg,
struct drm_file *file_priv)
{
drm_radeon_clear32_t clr32;
drm_radeon_clear_t __user *clr;
drm_radeon_clear32_t *clr32;
drm_radeon_clear_t __user clr;
if (copy_from_user(&clr32, (void __user *)arg, sizeof(clr32)))
return -EFAULT;
clr32 = arg;
clr = compat_alloc_user_space(sizeof(*clr));
if (!access_ok(VERIFY_WRITE, clr, sizeof(*clr))
|| __put_user(clr32.flags, &clr->flags)
|| __put_user(clr32.clear_color, &clr->clear_color)
|| __put_user(clr32.clear_depth, &clr->clear_depth)
|| __put_user(clr32.color_mask, &clr->color_mask)
|| __put_user(clr32.depth_mask, &clr->depth_mask)
|| __put_user((void __user *)(unsigned long)clr32.depth_boxes,
&clr->depth_boxes))
return -EFAULT;
clr.flags = clr32->flags;
clr.clear_color = clr32->clear_color;
clr.clear_depth = clr32->clear_depth;
clr.color_mask = clr32->color_mask;
clr.depth_mask = clr32->depth_mask;
clr.depth_boxes = (drm_radeon_clear_rect_t *)(unsigned long)clr32->depth_boxes;
return drm_ioctl(file, DRM_IOCTL_RADEON_CLEAR, (unsigned long)clr);
return radeon_ioctls[DRM_IOCTL_RADEON_CLEAR].func(dev, &clr, file_priv);
}
typedef struct drm_radeon_stipple32 {
u32 mask;
} drm_radeon_stipple32_t;
static int compat_radeon_cp_stipple(struct file *file, unsigned int cmd,
unsigned long arg)
static int compat_radeon_cp_stipple(struct drm_device *dev, void *arg,
struct drm_file *file_priv)
{
drm_radeon_stipple32_t __user *argp = (void __user *)arg;
drm_radeon_stipple_t __user *request;
u32 mask;
drm_radeon_stipple_t __user request;
if (get_user(mask, &argp->mask))
return -EFAULT;
request.mask = (unsigned int *)(unsigned long)argp->mask;
request = compat_alloc_user_space(sizeof(*request));
if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
|| __put_user((unsigned int __user *)(unsigned long)mask,
&request->mask))
return -EFAULT;
return drm_ioctl(file, DRM_IOCTL_RADEON_STIPPLE, (unsigned long)request);
return radeon_ioctls[DRM_IOCTL_RADEON_STIPPLE].func(dev, &request, file_priv);
}
typedef struct drm_radeon_tex_image32 {
@ -168,43 +153,32 @@ typedef struct drm_radeon_texture32 {
u32 image;
} drm_radeon_texture32_t;
static int compat_radeon_cp_texture(struct file *file, unsigned int cmd,
unsigned long arg)
static int compat_radeon_cp_texture(struct drm_device *dev, void *arg,
struct drm_file *file_priv)
{
drm_radeon_texture32_t req32;
drm_radeon_texture_t __user *request;
drm_radeon_tex_image32_t img32;
drm_radeon_tex_image_t __user *image;
drm_radeon_texture32_t *req32;
drm_radeon_texture_t __user request;
drm_radeon_tex_image32_t *img32;
drm_radeon_tex_image_t __user image;
if (copy_from_user(&req32, (void __user *)arg, sizeof(req32)))
return -EFAULT;
if (req32.image == 0)
req32 = arg;
if (req32->image == 0)
return -EINVAL;
if (copy_from_user(&img32, (void __user *)(unsigned long)req32.image,
sizeof(img32)))
return -EFAULT;
img32 = (drm_radeon_tex_image32_t *)(unsigned long)req32->image;
request = compat_alloc_user_space(sizeof(*request) + sizeof(*image));
if (!access_ok(VERIFY_WRITE, request,
sizeof(*request) + sizeof(*image)))
return -EFAULT;
image = (drm_radeon_tex_image_t __user *) (request + 1);
request.offset = req32->offset;
request.pitch = req32->pitch;
request.format = req32->format;
request.width = req32->width;
request.height = req32->height;
request.image = &image;
image.x = img32->x;
image.y = img32->y;
image.width = img32->width;
image.height = img32->height;
image.data = (void *)(unsigned long)img32->data;
if (__put_user(req32.offset, &request->offset)
|| __put_user(req32.pitch, &request->pitch)
|| __put_user(req32.format, &request->format)
|| __put_user(req32.width, &request->width)
|| __put_user(req32.height, &request->height)
|| __put_user(image, &request->image)
|| __put_user(img32.x, &image->x)
|| __put_user(img32.y, &image->y)
|| __put_user(img32.width, &image->width)
|| __put_user(img32.height, &image->height)
|| __put_user((const void __user *)(unsigned long)img32.data,
&image->data))
return -EFAULT;
return drm_ioctl(file, DRM_IOCTL_RADEON_TEXTURE, (unsigned long)request);
return radeon_ioctls[DRM_IOCTL_RADEON_TEXTURE].func(dev, &request, file_priv);
}
typedef struct drm_radeon_vertex2_32 {
@ -216,28 +190,22 @@ typedef struct drm_radeon_vertex2_32 {
u32 prim;
} drm_radeon_vertex2_32_t;
static int compat_radeon_cp_vertex2(struct file *file, unsigned int cmd,
unsigned long arg)
static int compat_radeon_cp_vertex2(struct drm_device *dev, void *arg,
struct drm_file *file_priv)
{
drm_radeon_vertex2_32_t req32;
drm_radeon_vertex2_t __user *request;
drm_radeon_vertex2_32_t *req32;
drm_radeon_vertex2_t __user request;
if (copy_from_user(&req32, (void __user *)arg, sizeof(req32)))
return -EFAULT;
req32 = arg;
request = compat_alloc_user_space(sizeof(*request));
if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
|| __put_user(req32.idx, &request->idx)
|| __put_user(req32.discard, &request->discard)
|| __put_user(req32.nr_states, &request->nr_states)
|| __put_user((void __user *)(unsigned long)req32.state,
&request->state)
|| __put_user(req32.nr_prims, &request->nr_prims)
|| __put_user((void __user *)(unsigned long)req32.prim,
&request->prim))
return -EFAULT;
request.idx = req32->idx;
request.discard = req32->discard;
request.nr_states = req32->nr_states;
request.state = (drm_radeon_state_t *)(unsigned long)req32->state;
request.nr_prims = req32->nr_prims;
request.prim = (drm_radeon_prim_t *)(unsigned long)req32->prim;
return drm_ioctl(file, DRM_IOCTL_RADEON_VERTEX2, (unsigned long)request);
return radeon_ioctls[DRM_IOCTL_RADEON_VERTEX2].func(dev, &request, file_priv);
}
typedef struct drm_radeon_cmd_buffer32 {
@ -247,26 +215,20 @@ typedef struct drm_radeon_cmd_buffer32 {
u32 boxes;
} drm_radeon_cmd_buffer32_t;
static int compat_radeon_cp_cmdbuf(struct file *file, unsigned int cmd,
unsigned long arg)
static int compat_radeon_cp_cmdbuf(struct drm_device *dev, void *arg,
struct drm_file *file_priv)
{
drm_radeon_cmd_buffer32_t req32;
drm_radeon_cmd_buffer_t __user *request;
drm_radeon_cmd_buffer32_t *req32;
drm_radeon_cmd_buffer_t __user request;
if (copy_from_user(&req32, (void __user *)arg, sizeof(req32)))
return -EFAULT;
req32 = arg;
request = compat_alloc_user_space(sizeof(*request));
if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
|| __put_user(req32.bufsz, &request->bufsz)
|| __put_user((void __user *)(unsigned long)req32.buf,
&request->buf)
|| __put_user(req32.nbox, &request->nbox)
|| __put_user((void __user *)(unsigned long)req32.boxes,
&request->boxes))
return -EFAULT;
request.bufsz = req32->bufsz;
request.buf = (char *)(unsigned long)req32->buf;
request.nbox = req32->nbox;
request.boxes = (struct drm_clip_rect *)(unsigned long)req32->boxes;
return drm_ioctl(file, DRM_IOCTL_RADEON_CMDBUF, (unsigned long)request);
return radeon_ioctls[DRM_IOCTL_RADEON_CMDBUF].func(dev, &request, file_priv);
}
typedef struct drm_radeon_getparam32 {
@ -274,23 +236,18 @@ typedef struct drm_radeon_getparam32 {
u32 value;
} drm_radeon_getparam32_t;
static int compat_radeon_cp_getparam(struct file *file, unsigned int cmd,
unsigned long arg)
static int compat_radeon_cp_getparam(struct drm_device *dev, void *arg,
struct drm_file *file_priv)
{
drm_radeon_getparam32_t req32;
drm_radeon_getparam_t __user *request;
drm_radeon_getparam32_t *req32;
drm_radeon_getparam_t __user request;
if (copy_from_user(&req32, (void __user *)arg, sizeof(req32)))
return -EFAULT;
req32 = arg;
request = compat_alloc_user_space(sizeof(*request));
if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
|| __put_user(req32.param, &request->param)
|| __put_user((void __user *)(unsigned long)req32.value,
&request->value))
return -EFAULT;
request.param = req32->param;
request.value = (void *)(unsigned long)req32->value;
return drm_ioctl(file, DRM_IOCTL_RADEON_GETPARAM, (unsigned long)request);
return radeon_ioctls[DRM_IOCTL_RADEON_GETPARAM].func(dev, &request, file_priv);
}
typedef struct drm_radeon_mem_alloc32 {
@ -300,129 +257,71 @@ typedef struct drm_radeon_mem_alloc32 {
u32 region_offset; /* offset from start of fb or GART */
} drm_radeon_mem_alloc32_t;
static int compat_radeon_mem_alloc(struct file *file, unsigned int cmd,
unsigned long arg)
static int compat_radeon_mem_alloc(struct drm_device *dev, void *arg,
struct drm_file *file_priv)
{
drm_radeon_mem_alloc32_t req32;
drm_radeon_mem_alloc_t __user *request;
drm_radeon_mem_alloc32_t *req32;
drm_radeon_mem_alloc_t __user request;
if (copy_from_user(&req32, (void __user *)arg, sizeof(req32)))
return -EFAULT;
req32 = arg;
request = compat_alloc_user_space(sizeof(*request));
if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
|| __put_user(req32.region, &request->region)
|| __put_user(req32.alignment, &request->alignment)
|| __put_user(req32.size, &request->size)
|| __put_user((int __user *)(unsigned long)req32.region_offset,
&request->region_offset))
return -EFAULT;
request.region = req32->region;
request.alignment = req32->alignment;
request.size = req32->size;
request.region_offset = (int *)(unsigned long)req32->region_offset;
return drm_ioctl(file, DRM_IOCTL_RADEON_ALLOC, (unsigned long)request);
return radeon_mem_alloc(dev, &request, file_priv);
}
typedef struct drm_radeon_irq_emit32 {
u32 irq_seq;
} drm_radeon_irq_emit32_t;
static int compat_radeon_irq_emit(struct file *file, unsigned int cmd,
unsigned long arg)
static int compat_radeon_irq_emit(struct drm_device *dev, void *arg,
struct drm_file *file_priv)
{
drm_radeon_irq_emit32_t req32;
drm_radeon_irq_emit_t __user *request;
drm_radeon_irq_emit32_t *req32;
drm_radeon_irq_emit_t __user request;
if (copy_from_user(&req32, (void __user *)arg, sizeof(req32)))
return -EFAULT;
req32 = arg;
request = compat_alloc_user_space(sizeof(*request));
if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
|| __put_user((int __user *)(unsigned long)req32.irq_seq,
&request->irq_seq))
return -EFAULT;
request.irq_seq = (int *)(unsigned long)req32->irq_seq;
return drm_ioctl(file, DRM_IOCTL_RADEON_IRQ_EMIT, (unsigned long)request);
return radeon_irq_emit(dev, &request, file_priv);
}
/* The two 64-bit arches where alignof(u64)==4 in 32-bit code */
#if defined (CONFIG_X86_64) || defined(CONFIG_IA64)
typedef struct drm_radeon_setparam32 {
int param;
u64 value;
} __attribute__((packed)) drm_radeon_setparam32_t;
static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
unsigned long arg)
static int compat_radeon_cp_setparam(struct drm_device *dev, void *arg,
struct drm_file *file_priv)
{
drm_radeon_setparam32_t req32;
drm_radeon_setparam_t __user *request;
drm_radeon_setparam32_t *req32;
drm_radeon_setparam_t __user request;
if (copy_from_user(&req32, (void __user *) arg, sizeof(req32)))
return -EFAULT;
req32 = arg;
request = compat_alloc_user_space(sizeof(*request));
if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
|| __put_user(req32.param, &request->param)
|| __put_user((void __user *)(unsigned long)req32.value,
&request->value))
return -EFAULT;
request.param = req32->param;
request.value = req32->value;
return drm_ioctl(file, DRM_IOCTL_RADEON_SETPARAM, (unsigned long) request);
return radeon_ioctls[DRM_IOCTL_RADEON_SETPARAM].func(dev, &request, file_priv);
}
#else
#define compat_radeon_cp_setparam NULL
#endif /* X86_64 || IA64 */
static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
[DRM_RADEON_CP_INIT] = compat_radeon_cp_init,
[DRM_RADEON_CLEAR] = compat_radeon_cp_clear,
[DRM_RADEON_STIPPLE] = compat_radeon_cp_stipple,
[DRM_RADEON_TEXTURE] = compat_radeon_cp_texture,
[DRM_RADEON_VERTEX2] = compat_radeon_cp_vertex2,
[DRM_RADEON_CMDBUF] = compat_radeon_cp_cmdbuf,
[DRM_RADEON_GETPARAM] = compat_radeon_cp_getparam,
[DRM_RADEON_SETPARAM] = compat_radeon_cp_setparam,
[DRM_RADEON_ALLOC] = compat_radeon_mem_alloc,
[DRM_RADEON_IRQ_EMIT] = compat_radeon_irq_emit,
struct drm_ioctl_desc radeon_compat_ioctls[] = {
DRM_IOCTL_DEF(DRM_RADEON_CP_INIT, compat_radeon_cp_init, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
DRM_IOCTL_DEF(DRM_RADEON_CLEAR, compat_radeon_cp_clear, DRM_AUTH),
DRM_IOCTL_DEF(DRM_RADEON_STIPPLE, compat_radeon_cp_stipple, DRM_AUTH),
DRM_IOCTL_DEF(DRM_RADEON_TEXTURE, compat_radeon_cp_texture, DRM_AUTH),
DRM_IOCTL_DEF(DRM_RADEON_VERTEX2, compat_radeon_cp_vertex2, DRM_AUTH),
DRM_IOCTL_DEF(DRM_RADEON_CMDBUF, compat_radeon_cp_cmdbuf, DRM_AUTH),
DRM_IOCTL_DEF(DRM_RADEON_GETPARAM, compat_radeon_cp_getparam, DRM_AUTH),
DRM_IOCTL_DEF(DRM_RADEON_SETPARAM, compat_radeon_cp_setparam, DRM_AUTH),
DRM_IOCTL_DEF(DRM_RADEON_ALLOC, compat_radeon_mem_alloc, DRM_AUTH),
DRM_IOCTL_DEF(DRM_RADEON_IRQ_EMIT, compat_radeon_irq_emit, DRM_AUTH)
};
int radeon_num_compat_ioctls = DRM_ARRAY_SIZE(radeon_compat_ioctls);
/**
* Called whenever a 32-bit process running under a 64-bit kernel
* performs an ioctl on /dev/dri/card<n>.
*
* \param filp file pointer.
* \param cmd command.
* \param arg user argument.
* \return zero on success or negative number on failure.
*/
long radeon_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
unsigned int nr = DRM_IOCTL_NR(cmd);
drm_ioctl_compat_t *fn = NULL;
int ret;
if (nr < DRM_COMMAND_BASE)
return drm_compat_ioctl(filp, cmd, arg);
if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(radeon_compat_ioctls))
fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
if (fn != NULL)
ret = (*fn) (filp, cmd, arg);
else
ret = drm_ioctl(filp, cmd, arg);
return ret;
}
long radeon_kms_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
unsigned int nr = DRM_IOCTL_NR(cmd);
int ret;
if (nr < DRM_COMMAND_BASE)
return drm_compat_ioctl(filp, cmd, arg);
ret = drm_ioctl(filp, cmd, arg);
return ret;
}
#endif

5
sys/modules/drm2/radeonkms/Makefile
View File

@ -88,7 +88,10 @@ SRCS += \
si.c \
si_blit_shaders.c
#radeon_ioc32.c
.if ${MACHINE_CPUARCH} == "amd64"
SRCS += radeon_ioc32.c
.endif
#radeon_prime.c
#--radeon_trace_points.c