Attachment 31711 Details for Bug 22140 – only mask/set what we need

[patch] only mask/set what we need

bug22140.diff (text/plain), 1.23 KB, created by Alex Deucher on 2009-12-03 09:27:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2009-12-03 09:27:06 UTC

Size: 1.23 KB

patch

obsolete

>diff --git a/src/legacy_crtc.c b/src/legacy_crtc.c
>index ed339ab..c1fec01 100644
>--- a/src/legacy_crtc.c
>+++ b/src/legacy_crtc.c
>@@ -682,9 +682,9 @@ legacy_crtc_dpms(xf86CrtcPtr crtc, int mode)
>     switch(mode) {
>     case DPMSModeOn:
> 	if (radeon_crtc->crtc_id) {
>-	    OUTREGP(RADEON_CRTC2_GEN_CNTL, RADEON_CRTC2_EN, ~(RADEON_CRTC2_EN | mask));
>+	    OUTREGP(RADEON_CRTC2_GEN_CNTL, RADEON_CRTC2_EN, ~mask);
> 	} else {
>-	    OUTREGP(RADEON_CRTC_GEN_CNTL, RADEON_CRTC_EN, ~(RADEON_CRTC_EN | RADEON_CRTC_DISP_REQ_EN_B));
>+	    OUTREGP(RADEON_CRTC_GEN_CNTL, RADEON_CRTC_EN, ~RADEON_CRTC_DISP_REQ_EN_B);
> 	    OUTREGP(RADEON_CRTC_EXT_CNTL, 0, ~mask);
> 	}
> 	break;
>@@ -692,10 +692,10 @@ legacy_crtc_dpms(xf86CrtcPtr crtc, int mode)
>     case DPMSModeSuspend:
>     case DPMSModeOff:
> 	if (radeon_crtc->crtc_id) {
>-	    OUTREGP(RADEON_CRTC2_GEN_CNTL, mask, ~(RADEON_CRTC2_EN | mask));
>+	    OUTREGP(RADEON_CRTC2_GEN_CNTL, mask, ~RADEON_CRTC2_EN);
> 	} else {
>-	    OUTREGP(RADEON_CRTC_GEN_CNTL, RADEON_CRTC_DISP_REQ_EN_B, ~(RADEON_CRTC_EN | RADEON_CRTC_DISP_REQ_EN_B));
>-	    OUTREGP(RADEON_CRTC_EXT_CNTL, mask, ~mask);
>+	    OUTREGP(RADEON_CRTC_GEN_CNTL, RADEON_CRTC_DISP_REQ_EN_B, ~RADEON_CRTC_EN);
>+	    OUTREGP(RADEON_CRTC_EXT_CNTL, mask, ~0);
> 	}
> 	break;
>     }

Actions: View | Splinter Review

Attachments on bug 22140: 26511 | 26512 | 31702 | 31703 | 31711 | 32086

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.