From 9583c099b4a08b49e03f7b461c344b6d277fd262 Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Wed, 10 Dec 2008 15:47:28 -0800 Subject: Revert "Merge branch 'modesetting-gem'" This reverts commit 6656db10551bbb8770dd945b6d81d5138521f208. We really just want the libdrm and ioctl bits, not all the driver stuff. --- linux-core/nv50_display.h | 83 ----------------------------------------------- 1 file changed, 83 deletions(-) delete mode 100644 linux-core/nv50_display.h (limited to 'linux-core/nv50_display.h') diff --git a/linux-core/nv50_display.h b/linux-core/nv50_display.h deleted file mode 100644 index 3c2ee1c9..00000000 --- a/linux-core/nv50_display.h +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Copyright (C) 2008 Maarten Maathuis. - * 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 COPYRIGHT OWNER(S) 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 __NV50_DISPLAY_H__ -#define __NV50_DISPLAY_H__ - -#include "drmP.h" -#include "drm.h" -#include "nouveau_dma.h" -#include "nouveau_drv.h" -#include "nouveau_reg.h" -#include "nv50_display_commands.h" - -/* for convience, so you can see through the trees. */ -#define NV50_DEBUG DRM_ERROR - -struct nouveau_hw_mode { - unsigned int clock; - unsigned short hdisplay, hblank_start, hsync_start, hsync_end, hblank_end, htotal; - unsigned short vdisplay, vblank_start, vsync_start, vsync_end, vblank_end, vtotal; - - unsigned int flags; -}; - -struct nv50_crtc; -struct nv50_output; -struct nv50_connector; - -struct nv50_display { - struct drm_device *dev; - - bool preinit_done; - bool init_done; - - int last_crtc; /* crtc used for last mode set */ - - int (*pre_init) (struct nv50_display *display); - int (*init) (struct nv50_display *display); - int (*disable) (struct nv50_display *display); - int (*update) (struct nv50_display *display); - - struct list_head crtcs; - struct list_head outputs; - struct list_head connectors; -}; - -enum scaling_modes { - SCALE_NON_GPU, - SCALE_FULLSCREEN, - SCALE_ASPECT, - SCALE_NOSCALE, - SCALE_INVALID -}; - -void nv50_display_command(struct drm_nouveau_private *dev_priv, uint32_t mthd, uint32_t val); -struct nv50_display *nv50_get_display(struct drm_device *dev); -int nv50_display_create(struct drm_device *dev); -int nv50_display_destroy(struct drm_device *dev); - -#endif /* __NV50_DISPLAY_H__ */ -- cgit v1.2.3