geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Eliminate unused / useless ioctls.

main
Ian Romanick 2007-08-14 13:44:51 -07:00
parent 7b12174aac
commit f563a50d14
5 changed files with 4 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
linux-core/xgi_drv.c
View File

@ -41,15 +41,9 @@ static int xgi_bootstrap(struct drm_device *, void *, struct drm_file *);
static struct drm_ioctl_desc xgi_ioctls[] = {
DRM_IOCTL_DEF(DRM_XGI_BOOTSTRAP, xgi_bootstrap, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
DRM_IOCTL_DEF(DRM_XGI_ALLOC, xgi_alloc_ioctl, DRM_AUTH),
DRM_IOCTL_DEF(DRM_XGI_FREE, xgi_free_ioctl, DRM_AUTH),
DRM_IOCTL_DEF(DRM_XGI_GE_RESET, xgi_ge_reset_ioctl, DRM_AUTH),
DRM_IOCTL_DEF(DRM_XGI_DUMP_REGISTER, xgi_dump_register_ioctl, DRM_AUTH),
DRM_IOCTL_DEF(DRM_XGI_DEBUG_INFO, xgi_restore_registers_ioctl, DRM_AUTH),
DRM_IOCTL_DEF(DRM_XGI_SUBMIT_CMDLIST, xgi_submit_cmdlist, DRM_AUTH),
DRM_IOCTL_DEF(DRM_XGI_TEST_RWINKERNEL, xgi_test_rwinkernel_ioctl, DRM_AUTH),
DRM_IOCTL_DEF(DRM_XGI_STATE_CHANGE, xgi_state_change_ioctl, DRM_AUTH|DRM_MASTER),
};

14
linux-core/xgi_drv.h
View File

@ -35,11 +35,11 @@
#define DRIVER_NAME "xgi"
#define DRIVER_DESC "XGI XP5 / XP10 / XG47"
#define DRIVER_DATE "20070809"
#define DRIVER_DATE "20070814"
#define DRIVER_MAJOR 0
#define DRIVER_MINOR 11
#define DRIVER_PATCHLEVEL 2
#define DRIVER_MINOR 12
#define DRIVER_PATCHLEVEL 0
#include "xgi_cmdlist.h"
#include "xgi_drm.h"
@ -96,16 +96,8 @@ extern int xgi_alloc_ioctl(struct drm_device * dev, void * data,
struct drm_file * filp);
extern int xgi_free_ioctl(struct drm_device * dev, void * data,
struct drm_file * filp);
extern int xgi_ge_reset_ioctl(struct drm_device * dev, void * data,
struct drm_file * filp);
extern int xgi_dump_register_ioctl(struct drm_device * dev, void * data,
struct drm_file * filp);
extern int xgi_restore_registers_ioctl(struct drm_device * dev, void * data,
struct drm_file * filp);
extern int xgi_submit_cmdlist(struct drm_device * dev, void * data,
struct drm_file * filp);
extern int xgi_test_rwinkernel_ioctl(struct drm_device * dev, void * data,
struct drm_file * filp);
extern int xgi_state_change_ioctl(struct drm_device * dev, void * data,
struct drm_file * filp);

33
linux-core/xgi_misc.c
View File

@ -29,18 +29,6 @@
#include <linux/delay.h>
int xgi_ge_reset_ioctl(struct drm_device * dev, void * data,
struct drm_file * filp)
{
struct xgi_info *info = dev->dev_private;
xgi_disable_ge(info);
xgi_enable_ge(info);
return 0;
}
/*
* irq functions
*/
@ -324,27 +312,6 @@ void xgi_dump_register(struct xgi_info * info)
}
int xgi_dump_register_ioctl(struct drm_device * dev, void * data,
struct drm_file * filp)
{
struct xgi_info *info = dev->dev_private;
xgi_dump_register(info);
return 0;
}
int xgi_restore_registers_ioctl(struct drm_device * dev, void * data,
struct drm_file * filp)
{
struct xgi_info *info = dev->dev_private;
OUT3X5B(info->mmio_map, 0x13, 0);
OUT3X5B(info->mmio_map, 0x8b, 2);
return 0;
}
#define WHOLD_GE_STATUS 0x2800
/* Test everything except the "whole GE busy" bit, the "master engine busy"

32
linux-core/xgi_pcie.c
View File

@ -157,35 +157,3 @@ void *xgi_find_pcie_virt(struct xgi_info * info, u32 address)
return ((u8 *) info->dev->sg->virtual) + offset;
}
/*
address -- GE hw address
*/
int xgi_test_rwinkernel_ioctl(struct drm_device * dev, void * data,
struct drm_file * filp)
{
struct xgi_info *info = dev->dev_private;
u32 address = *(u32 *) data;
u32 *virtaddr = 0;
DRM_INFO("input GE HW addr is 0x%x\n", address);
if (address == 0) {
return -EFAULT;
}
virtaddr = (u32 *)xgi_find_pcie_virt(info, address);
DRM_INFO("convert to CPU virt addr 0x%p\n", virtaddr);
if (virtaddr != NULL) {
DRM_INFO("original [virtaddr] = 0x%x\n", *virtaddr);
*virtaddr = 0x00f00fff;
DRM_INFO("modified [virtaddr] = 0x%x\n", *virtaddr);
} else {
return -EFAULT;
}
return 0;
}

12
shared-core/xgi_drm.h
View File

@ -122,22 +122,12 @@ struct xgi_state_info {
#define DRM_XGI_ALLOC 1
#define DRM_XGI_FREE 2
#define DRM_XGI_SUBMIT_CMDLIST 3
#define DRM_XGI_GE_RESET 4
#define DRM_XGI_DUMP_REGISTER 5
#define DRM_XGI_DEBUG_INFO 6
#define DRM_XGI_TEST_RWINKERNEL 7
#define DRM_XGI_STATE_CHANGE 8
#define DRM_XGI_STATE_CHANGE 4
#define XGI_IOCTL_BOOTSTRAP DRM_IOWR(DRM_COMMAND_BASE + DRM_XGI_BOOTSTRAP, struct xgi_bootstrap)
#define XGI_IOCTL_ALLOC DRM_IOWR(DRM_COMMAND_BASE + DRM_XGI_ALLOC, struct xgi_mem_alloc)
#define XGI_IOCTL_FREE DRM_IOW(DRM_COMMAND_BASE + DRM_XGI_FREE, __u32)
#define XGI_IOCTL_GE_RESET DRM_IO(DRM_COMMAND_BASE + DRM_XGI_GE_RESET)
#define XGI_IOCTL_DUMP_REGISTER DRM_IO(DRM_COMMAND_BASE + DRM_XGI_DUMP_REGISTER)
#define XGI_IOCTL_DEBUG_INFO DRM_IO(DRM_COMMAND_BASE + DRM_XGI_DEBUG_INFO)
#define XGI_IOCTL_SUBMIT_CMDLIST DRM_IOW(DRM_COMMAND_BASE + DRM_XGI_SUBMIT_CMDLIST, struct xgi_cmd_info)
#define XGI_IOCTL_TEST_RWINKERNEL DRM_IOW(DRM_COMMAND_BASE + DRM_XGI_TEST_RWINKERNEL, __u32)
#define XGI_IOCTL_STATE_CHANGE DRM_IOW(DRM_COMMAND_BASE + DRM_XGI_STATE_CHANGE, struct xgi_state_info)
#endif /* _XGI_DRM_H_ */