commit xf86-video-ast for openSUSE:Factory

Hello community, here is the log from the commit of package xf86-video-ast for openSUSE:Factory checked in at 2014-03-18 14:07:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-ast (Old) and /work/SRC/openSUSE:Factory/.xf86-video-ast.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xf86-video-ast" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-ast/xf86-video-ast.changes 2013-08-19 10:53:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xf86-video-ast.new/xf86-video-ast.changes 2014-03-18 14:07:12.000000000 +0100 @@ -1,0 +2,11 @@ +Thu Mar 13 11:38:31 UTC 2014 - sndirsch@suse.com + +- u_ast-fix-falling-back-after-kernel-check.patch: + * fix falling back (to modesetting driver) after kernel check, + i.e. KMS is active (bnc#849888) +- u_Fixed-driver-name-in-error-message-about-KMS-active.patch + * Fixed driver name in error message about KMS active. Seems some + code came from cirrus driver by copy & paste. Fixed this in + error message about device already in use by KMS module. (bnc#849888) + +------------------------------------------------------------------- New: ---- u_Fixed-driver-name-in-error-message-about-KMS-active.patch u_ast-fix-falling-back-after-kernel-check.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-video-ast.spec ++++++ --- /var/tmp/diff_new_pack.lUDBel/_old 2014-03-18 14:07:13.000000000 +0100 +++ /var/tmp/diff_new_pack.lUDBel/_new 2014-03-18 14:07:13.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xf86-video-ast # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,6 +24,8 @@ Group: System/X11/Servers/XF86_4 Url: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2 +Patch0: u_ast-fix-falling-back-after-kernel-check.patch +Patch1: u_Fixed-driver-name-in-error-message-about-KMS-active.patch BuildRequires: pkg-config BuildRequires: pkgconfig(fontsproto) BuildRequires: pkgconfig(pciaccess) >= 0.8.0 @@ -46,6 +48,8 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build %configure ++++++ u_Fixed-driver-name-in-error-message-about-KMS-active.patch ++++++

From 8bf2837eb22e0833e4354dddd23358387f8a00b5 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Fri, 14 Mar 2014 16:00:50 +0100 Subject: [PATCH] Fixed driver name in error message about KMS active.

Seems some code came from cirrus driver by copy & paste. Fixed this in error message about device already in use by KMS module. Signed-off-by: Stefan Dirsch --- src/ast_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ast_driver.c b/src/ast_driver.c index 677c170..3f81558 100644 --- a/src/ast_driver.c +++ b/src/ast_driver.c @@ -312,7 +312,7 @@ ASTProbe(DriverPtr drv, int flags) "ast: The PCI device 0x%x at %2.2d@%2.2d:%2.2d:%1.1d has a kernel module claiming it.\n", pPci->device_id, pPci->bus, pPci->domain, pPci->dev, pPci->func); xf86DrvMsg(0, X_ERROR, - "cirrus: This driver cannot operate until it has been unloaded.\n"); + "ast: This driver cannot operate until it has been unloaded.\n"); xf86UnclaimPciSlot(pPci, devSections[0]); free(devSections); return FALSE; -- 1.8.4.5 ++++++ u_ast-fix-falling-back-after-kernel-check.patch ++++++

From 78066bfa6cae9d0a13852a131a8da379378aae5b Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 13 Mar 2014 12:31:20 +0100 Subject: [PATCH] ast: fix falling back after kernel check

if we find a kernel driver the code leave the pci slot claimed which stops us falling back. unclaim the pci slot. patch inspired by correspondant patch for cirrus driver by Dave Airlie. Signed-off-by: Stefan Dirsch --- src/ast_driver.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/ast_driver.c b/src/ast_driver.c index e0dd4fa..677c170 100644 --- a/src/ast_driver.c +++ b/src/ast_driver.c @@ -291,7 +291,10 @@ ASTProbe(DriverPtr drv, int flags) devSections, numDevSections, drv, &usedChips); - free(devSections); + if (numUsed <= 0) { + free(devSections); + return FALSE; + } if (flags & PROBE_DETECT) { if (numUsed > 0) @@ -310,6 +313,8 @@ ASTProbe(DriverPtr drv, int flags) pPci->device_id, pPci->bus, pPci->domain, pPci->dev, pPci->func); xf86DrvMsg(0, X_ERROR, "cirrus: This driver cannot operate until it has been unloaded.\n"); + xf86UnclaimPciSlot(pPci, devSections[0]); + free(devSections); return FALSE; } } @@ -343,6 +348,7 @@ ASTProbe(DriverPtr drv, int flags) } /* end of for-loop */ } /* end of if flags */ + free(devSections); free(usedChips); return foundScreen; -- 1.8.4.5 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org