From owner-p4-projects@FreeBSD.ORG Sun May 6 17:46:11 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 87C191065674; Sun, 6 May 2012 17:46:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 497D71065670 for ; Sun, 6 May 2012 17:46:11 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 18BA88FC12 for ; Sun, 6 May 2012 17:46:11 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q46HkAkt043756 for ; Sun, 6 May 2012 17:46:10 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q46HkAwB043753 for perforce@freebsd.org; Sun, 6 May 2012 17:46:10 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 6 May 2012 17:46:10 GMT Message-Id: <201205061746.q46HkAwB043753@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 210745 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 May 2012 17:46:11 -0000 http://p4web.freebsd.org/@@210745?ac=10 Change 210745 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/05/06 17:46:02 Fix several nits in the initialisation and writing of the blend register by the MTL driver. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl.c#4 edit .. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_reg.c#5 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl.c#4 (text+ko) ==== @@ -82,12 +82,13 @@ * last. */ error = terasic_mtl_syscons_attach(sc); - if (error == 0) - return (0); + if (error) + goto error; terasic_mtl_blend_default_set(sc, TERASIC_MTL_COLOR_BLACK); terasic_mtl_blend_pixel_set(sc, TERASIC_MTL_ALPHA_TRANSPARENT); terasic_mtl_blend_textfg_set(sc, TERASIC_MTL_ALPHA_OPAQUE); terasic_mtl_blend_textbg_set(sc, TERASIC_MTL_ALPHA_OPAQUE); + return (0); error: terasic_mtl_text_detach(sc); terasic_mtl_pixel_detach(sc); ==== //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_reg.c#5 (text+ko) ==== @@ -161,6 +161,7 @@ terasic_mtl_reg_blend_get(sc, &v); v &= ~TERASIC_MTL_BLEND_DEFAULT_MASK; v |= colour << TERASIC_MTL_BLEND_DEFAULT_SHIFT; + terasic_mtl_reg_blend_set(sc, v); TERASIC_MTL_UNLOCK(sc); } @@ -173,6 +174,7 @@ terasic_mtl_reg_blend_get(sc, &v); v &= ~TERASIC_MTL_BLEND_PIXEL_MASK; v |= alpha << TERASIC_MTL_BLEND_PIXEL_SHIFT; + terasic_mtl_reg_blend_set(sc, v); TERASIC_MTL_UNLOCK(sc); } @@ -185,6 +187,7 @@ terasic_mtl_reg_blend_get(sc, &v); v &= ~TERASIC_MTL_BLEND_TEXTFG_MASK; v |= alpha << TERASIC_MTL_BLEND_TEXTFG_SHIFT; + terasic_mtl_reg_blend_set(sc, v); TERASIC_MTL_UNLOCK(sc); } @@ -197,6 +200,7 @@ terasic_mtl_reg_blend_get(sc, &v); v &= ~TERASIC_MTL_BLEND_TEXTBG_MASK; v |= alpha << TERASIC_MTL_BLEND_TEXTBG_SHIFT; + terasic_mtl_reg_blend_set(sc, v); TERASIC_MTL_UNLOCK(sc); }