9a18664506
The patch is against a 2.6.11 kernel tree. I am running this with a 32-bit X server (compiled up from X.org CVS as of a couple of weeks ago) and 32-bit DRI libraries and clients. All the userland stuff is identical to what I am using under a 32-bit kernel on my G4 powerbook (which is a 32-bit machine of course). I haven't tried compiling up a 64-bit X server or clients yet. In the compatibility routines I have assumed that the kernel can safely access user addresses after set_fs(KERNEL_DS). That is, where an ioctl argument structure contains pointers to other structures, and those other structures are already compatible between the 32-bit and 64-bit ABIs (i.e. they only contain things like chars, shorts or ints), I just check the address with access_ok() and then pass it through to the 64-bit ioctl code. I believe this approach may not work on sparc64, but it does work on ppc64 and x86_64 at least. One tricky area which may need to be revisited is the question of how to handle the handles which we pass back to userspace to identify mappings. These handles are generated in the ADDMAP ioctl and then passed in as the offset value to mmap. However, offset values for mmap seem to be generated in other ways as well, particularly for AGP mappings. The approach I have ended up with is to generate a fake 32-bit handle only for _DRM_SHM mappings. The handles for other mappings (AGP, REG, FB) are physical addresses which are already limited to 32 bits, and generating fake handles for them created all sorts of problems in the mmap/nopage code. This patch has been updated to use the new compatibility ioctls. From: Paul Mackerras <paulus@samba.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
131 lines
3.7 KiB
C
131 lines
3.7 KiB
C
/**
|
|
* \file radeon_drv.c
|
|
* ATI Radeon driver
|
|
*
|
|
* \author Gareth Hughes <gareth@valinux.com>
|
|
*/
|
|
|
|
/*
|
|
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
|
|
* 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
|
|
* VA LINUX SYSTEMS AND/OR ITS SUPPLIERS 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/config.h>
|
|
#include "drmP.h"
|
|
#include "drm.h"
|
|
#include "radeon_drm.h"
|
|
#include "radeon_drv.h"
|
|
|
|
#include "drm_pciids.h"
|
|
|
|
static int postinit( struct drm_device *dev, unsigned long flags )
|
|
{
|
|
DRM_INFO( "Initialized %s %d.%d.%d %s on minor %d: %s\n",
|
|
DRIVER_NAME,
|
|
DRIVER_MAJOR,
|
|
DRIVER_MINOR,
|
|
DRIVER_PATCHLEVEL,
|
|
DRIVER_DATE,
|
|
dev->primary.minor,
|
|
pci_pretty_name(dev->pdev)
|
|
);
|
|
return 0;
|
|
}
|
|
|
|
static int version( drm_version_t *version )
|
|
{
|
|
int len;
|
|
|
|
version->version_major = DRIVER_MAJOR;
|
|
version->version_minor = DRIVER_MINOR;
|
|
version->version_patchlevel = DRIVER_PATCHLEVEL;
|
|
DRM_COPY( version->name, DRIVER_NAME );
|
|
DRM_COPY( version->date, DRIVER_DATE );
|
|
DRM_COPY( version->desc, DRIVER_DESC );
|
|
return 0;
|
|
}
|
|
|
|
static struct pci_device_id pciidlist[] = {
|
|
radeon_PCI_IDS
|
|
};
|
|
|
|
extern drm_ioctl_desc_t radeon_ioctls[];
|
|
extern int radeon_max_ioctl;
|
|
|
|
static struct drm_driver driver = {
|
|
.driver_features = DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA | DRIVER_SG | DRIVER_HAVE_IRQ | DRIVER_HAVE_DMA | DRIVER_IRQ_SHARED | DRIVER_IRQ_VBL,
|
|
.dev_priv_size = sizeof(drm_radeon_buf_priv_t),
|
|
.preinit = radeon_driver_preinit,
|
|
.postcleanup = radeon_driver_postcleanup,
|
|
.prerelease = radeon_driver_prerelease,
|
|
.pretakedown = radeon_driver_pretakedown,
|
|
.open_helper = radeon_driver_open_helper,
|
|
.vblank_wait = radeon_driver_vblank_wait,
|
|
.irq_preinstall = radeon_driver_irq_preinstall,
|
|
.irq_postinstall = radeon_driver_irq_postinstall,
|
|
.irq_uninstall = radeon_driver_irq_uninstall,
|
|
.irq_handler = radeon_driver_irq_handler,
|
|
.free_filp_priv = radeon_driver_free_filp_priv,
|
|
.reclaim_buffers = drm_core_reclaim_buffers,
|
|
.get_map_ofs = drm_core_get_map_ofs,
|
|
.get_reg_ofs = drm_core_get_reg_ofs,
|
|
.postinit = postinit,
|
|
.version = version,
|
|
.ioctls = radeon_ioctls,
|
|
.dma_ioctl = radeon_cp_buffers,
|
|
.fops = {
|
|
.owner = THIS_MODULE,
|
|
.open = drm_open,
|
|
.release = drm_release,
|
|
.ioctl = drm_ioctl,
|
|
.mmap = drm_mmap,
|
|
.poll = drm_poll,
|
|
.fasync = drm_fasync,
|
|
#ifdef CONFIG_COMPAT
|
|
.compat_ioctl = radeon_compat_ioctl,
|
|
#endif
|
|
},
|
|
.pci_driver = {
|
|
.name = DRIVER_NAME,
|
|
.id_table = pciidlist,
|
|
}
|
|
};
|
|
|
|
static int __init radeon_init(void)
|
|
{
|
|
driver.num_ioctls = radeon_max_ioctl;
|
|
return drm_init(&driver);
|
|
}
|
|
|
|
static void __exit radeon_exit(void)
|
|
{
|
|
drm_exit(&driver);
|
|
}
|
|
|
|
module_init(radeon_init);
|
|
module_exit(radeon_exit);
|
|
|
|
MODULE_AUTHOR( DRIVER_AUTHOR );
|
|
MODULE_DESCRIPTION( DRIVER_DESC );
|
|
MODULE_LICENSE("GPL and additional rights");
|