Attachment 27486 Details for Bug 22040 – turn off outputs at leavevt

[patch] turn off outputs at leavevt

i830-kms-dpms-off.patch (text/plain), 2.69 KB, created by Jesse Barnes on 2009-07-07 16:29:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jesse Barnes

Created: 2009-07-07 16:29:20 UTC

Size: 2.69 KB

patch

obsolete

>diff --git a/src/drmmode_display.c b/src/drmmode_display.c
>index e9296dc..9312210 100644
>--- a/src/drmmode_display.c
>+++ b/src/drmmode_display.c
>@@ -1133,3 +1133,17 @@ drmmode_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, xf86CrtcPtr crtc)
> 
> 	return drm_intel_get_pipe_from_crtc_id (bufmgr, drmmode_crtc->mode_crtc->crtc_id);
> }
>+
>+void drmmode_leavevt(ScrnInfoPtr pScrn)
>+{
>+	xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
>+	int i;
>+
>+	for (i = 0; i < xf86_config->num_output; i++) {
>+		xf86OutputPtr output = xf86_config->output[i];
>+		drmmode_output_private_ptr drmmode_output;
>+
>+		drmmode_output = output->driver_private;
>+		drmmode_output_dpms(output, DPMSModeOff);
>+	}
>+}
>diff --git a/src/i830.h b/src/i830.h
>index dc5e0c8..f814534 100644
>--- a/src/i830.h
>+++ b/src/i830.h
>@@ -692,6 +692,7 @@ void I830DRI2CloseScreen(ScreenPtr pScreen);
> extern Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp);
> extern int drmmode_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, xf86CrtcPtr crtc);
> extern int drmmode_output_dpms_status(xf86OutputPtr output);
>+extern void drmmode_leavevt(ScrnInfoPtr pScrn);
> 
> extern Bool i830_crtc_on(xf86CrtcPtr crtc);
> extern int i830_crtc_to_pipe(xf86CrtcPtr crtc);
>diff --git a/src/i830_driver.c b/src/i830_driver.c
>index d1acaa5..bcaa2a6 100644
>--- a/src/i830_driver.c
>+++ b/src/i830_driver.c
>@@ -926,6 +926,7 @@ i830_xf86crtc_resize (ScrnInfoPtr scrn, int width, int height)
> 	i830_memory *new_front, *old_front;
> 	Bool	    tiled;
> 	ScreenPtr   screen = screenInfo.screens[scrn->scrnIndex];
>+	pointer     data = NULL;
> 
> 	scrn->displayWidth = i830_pad_drawable_width(width, i830->cpp);
> 	tiled = i830_tiled_width(i830, &scrn->displayWidth, i830->cpp);
>@@ -945,9 +946,15 @@ i830_xf86crtc_resize (ScrnInfoPtr scrn, int width, int height)
> 	i830_set_pixmap_bo(screen->GetScreenPixmap(screen),
> 			   new_front->bo);
> 	scrn->fbOffset = i830->front_buffer->offset;
>+	if (!new_front->bo)
>+	    data = i830->FbBase + scrn->fbOffset;
> 	screen->ModifyPixmapHeader(screen->GetScreenPixmap(screen),
> 				   width, height, -1, -1, scrn->displayWidth * i830->cpp,
>-				   NULL);
>+				   data);
>+	/* ick. xf86EnableDisableFBAccess smashes the screen pixmap devPrivate,
>+	 * so update the value it uses
>+	 */
>+	scrn->pixmapPrivate.ptr = data;
> 	xf86DrvMsg(scrn->scrnIndex, X_INFO, "New front buffer at 0x%lx\n",
> 		   i830->front_buffer->offset);
> 	i830_set_new_crtc_bo(scrn);
>@@ -2997,7 +3004,9 @@ I830LeaveVT(int scrnIndex, int flags)
> 
>    I830Sync(pScrn);
> 
>-   if (!pI830->use_drm_mode) {
>+   if (pI830->use_drm_mode) {
>+       drmmode_leavevt(pScrn);
>+   } else {
>        RestoreHWState(pScrn);
>        /* Evict everything from the bufmgr, as we're about to lose ownership of
> 	* the graphics memory.

Actions: View | Splinter Review

Attachments on bug 22040: 26651 | 26653 | 27486

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.