diff options
| author | Dave Airlie <airlied@redhat.com> | 2007-11-20 08:15:58 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2007-11-20 08:15:58 +1000 |
| commit | d5909b30595c103bb5f42cd1704330f944bba49c (patch) | |
| tree | 024fbb8ef1e200fa7fa24a05263827d226402cf9 | |
| parent | fe2f7a09050fb7a345a1f52239f8f3c4f1053891 (diff) | |
r5xx: cleanups after last merge
| -rw-r--r-- | src/radeon_cursor.c | 1 | ||||
| -rw-r--r-- | src/radeon_output.c | 5 | ||||
| -rw-r--r-- | src/radeon_probe.h | 1 | ||||
| -rw-r--r-- | src/radeon_reg.h | 1 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/radeon_cursor.c b/src/radeon_cursor.c index 8cef5d63..a2cec557 100644 --- a/src/radeon_cursor.c +++ b/src/radeon_cursor.c @@ -154,6 +154,7 @@ radeon_crtc_hide_cursor (xf86CrtcPtr crtc) & ~(AVIVO_D1CURSOR_EN)); avivo_setup_cursor(crtc, FALSE); } else { + switch(crtc_id) { case 0: OUTREG(RADEON_MM_INDEX, RADEON_CRTC_GEN_CNTL); break; diff --git a/src/radeon_output.c b/src/radeon_output.c index 14abb2e4..a824e5ba 100644 --- a/src/radeon_output.c +++ b/src/radeon_output.c @@ -1729,11 +1729,10 @@ radeon_detect(xf86OutputPtr output) * so we can get something on the screen */ if (((radeon_output->type == OUTPUT_VGA || radeon_output->type == OUTPUT_DVI_I) && - radeon_output->DACType == DAC_TVDAC) || - (info->IsIGP && radeon_output->type == OUTPUT_DVI_D)) + radeon_output->DACType == DAC_TVDAC)) { radeon_output->MonType = MT_CRT; return XF86OutputStatusUnknown; - } else if (info->IsIGP && radeon_output->type == OUTPUT_DVI) { + } else if (info->IsIGP && radeon_output->type == OUTPUT_DVI_D) { radeon_output->MonType = MT_DFP; /* MT_LCD ??? */ return XF86OutputStatusUnknown; } diff --git a/src/radeon_probe.h b/src/radeon_probe.h index 24dceea7..d19be931 100644 --- a/src/radeon_probe.h +++ b/src/radeon_probe.h @@ -36,6 +36,7 @@ #ifndef _RADEON_PROBE_H_ #define _RADEON_PROBE_H_ 1 +#include <stdint.h> #include "xf86str.h" #include "xf86DDC.h" #include "randrstr.h" diff --git a/src/radeon_reg.h b/src/radeon_reg.h index 290869fa..3aedb4c9 100644 --- a/src/radeon_reg.h +++ b/src/radeon_reg.h @@ -3647,7 +3647,6 @@ #define AVIVO_GPIO_3 0x7e60 #define AVIVO_DC_GPIO_HPD_Y 0x7e9c -#define R520_PCLK_HDCP_CNTL 0x494 #define AVIVO_I2C_STATUS 0x7d30 # define AVIVO_I2C_STATUS_DONE (1 << 0) |