mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-20 18:54:09 +08:00
ca6e440577
Backmerge fixes since it's getting out of hand again with the massive split due to atomic between -next and 4.2-rc. All the bugfixes in 4.2-rc are addressed already (by converting more towards atomic instead of minimal duct-tape) so just always pick the version in next for the conflicts in modeset code. All the other conflicts are just adjacent lines changed. Conflicts: drivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/i915_gem_gtt.c drivers/gpu/drm/i915/intel_display.c drivers/gpu/drm/i915/intel_drv.h drivers/gpu/drm/i915/intel_ringbuffer.h Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
100 lines
3.0 KiB
C
100 lines
3.0 KiB
C
/**
|
|
* \file i915_ioc32.c
|
|
*
|
|
* 32-bit ioctl compatibility routines for the i915 DRM.
|
|
*
|
|
* \author Alan Hourihane <alanh@fairlite.demon.co.uk>
|
|
*
|
|
*
|
|
* Copyright (C) Paul Mackerras 2005
|
|
* Copyright (C) Alan Hourihane 2005
|
|
* All Rights Reserved.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the next
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
* Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
|
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
|
* IN THE SOFTWARE.
|
|
*/
|
|
#include <linux/compat.h>
|
|
|
|
#include <drm/drmP.h>
|
|
#include <drm/i915_drm.h>
|
|
#include "i915_drv.h"
|
|
|
|
struct drm_i915_getparam32 {
|
|
s32 param;
|
|
/*
|
|
* We screwed up the generic ioctl struct here and used a variable-sized
|
|
* pointer. Use u32 in the compat struct to match the 32bit pointer
|
|
* userspace expects.
|
|
*/
|
|
u32 value;
|
|
};
|
|
|
|
static int compat_i915_getparam(struct file *file, unsigned int cmd,
|
|
unsigned long arg)
|
|
{
|
|
struct drm_i915_getparam32 req32;
|
|
drm_i915_getparam_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, DRM_IOCTL_I915_GETPARAM,
|
|
(unsigned long)request);
|
|
}
|
|
|
|
static drm_ioctl_compat_t *i915_compat_ioctls[] = {
|
|
[DRM_I915_GETPARAM] = compat_i915_getparam,
|
|
};
|
|
|
|
/**
|
|
* 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 i915_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 || nr >= DRM_COMMAND_END)
|
|
return drm_compat_ioctl(filp, cmd, arg);
|
|
|
|
if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls))
|
|
fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
|
|
|
|
if (fn != NULL)
|
|
ret = (*fn) (filp, cmd, arg);
|
|
else
|
|
ret = drm_ioctl(filp, cmd, arg);
|
|
|
|
return ret;
|
|
}
|