radeon: drop all UMS/DRI1/XAA/overlay support.

This overhauls the radeon driver and removes all the old UMS-only code,
it drops all the UMS, DRI1, XAA, overlay Xv, video capture, tv tuners

There are probably a lot more cleanups that will fall out of this afterwards.

So far this is compile/build tested.

Signed-off-by: Dave Airlie <airlied@redhat.com>

1 files changed, 2 insertions, 71 deletions

diff --git a/src/radeon_video.h b/src/radeon_video.h
index 684cb9e7..e2bfd6f7 100644
--- a/src/radeon_video.h
+++ b/src/radeon_video.h
@@ -2,15 +2,8 @@
 #define __RADEON_VIDEO_H__
 
 #include "xf86i2c.h"
-#include "fi1236.h"
-#include "msp3430.h"
-#include "tda9885.h"
-#include "uda1380.h"
 #include "i2c_def.h"
 
-#include "generic_bus.h"
-#include "theatre.h"
-
 #include "xf86Crtc.h"
 
 #include "bicubic_table.h"
@@ -27,64 +20,12 @@ typedef struct {
    int           saturation;
    int           hue;
    int           contrast;
-   int           red_intensity;
-   int           green_intensity;
-   int           blue_intensity;
-
-	/* overlay composition mode */
-   int		 alpha_mode; /* 0 = key mode, 1 = global mode */
-   int		 ov_alpha;
-   int		 gr_alpha;
-
-     /* i2c bus and devices */
-   I2CBusPtr     i2c;
-   uint32_t      radeon_i2c_timing;
-   uint32_t      radeon_M;
-   uint32_t      radeon_N;
-   uint32_t      i2c_status;
-   uint32_t      i2c_cntl;
-
-   FI1236Ptr     fi1236;
-   uint8_t       tuner_type;
-   MSP3430Ptr    msp3430;
-   TDA9885Ptr    tda9885;
-   UDA1380Ptr    uda1380;
-
-   /* VIP bus and devices */
-   GENERIC_BUS_Ptr  VIP;
-   TheatrePtr       theatre;
-
-   Bool          video_stream_active;
-   int           encoding;
-   uint32_t      frequency;
-   int           volume;
-   Bool          mute;
-   int           sap_channel;
-   int           v;
-   uint32_t      adjustment; /* general purpose variable */
-
-#define METHOD_BOB      0
-#define METHOD_SINGLE   1
-#define METHOD_WEAVE    2
-#define METHOD_ADAPTIVE 3
-
-   int           overlay_deinterlacing_method;
-
-   int           capture_vbi_data;
-
-   int           dec_brightness;
-   int           dec_saturation;
-   int           dec_hue;
-   int           dec_contrast;
-
-   Bool          doubleBuffer;
+
    unsigned char currentBuffer;
    RegionRec     clip;
-   uint32_t      colorKey;
-   uint32_t      videoStatus;
+
    Time          offTime;
    Time          freeTime;
-   Bool          autopaint_colorkey;
    xf86CrtcPtr   desired_crtc;
 
    int           size;
@@ -103,8 +44,6 @@ typedef struct {
 #define BICUBIC_ON   1
 #define BICUBIC_AUTO 2
 
-   Atom          device_id, location_id, instance_id;
-
     /* textured video */
     Bool textured;
     DrawablePtr pDraw;
@@ -145,14 +84,6 @@ typedef struct tagREF_TRANSFORM
 #define RTFContrast(a)   (1.0 + ((a)*1.0)/1000.0)
 #define RTFHue(a)   (((a)*3.1416)/1000.0)
 
-void RADEONInitI2C(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv);
-void RADEONResetI2C(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv);
-
-void RADEONVIP_init(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv);
-void RADEONVIP_reset(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv);
-
-int  RADEONSetPortAttribute(ScrnInfoPtr, Atom, INT32, pointer);
-int  RADEONGetPortAttribute(ScrnInfoPtr, Atom ,INT32 *, pointer);
 void RADEONFreeVideoMemory(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv);
 void RADEONStopVideo(ScrnInfoPtr, pointer, Bool);
 void RADEONQueryBestSize(ScrnInfoPtr, Bool, short, short, short, short,