From 3a87b1f497cc201a6c37fcd779019560ab7746ae Mon Sep 17 00:00:00 2001 From: Pekka Paalanen Date: Sat, 21 Nov 2009 01:00:36 +0200 Subject: nouveau: fix DRM headers The nouveau_drmif.h is not the Nouveau DRM kernel ABI file, but purely user space stuff. Remove it, it does not belong in include/drm/. Copy the right header from Nouveau kernel v2.6.31-rc9-757-gaca551c. Signed-off-by: Pekka Paalanen --- include/drm/nouveau_drmif.h | 57 --------------------------------------------- 1 file changed, 57 deletions(-) delete mode 100644 include/drm/nouveau_drmif.h (limited to 'include/drm/nouveau_drmif.h') diff --git a/include/drm/nouveau_drmif.h b/include/drm/nouveau_drmif.h deleted file mode 100644 index bc860d2e..00000000 --- a/include/drm/nouveau_drmif.h +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright 2008 Nouveau Project - * - * 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 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 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_DRMIF_H__ -#define __NOUVEAU_DRMIF_H__ - -#include -#include - -#include "nouveau_device.h" - -struct nouveau_device_priv { - struct nouveau_device base; - - int fd; - drm_context_t ctx; - drmLock *lock; - int needs_close; -}; -#define nouveau_device(n) ((struct nouveau_device_priv *)(n)) - -int -nouveau_device_open_existing(struct nouveau_device **, int close, - int fd, drm_context_t ctx); - -int -nouveau_device_open(struct nouveau_device **, const char *busid); - -void -nouveau_device_close(struct nouveau_device **); - -int -nouveau_device_get_param(struct nouveau_device *, uint64_t param, uint64_t *v); - -int -nouveau_device_set_param(struct nouveau_device *, uint64_t param, uint64_t val); - -#endif -- cgit v1.2.3