Commit ff32d39b authored by Al Viro's avatar Al Viro

radeon: take out dead compat ioctls

	Compat wrappers in radeon_ioc32.c had been unreachable since
"drm/radeon: remove UMS support" has removed radeon_driver_old_fops.
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 9cc73ce2
...@@ -105,7 +105,6 @@ radeon-y += \ ...@@ -105,7 +105,6 @@ radeon-y += \
vce_v2_0.o \ vce_v2_0.o \
radeon_kfd.o radeon_kfd.o
radeon-$(CONFIG_COMPAT) += radeon_ioc32.o
radeon-$(CONFIG_VGA_SWITCHEROO) += radeon_atpx_handler.o radeon-$(CONFIG_VGA_SWITCHEROO) += radeon_atpx_handler.o
radeon-$(CONFIG_ACPI) += radeon_acpi.o radeon-$(CONFIG_ACPI) += radeon_acpi.o
......
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/vga_switcheroo.h> #include <linux/vga_switcheroo.h>
#include <linux/compat.h>
#include <drm/drm_gem.h> #include <drm/drm_gem.h>
#include <drm/drm_fb_helper.h> #include <drm/drm_fb_helper.h>
...@@ -154,8 +155,6 @@ void radeon_gem_prime_unpin(struct drm_gem_object *obj); ...@@ -154,8 +155,6 @@ void radeon_gem_prime_unpin(struct drm_gem_object *obj);
struct reservation_object *radeon_gem_prime_res_obj(struct drm_gem_object *); struct reservation_object *radeon_gem_prime_res_obj(struct drm_gem_object *);
void *radeon_gem_prime_vmap(struct drm_gem_object *obj); void *radeon_gem_prime_vmap(struct drm_gem_object *obj);
void radeon_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr); void radeon_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr);
extern long radeon_kms_compat_ioctl(struct file *filp, unsigned int cmd,
unsigned long arg);
/* atpx handler */ /* atpx handler */
#if defined(CONFIG_VGA_SWITCHEROO) #if defined(CONFIG_VGA_SWITCHEROO)
...@@ -505,6 +504,21 @@ long radeon_drm_ioctl(struct file *filp, ...@@ -505,6 +504,21 @@ long radeon_drm_ioctl(struct file *filp,
return ret; return ret;
} }
#ifdef CONFIG_COMPAT
static 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 = radeon_drm_ioctl(filp, cmd, arg);
return ret;
}
#endif
static const struct dev_pm_ops radeon_pm_ops = { static const struct dev_pm_ops radeon_pm_ops = {
.suspend = radeon_pmops_suspend, .suspend = radeon_pmops_suspend,
.resume = radeon_pmops_resume, .resume = radeon_pmops_resume,
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment