diff options
| author | Dave Airlie <airlied@redhat.com> | 2007-08-23 19:51:47 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2007-08-23 19:51:47 +1000 |
| commit | 81a8093f2ffdce59d4e8a44f65f3d5c771fd6425 (patch) | |
| tree | b77bb8f8211ad1e670d2c25a793a8633dc32ae55 /src/radeon.h | |
| parent | c08e6ec9e7ac06caee53689b0ec50ef6a7a0ba37 (diff) | |
| parent | 53a67e31904bec9a3aa1bd24de8034dcafea1d2a (diff) | |
Merge remote branch 'origin/randr-1.2'
Diffstat (limited to 'src/radeon.h')
| -rw-r--r-- | src/radeon.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/radeon.h b/src/radeon.h index aee4c3ec..61283453 100644 --- a/src/radeon.h +++ b/src/radeon.h @@ -151,7 +151,8 @@ typedef enum { OPTION_ACCELMETHOD, OPTION_CONSTANTDPI, OPTION_CONNECTORTABLE, - OPTION_DRI + OPTION_DRI, + OPTION_DEFAULT_CONNECTOR_TABLE } RADEONOpts; @@ -329,6 +330,7 @@ typedef struct { CARD32 tv_data_delay_b; CARD32 tv_dac_cntl; CARD32 tv_pll_cntl; + CARD32 tv_pll_cntl1; CARD32 tv_pll_fine_cntl; CARD32 tv_modulator_cntl1; CARD32 tv_modulator_cntl2; @@ -460,7 +462,6 @@ typedef struct { Bool IsMobility; /* Mobile chips for laptops */ Bool IsIGP; /* IGP chips */ Bool HasSingleDAC; /* only TVDAC on chip */ - Bool OverlayOnCRTC2; Bool ddc_mode; /* Validate mode by matching exactly * the modes supported in DDC data */ @@ -947,8 +948,6 @@ void radeon_crtc_load_cursor_argb (xf86CrtcPtr crtc, CARD32 *image); void RADEONEnableOutputs(ScrnInfoPtr pScrn, int crtc_num); -void -RADEONChooseOverlayCRTC(ScrnInfoPtr pScrn, BoxPtr dstBox); extern void RADEONAdjustCrtcRegistersForTV(ScrnInfoPtr pScrn, RADEONSavePtr save, DisplayModePtr mode, xf86OutputPtr output); |