From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Dec 15 02:00:00 2012 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AA0DE42A for ; Sat, 15 Dec 2012 02:00:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 7EDCE8FC14 for ; Sat, 15 Dec 2012 02:00:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id qBF2007n031578 for ; Sat, 15 Dec 2012 02:00:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id qBF200bd031577; Sat, 15 Dec 2012 02:00:00 GMT (envelope-from gnats) Resent-Date: Sat, 15 Dec 2012 02:00:00 GMT Resent-Message-Id: <201212150200.qBF200bd031577@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "4721@hushmail.com" <4721@hushmail.com> Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E09BA374 for ; Sat, 15 Dec 2012 01:51:14 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id C28DD8FC13 for ; Sat, 15 Dec 2012 01:51:14 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id qBF1pEQ7005936 for ; Sat, 15 Dec 2012 01:51:14 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id qBF1pEN2005929; Sat, 15 Dec 2012 01:51:14 GMT (envelope-from nobody) Message-Id: <201212150151.qBF1pEN2005929@red.freebsd.org> Date: Sat, 15 Dec 2012 01:51:14 GMT From: "4721@hushmail.com" <4721@hushmail.com> To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/174446: [patch] fix hang on startup in x11-drivers/xf86-video-intel X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Dec 2012 02:00:00 -0000 >Number: 174446 >Category: ports >Synopsis: [patch] fix hang on startup in x11-drivers/xf86-video-intel >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sat Dec 15 02:00:00 UTC 2012 >Closed-Date: >Last-Modified: >Originator: 4721@hushmail.com >Release: >Organization: >Environment: >Description: this patch solves a hang on startx that has been present since the last major xorg upgrade. it solves for at least: vgapci0@pci0:0:2:0: class=0x030000 card=0x017f1028 chip=0x35828086 rev=0x02 hdr=0x00 vendor = 'Intel Corporation' device = '82852/855GM Integrated Graphics Device' class = display subclass = VGA and should fix for some other models as well. this pr should resolve ports/146256 and may resolve ports/153358. tested with: xf86-video-intel-2.7.1_4 xorg-server-1.7.7_6 >How-To-Repeat: >Fix: Patch attached with submission follows: Index: x11-drivers/xf86-video-intel/files/patch-src_i830_display.c =================================================================== --- x11-drivers/xf86-video-intel/files/patch-src_i830_display.c (revision 0) +++ x11-drivers/xf86-video-intel/files/patch-src_i830_display.c (working copy) @@ -0,0 +1,25 @@ +--- src/i830_display.c.orig ++++ src/i830_display.c +@@ -1170,11 +1170,11 @@ + OUTREG(dspbase_reg, INREG(dspbase_reg)); + } + +- i830_crtc_load_lut(crtc); +- + /* Give the overlay scaler a chance to enable if it's on this pipe */ + i830_crtc_dpms_video(crtc, TRUE); + ++ i830_crtc_load_lut(crtc); ++ + /* Reenable compression if needed */ + if (i830_use_fb_compression(crtc)) + i830_enable_fb_compression(crtc); +@@ -1936,7 +1936,7 @@ + int i; + + /* The clocks have to be on to load the palette. */ +- if (!crtc->enabled) ++ if (!crtc->enabled || intel_crtc->dpms_mode != DPMSModeOn) + return; + + for (i = 0; i < 256; i++) { >Release-Note: >Audit-Trail: >Unformatted: