Remove UMS support.

At this point, the only remaining feature regressions should be the lack of
overlay support (about to land), and the need to update the XVMC code to work
in the presence of KMS.

Acked-by: Keith Packard <keithp@keithp.com> (in principle)
Acked-by: Carl Worth <cworth@cworth.org> (in principle)

1 files changed, 0 insertions, 69 deletions

diff --git a/src/i830_modes.c b/src/i830_modes.c
deleted file mode 100644
index 4aa493ea..00000000
--- a/src/i830_modes.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- c-basic-offset: 4 -*- */
-
-#define DEBUG_VERB 2
-/*
- * Copyright © 2002 David Dawes
- * Copyright © 2006 Intel Corporation
- *
- * 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 AUTHOR(S) 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.
- *
- * Except as contained in this notice, the name of the author(s) shall
- * not be used in advertising or otherwise to promote the sale, use or other
- * dealings in this Software without prior written authorization from
- * the author(s).
- *
- * Authors: David Dawes <dawes@xfree86.org>
- *	    Eric Anholt <eric.anholt@intel.com>
- *
- */
-/*
- * Modified by Alan Hourihane <alanh@tungstengraphics.com>
- * to support extended BIOS modes for the Intel chipsets
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-#include <math.h>
-
-#include "xf86.h"
-#include "xf86DDC.h"
-#include "X11/Xatom.h"
-#include "i830.h"
-#include "i830_display.h"
-#include "xf86Modes.h"
-#include <randrstr.h>
-
-DisplayModePtr
-i830_ddc_get_modes (xf86OutputPtr output)
-{
-    I830OutputPrivatePtr    intel_output = output->driver_private;
-    xf86MonPtr		    edid_mon;
-    DisplayModePtr	    modes;
-
-    edid_mon = xf86OutputGetEDID (output, intel_output->pDDCBus);
-    xf86OutputSetEDID (output, edid_mon);
-    
-    modes = xf86OutputGetEDIDModes (output);
-    return modes;
-}