lkml.org 
[lkml]   [2007]   [Jun]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    SubjectRe: drm: fix radeon setparam on 32/64 bit systems.
    From
    Date
    On Fri, 2007-06-15 at 01:59 +0000, Linux Kernel Mailing List wrote:
    > Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=9b01bd5b284bbf519b726b39f1352023cb5e9e69
    > Commit: 9b01bd5b284bbf519b726b39f1352023cb5e9e69
    > Parent: dc7a93190c21edbf3ed23e678ad04f852b9cff28
    > Author: Dave Airlie <airlied@linux.ie>
    > AuthorDate: Sun Jun 10 16:00:27 2007 +1000
    > Committer: Dave Airlie <airlied@linux.ie>
    > CommitDate: Sun Jun 10 16:00:27 2007 +1000
    >
    > drm: fix radeon setparam on 32/64 bit systems.
    >
    > The alignment on 64-bit is different for 64-bit values.

    Only on i386. I think you just broke ppc32-on-ppc64.

    > Signed-off-by: Dave Airlie <airlied@linux.ie>
    > ---
    > drivers/char/drm/radeon_ioc32.c | 26 ++++++++++++++++++++++++++
    > 1 files changed, 26 insertions(+), 0 deletions(-)
    >
    > diff --git a/drivers/char/drm/radeon_ioc32.c b/drivers/char/drm/radeon_ioc32.c
    > index 1f1f9cc..04126c2 100644
    > --- a/drivers/char/drm/radeon_ioc32.c
    > +++ b/drivers/char/drm/radeon_ioc32.c
    > @@ -349,6 +349,31 @@ static int compat_radeon_irq_emit(struct file *file, unsigned int cmd,
    > DRM_IOCTL_RADEON_IRQ_EMIT, (unsigned long)request);
    > }
    >
    > +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)
    > +{
    > + drm_radeon_setparam32_t req32;
    > + drm_radeon_setparam_t __user *request;
    > +
    > + if (copy_from_user(&req32, (void __user *) arg, sizeof(req32)))
    > + return -EFAULT;
    > +
    > + 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;
    > +
    > + return drm_ioctl(file->f_dentry->d_inode, file,
    > + DRM_IOCTL_RADEON_SETPARAM, (unsigned long) request);
    > +}
    > +
    > drm_ioctl_compat_t *radeon_compat_ioctls[] = {
    > [DRM_RADEON_CP_INIT] = compat_radeon_cp_init,
    > [DRM_RADEON_CLEAR] = compat_radeon_cp_clear,
    > @@ -357,6 +382,7 @@ drm_ioctl_compat_t *radeon_compat_ioctls[] = {
    > [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,
    > };
    > -
    > To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
    > the body of a message to majordomo@vger.kernel.org
    > More majordomo info at http://vger.kernel.org/majordomo-info.html
    --
    dwmw2

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-06-15 10:47    [W:0.025 / U:0.324 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site