From 350808a0794879d1c22be035a31131c1bc124139 Mon Sep 17 00:00:00 2001 From: cvs2git Date: Mon, 3 Sep 2007 12:12:26 +0000 Subject: [PATCH] This commit was manufactured by cvs2git to create branch 'unlabeled-1.158.2'. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Sprout from master 2007-09-03 12:12:26 UTC Jan Rękorajski '- rel 2' Delete: Mesa-realclean.patch nouveau_drm.h --- Mesa-realclean.patch | 14 ---- nouveau_drm.h | 152 ------------------------------------------- 2 files changed, 166 deletions(-) delete mode 100644 Mesa-realclean.patch delete mode 100644 nouveau_drm.h diff --git a/Mesa-realclean.patch b/Mesa-realclean.patch deleted file mode 100644 index dee9257..0000000 --- a/Mesa-realclean.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- Makefile 2006-08-11 03:07:17.000000000 +0200 -+++ Makefile-new 2006-08-15 23:24:30.648596784 +0200 -@@ -23,11 +23,7 @@ - realclean: - touch $(TOP)/configs/current - $(MAKE) clean -- -rm -rf lib* - -rm -f $(TOP)/configs/current -- -rm -f `find . -name \*.o` -- -rm -f `find . -name \*.a` -- -rm -f `find . -name \*.so` - -rm -f `find . -name depend` - - diff --git a/nouveau_drm.h b/nouveau_drm.h deleted file mode 100644 index 3ba7e96..0000000 --- a/nouveau_drm.h +++ /dev/null @@ -1,152 +0,0 @@ -/* - * Copyright 2005 Stephane Marchesin. - * 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. - */ - -#ifndef __NOUVEAU_DRM_H__ -#define __NOUVEAU_DRM_H__ - -#define NOUVEAU_DRM_HEADER_PATCHLEVEL 6 - -typedef struct drm_nouveau_fifo_alloc { - int channel; - uint32_t put_base; - /* FIFO control regs */ - drm_handle_t ctrl; - int ctrl_size; - /* DMA command buffer */ - drm_handle_t cmdbuf; - int cmdbuf_size; -} -drm_nouveau_fifo_alloc_t; - -typedef struct drm_nouveau_object_init { - int channel; - uint32_t handle; - int class; -} -drm_nouveau_object_init_t; - -#define NOUVEAU_MEM_ACCESS_RO 1 -#define NOUVEAU_MEM_ACCESS_WO 2 -#define NOUVEAU_MEM_ACCESS_RW 3 -typedef struct drm_nouveau_dma_object_init { - int channel; - uint32_t handle; - int class; - int access; - int target; - uint32_t offset; - int size; -} -drm_nouveau_dma_object_init_t; - -#define NOUVEAU_MEM_FB 0x00000001 -#define NOUVEAU_MEM_AGP 0x00000002 -#define NOUVEAU_MEM_FB_ACCEPTABLE 0x00000004 -#define NOUVEAU_MEM_AGP_ACCEPTABLE 0x00000008 -#define NOUVEAU_MEM_PINNED 0x00000010 -#define NOUVEAU_MEM_USER_BACKED 0x00000020 -#define NOUVEAU_MEM_MAPPED 0x00000040 -#define NOUVEAU_MEM_INSTANCE 0x00000080 /* internal */ - -typedef struct drm_nouveau_mem_alloc { - int flags; - int alignment; - uint64_t size; // in bytes - uint64_t region_offset; -} -drm_nouveau_mem_alloc_t; - -typedef struct drm_nouveau_mem_free { - uint64_t region_offset; - int flags; -} -drm_nouveau_mem_free_t; - -/* FIXME : maybe unify {GET,SET}PARAMs */ -#define NOUVEAU_GETPARAM_PCI_VENDOR 3 -#define NOUVEAU_GETPARAM_PCI_DEVICE 4 -#define NOUVEAU_GETPARAM_BUS_TYPE 5 -#define NOUVEAU_GETPARAM_FB_PHYSICAL 6 -#define NOUVEAU_GETPARAM_AGP_PHYSICAL 7 -#define NOUVEAU_GETPARAM_FB_SIZE 8 -#define NOUVEAU_GETPARAM_AGP_SIZE 9 -typedef struct drm_nouveau_getparam { - uint64_t param; - uint64_t value; -} -drm_nouveau_getparam_t; - -#define NOUVEAU_SETPARAM_CMDBUF_LOCATION 1 -#define NOUVEAU_SETPARAM_CMDBUF_SIZE 2 -typedef struct drm_nouveau_setparam { - uint64_t param; - uint64_t value; -} -drm_nouveau_setparam_t; - -enum nouveau_card_type { - NV_UNKNOWN =0, - NV_01 =1, - NV_03 =3, - NV_04 =4, - NV_05 =5, - NV_10 =10, - NV_11 =10, - NV_15 =10, - NV_17 =10, - NV_20 =20, - NV_25 =20, - NV_30 =30, - NV_34 =30, - NV_40 =40, - NV_44 =44, - NV_50 =50, - NV_LAST =0xffff, -}; - -enum nouveau_bus_type { - NV_AGP =0, - NV_PCI =1, - NV_PCIE =2, -}; - -#define NOUVEAU_MAX_SAREA_CLIPRECTS 16 - -typedef struct drm_nouveau_sarea { - /* the cliprects */ - drm_clip_rect_t boxes[NOUVEAU_MAX_SAREA_CLIPRECTS]; - unsigned int nbox; -} -drm_nouveau_sarea_t; - -#define DRM_NOUVEAU_FIFO_ALLOC 0x00 -#define DRM_NOUVEAU_OBJECT_INIT 0x01 -#define DRM_NOUVEAU_DMA_OBJECT_INIT 0x02 -#define DRM_NOUVEAU_MEM_ALLOC 0x03 -#define DRM_NOUVEAU_MEM_FREE 0x04 -#define DRM_NOUVEAU_GETPARAM 0x05 -#define DRM_NOUVEAU_SETPARAM 0x06 - -#endif /* __NOUVEAU_DRM_H__ */ - -- 2.44.0