Hello community, here is the log from the commit of package xf86-video-savage for openSUSE:Factory checked in at 2018-06-27 10:21:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-savage (Old) and /work/SRC/openSUSE:Factory/.xf86-video-savage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-video-savage" Wed Jun 27 10:21:34 2018 rev:19 rq:618969 version:2.3.9 Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-savage/xf86-video-savage.changes 2017-01-24 10:35:51.389496580 +0100 +++ /work/SRC/openSUSE:Factory/.xf86-video-savage.new/xf86-video-savage.changes 2018-06-27 10:21:36.123642463 +0200 @@ -1,0 +2,7 @@ +Fri Jun 22 13:31:21 UTC 2018 - [email protected] + +- u_Add-check-for-max-HV-Value-to-ValidMode-hook.patch + * Add check for max[HV]Value to ValidMode hook, since this + functionality has been removed from xorg-server 1.20 + +------------------------------------------------------------------- New: ---- u_Add-check-for-max-HV-Value-to-ValidMode-hook.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-video-savage.spec ++++++ --- /var/tmp/diff_new_pack.JlRDuU/_old 2018-06-27 10:21:36.587625541 +0200 +++ /var/tmp/diff_new_pack.JlRDuU/_new 2018-06-27 10:21:36.591625395 +0200 @@ -1,7 +1,7 @@ # # spec file for package xf86-video-savage # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX 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 +# https://lists.x.org/archives/xorg-devel/2018-June/057207.html +Patch0: u_Add-check-for-max-HV-Value-to-ValidMode-hook.patch BuildRequires: Mesa-devel BuildRequires: pkg-config BuildRequires: pkgconfig(fontsproto) @@ -53,6 +55,7 @@ %prep %setup -q +%patch0 -p1 %build %configure @@ -64,7 +67,8 @@ %files %defattr(-,root,root) -%doc ChangeLog COPYING README +%doc ChangeLog README +%license COPYING %dir %{_libdir}/xorg/modules/drivers %{_libdir}/xorg/modules/drivers/savage_drv.so %{_datadir}/man/man4/savage.4%{?ext_man} ++++++ u_Add-check-for-max-HV-Value-to-ValidMode-hook.patch ++++++ >From d5efaf928a0f82981612fe9765a7b6e82adea0f9 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch <[email protected]> Date: Fri, 22 Jun 2018 15:27:18 +0200 Subject: [PATCH] Add check for max[HV]Value to ValidMode hook xorg-server 1.20 removed this check, so implement this in the driver itself. Signed-off-by: Stefan Dirsch <[email protected]> --- src/savage_driver.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/savage_driver.c b/src/savage_driver.c index 58a294d..3cda923 100644 --- a/src/savage_driver.c +++ b/src/savage_driver.c @@ -2034,8 +2034,6 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags) xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Detected current MCLK value of %1.3f MHz\n", mclk / 1000.0); - pScrn->maxHValue = 2048 << 3; /* 11 bits of h_total 8-pixel units */ - pScrn->maxVValue = 2048; /* 11 bits of v_total */ pScrn->virtualX = pScrn->display->virtualX; pScrn->virtualY = pScrn->display->virtualY; @@ -3637,6 +3635,14 @@ static ModeStatus SavageValidMode(SCRN_ARG_TYPE arg, DisplayModePtr pMode, (pMode->VDisplay > psav->PanelY))) return MODE_PANEL; + /* 11 bits of h_total 8-pixel units */ + if (pMode->HTotal > (2048 << 3)) + return MODE_BAD_HVALUE; + + /* 11 bits of v_total */ + if (pMode->VTotal > 2048) + return MODE_BAD_VVALUE; + if (psav->UseBIOS) { refresh = SavageGetRefresh(pMode); return (SavageMatchBiosMode(pScrn,pMode->HDisplay, -- 2.16.3
