From 4aadb784928ebbd60dce172c9a9a80e8d84e943f Mon Sep 17 00:00:00 2001 From: Vladimir Dergachev Date: Mon, 4 Oct 2004 14:53:11 +0000 Subject: Modified: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_video.c This is really embarassing - I found a part of code that had at the end of the lines. I am certain I never saw it before - talk about code rot ! --- src/radeon_video.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'src/radeon_video.c') diff --git a/src/radeon_video.c b/src/radeon_video.c index c09b9d55..dd1e73a1 100644 --- a/src/radeon_video.c +++ b/src/radeon_video.c @@ -942,43 +942,43 @@ static void RADEONSetOverlayAlpha(ScrnInfoPtr pScrn, int ov_alpha, int gr_alpha, OUTREG(RADEON_OV0_KEY_CNTL, RADEON_GRAPHIC_KEY_FN_EQ | /* what does this do? */ RADEON_VIDEO_KEY_FN_FALSE | /* what does this do? */ - RADEON_CMP_MIX_OR); + RADEON_CMP_MIX_OR); /* crtc 1 */ OUTREG(RADEON_DISP_MERGE_CNTL, (RADEON_DISP_ALPHA_MODE_KEY & - RADEON_DISP_ALPHA_MODE_MASK) | - ((gr_alpha << 0x00000010) & - RADEON_DISP_GRPH_ALPHA_MASK) | - ((ov_alpha << 0x00000018) & + RADEON_DISP_ALPHA_MODE_MASK) | + ((gr_alpha << 0x00000010) & + RADEON_DISP_GRPH_ALPHA_MASK) | + ((ov_alpha << 0x00000018) & RADEON_DISP_OV0_ALPHA_MASK)); /* crtc 2 */ OUTREG(RADEON_DISP2_MERGE_CNTL, (RADEON_DISP_ALPHA_MODE_KEY & - RADEON_DISP_ALPHA_MODE_MASK) | - ((gr_alpha << 0x00000010) & - RADEON_DISP_GRPH_ALPHA_MASK) | - ((ov_alpha << 0x00000018) & + RADEON_DISP_ALPHA_MODE_MASK) | + ((gr_alpha << 0x00000010) & + RADEON_DISP_GRPH_ALPHA_MASK) | + ((ov_alpha << 0x00000018) & RADEON_DISP_OV0_ALPHA_MASK)); } else { /* global mode */ OUTREG(RADEON_OV0_KEY_CNTL, RADEON_GRAPHIC_KEY_FN_FALSE | /* what does this do? */ RADEON_VIDEO_KEY_FN_FALSE | /* what does this do? */ - RADEON_CMP_MIX_AND); + RADEON_CMP_MIX_AND); /* crtc 2 */ - OUTREG(RADEON_DISP2_MERGE_CNTL, + OUTREG(RADEON_DISP2_MERGE_CNTL, (RADEON_DISP_ALPHA_MODE_GLOBAL & - RADEON_DISP_ALPHA_MODE_MASK) | - ((gr_alpha << 0x00000010) & - RADEON_DISP_GRPH_ALPHA_MASK) | - ((ov_alpha << 0x00000018) & + RADEON_DISP_ALPHA_MODE_MASK) | + ((gr_alpha << 0x00000010) & + RADEON_DISP_GRPH_ALPHA_MASK) | + ((ov_alpha << 0x00000018) & RADEON_DISP_OV0_ALPHA_MASK)); - /* crtc 1 */ - OUTREG(RADEON_DISP_MERGE_CNTL, + /* crtc 1 */ + OUTREG(RADEON_DISP_MERGE_CNTL, (RADEON_DISP_ALPHA_MODE_GLOBAL & - RADEON_DISP_ALPHA_MODE_MASK) | - ((gr_alpha << 0x00000010) & - RADEON_DISP_GRPH_ALPHA_MASK) | - ((ov_alpha << 0x00000018) & + RADEON_DISP_ALPHA_MODE_MASK) | + ((gr_alpha << 0x00000010) & + RADEON_DISP_GRPH_ALPHA_MASK) | + ((ov_alpha << 0x00000018) & RADEON_DISP_OV0_ALPHA_MASK)); } /* per-pixel mode - RADEON_DISP_ALPHA_MODE_PER_PIXEL */ -- cgit v1.2.3