Remove the "nv" driver.
Stephane Marchesin
parent
bf46e0941f
commit
39755db856
|
|
@ -58,7 +58,7 @@ endif
|
||||||
|
|
||||||
# Modules for all architectures
|
# Modules for all architectures
|
||||||
MODULE_LIST := drm.o tdfx.o r128.o radeon.o mga.o sis.o savage.o via.o \
|
MODULE_LIST := drm.o tdfx.o r128.o radeon.o mga.o sis.o savage.o via.o \
|
||||||
mach64.o nv.o nouveau.o xgi.o
|
mach64.o nouveau.o xgi.o
|
||||||
|
|
||||||
# Modules only for ix86 architectures
|
# Modules only for ix86 architectures
|
||||||
ifneq (,$(findstring 86,$(MACHINE)))
|
ifneq (,$(findstring 86,$(MACHINE)))
|
||||||
|
|
@ -88,7 +88,6 @@ SISHEADERS= sis_drv.h sis_drm.h drm_hashtab.h drm_sman.h $(DRMHEADERS)
|
||||||
SAVAGEHEADERS= savage_drv.h savage_drm.h $(DRMHEADERS)
|
SAVAGEHEADERS= savage_drv.h savage_drm.h $(DRMHEADERS)
|
||||||
VIAHEADERS = via_drm.h via_drv.h via_3d_reg.h via_verifier.h $(DRMHEADERS)
|
VIAHEADERS = via_drm.h via_drv.h via_3d_reg.h via_verifier.h $(DRMHEADERS)
|
||||||
MACH64HEADERS = mach64_drv.h mach64_drm.h $(DRMHEADERS)
|
MACH64HEADERS = mach64_drv.h mach64_drm.h $(DRMHEADERS)
|
||||||
NVHEADERS = nv_drv.h $(DRMHEADERS)
|
|
||||||
FFBHEADERS = ffb_drv.h $(DRMHEADERS)
|
FFBHEADERS = ffb_drv.h $(DRMHEADERS)
|
||||||
NOUVEAUHEADERS = nouveau_drv.h nouveau_drm.h nouveau_reg.h $(DRMHEADERS)
|
NOUVEAUHEADERS = nouveau_drv.h nouveau_drm.h nouveau_reg.h $(DRMHEADERS)
|
||||||
XGIHEADERS = xgi_cmdlist.h xgi_drv.h xgi_misc.h xgi_regs.h $(DRMHEADERS)
|
XGIHEADERS = xgi_cmdlist.h xgi_drv.h xgi_misc.h xgi_regs.h $(DRMHEADERS)
|
||||||
|
|
@ -267,7 +266,6 @@ CONFIG_DRM_FFB := n
|
||||||
CONFIG_DRM_SAVAGE := n
|
CONFIG_DRM_SAVAGE := n
|
||||||
CONFIG_DRM_VIA := n
|
CONFIG_DRM_VIA := n
|
||||||
CONFIG_DRM_MACH64 := n
|
CONFIG_DRM_MACH64 := n
|
||||||
CONFIG_DRM_NV := n
|
|
||||||
CONFIG_DRM_NOUVEAU := n
|
CONFIG_DRM_NOUVEAU := n
|
||||||
CONFIG_DRM_XGI := n
|
CONFIG_DRM_XGI := n
|
||||||
|
|
||||||
|
|
@ -300,9 +298,6 @@ endif
|
||||||
ifneq (,$(findstring mga,$(DRM_MODULES)))
|
ifneq (,$(findstring mga,$(DRM_MODULES)))
|
||||||
CONFIG_DRM_MGA := m
|
CONFIG_DRM_MGA := m
|
||||||
endif
|
endif
|
||||||
ifneq (,$(findstring nv,$(DRM_MODULES)))
|
|
||||||
CONFIG_DRM_NV := m
|
|
||||||
endif
|
|
||||||
ifneq (,$(findstring nouveau,$(DRM_MODULES)))
|
ifneq (,$(findstring nouveau,$(DRM_MODULES)))
|
||||||
CONFIG_DRM_NOUVEAU := m
|
CONFIG_DRM_NOUVEAU := m
|
||||||
endif
|
endif
|
||||||
|
|
@ -335,7 +330,6 @@ $(ffb-objs): $(FFBHEADERS)
|
||||||
$(savage-objs): $(SAVAGEHEADERS)
|
$(savage-objs): $(SAVAGEHEADERS)
|
||||||
$(via-objs): $(VIAHEADERS)
|
$(via-objs): $(VIAHEADERS)
|
||||||
$(mach64-objs): $(MACH64HEADERS)
|
$(mach64-objs): $(MACH64HEADERS)
|
||||||
$(nv-objs): $(NVHEADERS)
|
|
||||||
$(nouveau-objs): $(NOUVEAUHEADERS)
|
$(nouveau-objs): $(NOUVEAUHEADERS)
|
||||||
$(xgi-objs): $(XGIHEADERS)
|
$(xgi-objs): $(XGIHEADERS)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -36,7 +36,6 @@ savage-objs := savage_drv.o savage_bci.o savage_state.o
|
||||||
via-objs := via_irq.o via_drv.o via_map.o via_mm.o via_dma.o via_verifier.o \
|
via-objs := via_irq.o via_drv.o via_map.o via_mm.o via_dma.o via_verifier.o \
|
||||||
via_video.o via_dmablit.o via_fence.o via_buffer.o
|
via_video.o via_dmablit.o via_fence.o via_buffer.o
|
||||||
mach64-objs := mach64_drv.o mach64_dma.o mach64_irq.o mach64_state.o
|
mach64-objs := mach64_drv.o mach64_dma.o mach64_irq.o mach64_state.o
|
||||||
nv-objs := nv_drv.o
|
|
||||||
xgi-objs := xgi_cmdlist.o xgi_drv.o xgi_fb.o xgi_misc.o xgi_pcie.o \
|
xgi-objs := xgi_cmdlist.o xgi_drv.o xgi_fb.o xgi_misc.o xgi_pcie.o \
|
||||||
xgi_fence.o
|
xgi_fence.o
|
||||||
|
|
||||||
|
|
@ -60,6 +59,5 @@ obj-$(CONFIG_DRM_FFB) += ffb.o
|
||||||
obj-$(CONFIG_DRM_SAVAGE)+= savage.o
|
obj-$(CONFIG_DRM_SAVAGE)+= savage.o
|
||||||
obj-$(CONFIG_DRM_VIA) += via.o
|
obj-$(CONFIG_DRM_VIA) += via.o
|
||||||
obj-$(CONFIG_DRM_MACH64)+= mach64.o
|
obj-$(CONFIG_DRM_MACH64)+= mach64.o
|
||||||
obj-$(CONFIG_DRM_NV) += nv.o
|
|
||||||
obj-$(CONFIG_DRM_NOUVEAU) += nouveau.o
|
obj-$(CONFIG_DRM_NOUVEAU) += nouveau.o
|
||||||
obj-$(CONFIG_DRM_XGI) += xgi.o
|
obj-$(CONFIG_DRM_XGI) += xgi.o
|
||||||
|
|
|
||||||
|
|
@ -1,94 +0,0 @@
|
||||||
/* nv_drv.c -- nv driver -*- linux-c -*-
|
|
||||||
* Created: Thu Oct 7 10:38:32 1999 by faith@precisioninsight.com
|
|
||||||
*
|
|
||||||
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
|
|
||||||
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
|
|
||||||
* Copyright 2005 Lars Knoll <lars@trolltech.com>
|
|
||||||
* 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 AUTHORS AND/OR THEIR 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.
|
|
||||||
*
|
|
||||||
* Authors:
|
|
||||||
* Rickard E. (Rik) Faith <faith@valinux.com>
|
|
||||||
* Daryll Strauss <daryll@valinux.com>
|
|
||||||
* Gareth Hughes <gareth@valinux.com>
|
|
||||||
* Lars Knoll <lars@trolltech.com>
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "drmP.h"
|
|
||||||
#include "nv_drv.h"
|
|
||||||
|
|
||||||
#include "drm_pciids.h"
|
|
||||||
|
|
||||||
static struct pci_device_id pciidlist[] = {
|
|
||||||
nv_PCI_IDS
|
|
||||||
};
|
|
||||||
|
|
||||||
static int probe(struct pci_dev *pdev, const struct pci_device_id *ent);
|
|
||||||
static struct drm_driver driver = {
|
|
||||||
.driver_features = DRIVER_USE_MTRR | DRIVER_USE_AGP,
|
|
||||||
.reclaim_buffers = drm_core_reclaim_buffers,
|
|
||||||
.get_map_ofs = drm_core_get_map_ofs,
|
|
||||||
.get_reg_ofs = drm_core_get_reg_ofs,
|
|
||||||
.fops = {
|
|
||||||
.owner = THIS_MODULE,
|
|
||||||
.open = drm_open,
|
|
||||||
.release = drm_release,
|
|
||||||
.ioctl = drm_ioctl,
|
|
||||||
.mmap = drm_mmap,
|
|
||||||
.poll = drm_poll,
|
|
||||||
.fasync = drm_fasync,
|
|
||||||
},
|
|
||||||
.pci_driver = {
|
|
||||||
.name = DRIVER_NAME,
|
|
||||||
.id_table = pciidlist,
|
|
||||||
.probe = probe,
|
|
||||||
.remove = __devexit_p(drm_cleanup_pci),
|
|
||||||
},
|
|
||||||
.name = DRIVER_NAME,
|
|
||||||
.desc = DRIVER_DESC,
|
|
||||||
.date = DRIVER_DATE,
|
|
||||||
.major = DRIVER_MAJOR,
|
|
||||||
.minor = DRIVER_MINOR,
|
|
||||||
.patchlevel = DRIVER_PATCHLEVEL,
|
|
||||||
};
|
|
||||||
|
|
||||||
static int probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
||||||
{
|
|
||||||
return drm_get_dev(pdev, ent, &driver);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
static int __init nv_init(void)
|
|
||||||
{
|
|
||||||
return drm_init(&driver, pciidlist);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void __exit nv_exit(void)
|
|
||||||
{
|
|
||||||
drm_exit(&driver);
|
|
||||||
}
|
|
||||||
|
|
||||||
module_init(nv_init);
|
|
||||||
module_exit(nv_exit);
|
|
||||||
|
|
||||||
MODULE_AUTHOR(DRIVER_AUTHOR);
|
|
||||||
MODULE_DESCRIPTION(DRIVER_DESC);
|
|
||||||
MODULE_LICENSE("GPL and additional rights");
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../shared-core/nv_drv.h
|
|
||||||
|
|
@ -1,52 +0,0 @@
|
||||||
/* nv_drv.h -- NV DRM template customization -*- linux-c -*-
|
|
||||||
* Created: Wed Feb 14 12:32:32 2001 by gareth@valinux.com
|
|
||||||
*
|
|
||||||
* Copyright 2005 Lars Knoll <lars@trolltech.com>
|
|
||||||
* 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 AUTHORS AND/OR THEIR 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.
|
|
||||||
*
|
|
||||||
* Authors:
|
|
||||||
* Lars Knoll <lars@trolltech.com>
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __NV_H__
|
|
||||||
#define __NV_H__
|
|
||||||
|
|
||||||
/* General customization:
|
|
||||||
*/
|
|
||||||
|
|
||||||
#define DRIVER_AUTHOR "Lars Knoll"
|
|
||||||
|
|
||||||
#define DRIVER_NAME "nv"
|
|
||||||
#define DRIVER_DESC "NV"
|
|
||||||
#define DRIVER_DATE "20051006"
|
|
||||||
|
|
||||||
#define DRIVER_MAJOR 0
|
|
||||||
#define DRIVER_MINOR 0
|
|
||||||
#define DRIVER_PATCHLEVEL 1
|
|
||||||
|
|
||||||
#define NV04 04
|
|
||||||
#define NV10 10
|
|
||||||
#define NV20 20
|
|
||||||
#define NV30 30
|
|
||||||
#define NV40 40
|
|
||||||
|
|
||||||
#endif
|
|
||||||
Loading…
Reference in New Issue