Hello community,
here is the log from the commit of package xf86-video-siliconmotion for
openSUSE:Factory checked in at 2012-09-15 17:30:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xf86-video-siliconmotion (Old)
and /work/SRC/openSUSE:Factory/.xf86-video-siliconmotion.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-video-siliconmotion", Maintainer is ""
Changes:
--------
---
/work/SRC/openSUSE:Factory/xf86-video-siliconmotion/xf86-video-siliconmotion.changes
2012-05-08 12:04:49.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.xf86-video-siliconmotion.new/xf86-video-siliconmotion.changes
2012-09-15 17:30:56.000000000 +0200
@@ -1,0 +2,8 @@
+Sun Sep 2 21:08:05 UTC 2012 - [email protected]
+
+- Update to version 1.7.7:
+ + Convert to new X server screen conversion apis.
+ + Port to compat-api for new server.
+ + Fix build against XAA-less server.
+
+-------------------------------------------------------------------
Old:
----
xf86-video-siliconmotion-1.7.6.tar.bz2
New:
----
xf86-video-siliconmotion-1.7.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xf86-video-siliconmotion.spec ++++++
--- /var/tmp/diff_new_pack.dqfkVY/_old 2012-09-15 17:30:57.000000000 +0200
+++ /var/tmp/diff_new_pack.dqfkVY/_new 2012-09-15 17:30:57.000000000 +0200
@@ -15,13 +15,14 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
Name: xf86-video-siliconmotion
-Version: 1.7.6
+Version: 1.7.7
Release: 0
-License: MIT
Summary: Silicon Motion video driver for the Xorg X server
-Url: http://xorg.freedesktop.org/
+License: MIT
Group: System/X11/Servers/XF86_4
+Url: http://xorg.freedesktop.org/
Source0:
http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2
BuildRequires: pkg-config
BuildRequires: pkgconfig(fontsproto)
++++++ xf86-video-siliconmotion-1.7.6.tar.bz2 ->
xf86-video-siliconmotion-1.7.7.tar.bz2 ++++++
++++ 26076 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xf86-video-siliconmotion-1.7.6/ChangeLog
new/xf86-video-siliconmotion-1.7.7/ChangeLog
--- old/xf86-video-siliconmotion-1.7.6/ChangeLog 2012-03-24
03:50:13.000000000 +0100
+++ new/xf86-video-siliconmotion-1.7.7/ChangeLog 2012-07-17
08:28:29.000000000 +0200
@@ -1,3 +1,33 @@
+commit 2beb25bd41508ab5e2af39c696485fcb5f0ca7d6
+Author: Dave Airlie <[email protected]>
+Date: Tue Jul 17 16:05:09 2012 +1000
+
+ xf86-video-siliconmotion: bump to version 1.7.7
+
+ Signed-off-by: Dave Airlie <[email protected]>
+
+commit 4b4b8e9c047bd34c516ca8ab2b15fd1c541d05d5
+Author: Dave Airlie <[email protected]>
+Date: Tue Jul 17 14:53:30 2012 +1000
+
+ smi: convert to new X server screen conversion apis.
+
+ Signed-off-by: Dave Airlie <[email protected]>
+
+commit 1aad7b44e3e141bd8d3e589b7cd410e791050bd0
+Author: Dave Airlie <[email protected]>
+Date: Tue Jul 17 02:01:07 2012 +0100
+
+ smi: port to compat-api for new server.
+
+ Signed-off-by: Dave Airlie <[email protected]>
+
+commit 891ea02395079b1480faf701156185ad01405e6d
+Author: Dave Airlie <[email protected]>
+Date: Tue Jul 17 01:52:45 2012 +0100
+
+ smi: fix build against XAA-less server
+
commit e4660be7c12de53cac57c0b7d4e792a071b4fcfc
Author: Alan Coopersmith <[email protected]>
Date: Fri Mar 23 19:49:14 2012 -0700
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xf86-video-siliconmotion-1.7.6/config.h.in
new/xf86-video-siliconmotion-1.7.7/config.h.in
--- old/xf86-video-siliconmotion-1.7.6/config.h.in 2012-03-24
03:49:40.000000000 +0100
+++ new/xf86-video-siliconmotion-1.7.7/config.h.in 2012-07-17
08:28:29.000000000 +0200
@@ -32,6 +32,9 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
+/* Define to 1 if you have the <xaa.h> header file. */
+#undef HAVE_XAA_H
+
/* xextproto 7.1 available */
#undef HAVE_XEXTPROTO_71
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xf86-video-siliconmotion-1.7.6/configure.ac
new/xf86-video-siliconmotion-1.7.7/configure.ac
--- old/xf86-video-siliconmotion-1.7.6/configure.ac 2012-03-24
03:49:32.000000000 +0100
+++ new/xf86-video-siliconmotion-1.7.7/configure.ac 2012-07-17
08:00:16.000000000 +0200
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-siliconmotion],
- [1.7.6],
+ [1.7.7],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/siliconmotion],
[xf86-video-siliconmotion])
@@ -84,6 +84,23 @@
if test "x$XMODES" = xyes; then
AC_DEFINE(HAVE_XMODES, 1, [X server has new mode code])
fi
+AC_ARG_ENABLE(xaa,
+ AS_HELP_STRING([--enable-xaa],
+ [Enable legacy X Acceleration Architecture (XAA)
[default=auto]]),
+ [XAA="$enableval"],
+ [XAA=auto])
+if test "x$XAA" != xno; then
+ save_CFLAGS=$CFLAGS
+ save_CPPFLAGS=$CPPFLAGS
+ CFLAGS=$XORG_CFLAGS
+ CPPFLAGS="$XORG_CFLAGS"
+ AC_CHECK_HEADERS([xaa.h], XAA=yes, XAA=no)
+ CFLAGS=$save_CFLAGS
+ CPPFLAGS=$save_CPPFLAGS
+fi
+AC_MSG_CHECKING([whether to include XAA support])
+AM_CONDITIONAL(XAA, test "x$XAA" = xyes)
+AC_MSG_RESULT([$XAA])
AC_SUBST([moduledir])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xf86-video-siliconmotion-1.7.6/missing
new/xf86-video-siliconmotion-1.7.7/missing
--- old/xf86-video-siliconmotion-1.7.6/missing 2012-03-24 03:49:40.000000000
+0100
+++ new/xf86-video-siliconmotion-1.7.7/missing 2012-07-17 02:46:23.000000000
+0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-01-06.13; # UTC
# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
+# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <[email protected]>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -84,7 +84,6 @@
help2man touch the output file
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
- tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
@@ -122,15 +121,6 @@
# Not GNU programs, they don't have --version.
;;
- tar*)
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- exit 1
- fi
- ;;
-
*)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
@@ -226,7 +216,7 @@
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
if test $# -ne 1; then
- eval LASTARG="\${$#}"
+ eval LASTARG=\${$#}
case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
@@ -256,7 +246,7 @@
\`Flex' from any GNU archive site."
rm -f lex.yy.c
if test $# -ne 1; then
- eval LASTARG="\${$#}"
+ eval LASTARG=\${$#}
case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
@@ -318,41 +308,6 @@
touch $file
;;
- tar*)
- shift
-
- # We have already tried tar in the generic part.
- # Look for gnutar/gtar before invocation to avoid ugly error
- # messages.
- if (gnutar --version > /dev/null 2>&1); then
- gnutar "$@" && exit 0
- fi
- if (gtar --version > /dev/null 2>&1); then
- gtar "$@" && exit 0
- fi
- firstarg="$1"
- if shift; then
- case $firstarg in
- *o*)
- firstarg=`echo "$firstarg" | sed s/o//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- case $firstarg in
- *h*)
- firstarg=`echo "$firstarg" | sed s/h//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- fi
-
- echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
- You may want to install GNU tar or Free paxutils, or check the
- command line arguments."
- exit 1
- ;;
-
*)
echo 1>&2 "\
WARNING: \`$1' is needed, and is $msg.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xf86-video-siliconmotion-1.7.6/src/Makefile.am
new/xf86-video-siliconmotion-1.7.7/src/Makefile.am
--- old/xf86-video-siliconmotion-1.7.6/src/Makefile.am 2012-03-24
03:49:32.000000000 +0100
+++ new/xf86-video-siliconmotion-1.7.7/src/Makefile.am 2012-07-17
02:53:34.000000000 +0200
@@ -31,6 +31,7 @@
siliconmotion_drv_ladir = @moduledir@/drivers
siliconmotion_drv_la_SOURCES = \
+ compat-api.h \
regsmi.h \
smi_501.c \
smi_501.h \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xf86-video-siliconmotion-1.7.6/src/compat-api.h
new/xf86-video-siliconmotion-1.7.7/src/compat-api.h
--- old/xf86-video-siliconmotion-1.7.6/src/compat-api.h 1970-01-01
01:00:00.000000000 +0100
+++ new/xf86-video-siliconmotion-1.7.7/src/compat-api.h 2012-07-17
06:53:21.000000000 +0200
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2012 Red Hat, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Author: Dave Airlie <[email protected]>
+ */
+
+/* this file provides API compat between server post 1.13 and pre it,
+ it should be reused inside as many drivers as possible */
+#ifndef COMPAT_API_H
+#define COMPAT_API_H
+
+#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR
+#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum]
+#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p
+#endif
+
+#ifndef XF86_HAS_SCRN_CONV
+#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum]
+#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex]
+#endif
+
+#ifndef XF86_SCRN_INTERFACE
+
+#define SCRN_ARG_TYPE int
+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)]
+
+#define SCREEN_ARG_TYPE int
+#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)]
+
+#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv
+
+#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout,
pointer pReadmask
+#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask
+
+#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen
+#define CLOSE_SCREEN_ARGS scrnIndex, pScreen
+
+#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags
+#define ADJUST_FRAME_ARGS(arg, x, y) (arg)->scrnIndex, x, y, 0
+
+#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags
+#define SWITCH_MODE_ARGS(arg, m) (arg)->scrnIndex, m, 0
+
+#define FREE_SCREEN_ARGS_DECL int arg, int flags
+
+#define VT_FUNC_ARGS_DECL int arg, int flags
+#define VT_FUNC_ARGS pScrn->scrnIndex, 0
+
+#define XF86_SCRN_ARG(x) ((x)->scrnIndex)
+#else
+#define SCRN_ARG_TYPE ScrnInfoPtr
+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1)
+
+#define SCREEN_ARG_TYPE ScreenPtr
+#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1)
+
+#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
+
+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer
pReadmask
+#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
+
+#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
+#define CLOSE_SCREEN_ARGS pScreen
+
+#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y
+#define ADJUST_FRAME_ARGS(arg, x, y) arg, x, y
+
+#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode
+#define SWITCH_MODE_ARGS(arg, m) arg, m
+
+#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg
+
+#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg
+#define VT_FUNC_ARGS pScrn
+
+#define XF86_SCRN_ARG(x) (x)
+
+#endif
+
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xf86-video-siliconmotion-1.7.6/src/smi.h
new/xf86-video-siliconmotion-1.7.7/src/smi.h
--- old/xf86-video-siliconmotion-1.7.6/src/smi.h 2012-03-24
03:49:32.000000000 +0100
+++ new/xf86-video-siliconmotion-1.7.7/src/smi.h 2012-07-17
06:53:21.000000000 +0200
@@ -49,7 +49,10 @@
#include "fb.h"
+#ifdef HAVE_XAA_H
#include "xaa.h"
+#endif
+#include "xf86fbman.h"
#include "exa.h"
#include "xf86cmap.h"
#include "xf86i2c.h"
@@ -60,6 +63,7 @@
#include "xf86xv.h"
#include <X11/extensions/Xv.h>
+#include "compat-api.h"
/******************************************************************************/
/* D E F I N I T I O N S */
/******************************************************************************/
@@ -239,7 +243,9 @@
printed using a counter */
Bool useBIOS; /* Use BIOS for mode sets */
+#ifdef HAVE_XAA_H
XAAInfoRecPtr XAAInfoRec; /* XAA info Rec */
+#endif
/* EXA */
ExaDriverPtr EXADriverPtr;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xf86-video-siliconmotion-1.7.6/src/smi_driver.c
new/xf86-video-siliconmotion-1.7.7/src/smi_driver.c
--- old/xf86-video-siliconmotion-1.7.6/src/smi_driver.c 2012-03-24
03:49:32.000000000 +0100
+++ new/xf86-video-siliconmotion-1.7.7/src/smi_driver.c 2012-07-17
06:53:21.000000000 +0200
@@ -72,15 +72,14 @@
static void SMI_Identify(int flags);
static Bool SMI_Probe(DriverPtr drv, int flags);
static Bool SMI_PreInit(ScrnInfoPtr pScrn, int flags);
-static Bool SMI_EnterVT(int scrnIndex, int flags);
-static void SMI_LeaveVT(int scrnIndex, int flags);
-static Bool SMI_ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc,
- char **argv);
+static Bool SMI_EnterVT(VT_FUNC_ARGS_DECL);
+static void SMI_LeaveVT(VT_FUNC_ARGS_DECL);
+static Bool SMI_ScreenInit(SCREEN_INIT_ARGS_DECL);
static void SMI_DisableVideo(ScrnInfoPtr pScrn);
static void SMI_EnableVideo(ScrnInfoPtr pScrn);
-static Bool SMI_CloseScreen(int scrnIndex, ScreenPtr pScreen);
+static Bool SMI_CloseScreen(CLOSE_SCREEN_ARGS_DECL);
static Bool SMI_SaveScreen(ScreenPtr pScreen, int mode);
-static void SMI_FreeScreen(int ScrnIndex, int flags);
+static void SMI_FreeScreen(FREE_SCREEN_ARGS_DECL);
static void SMI_ProbeDDC(ScrnInfoPtr pScrn, int index);
static void SMI_DetectPanelSize(ScrnInfoPtr pScrn);
static void SMI_DetectMCLK(ScrnInfoPtr pScrn);
@@ -917,9 +916,9 @@
*/
static Bool
-SMI_EnterVT(int scrnIndex, int flags)
+SMI_EnterVT(VT_FUNC_ARGS_DECL)
{
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+ SCRN_INFO_PTR(arg);
SMIPtr pSmi = SMIPTR(pScrn);
ENTER();
@@ -965,9 +964,9 @@
*/
static void
-SMI_LeaveVT(int scrnIndex, int flags)
+SMI_LeaveVT(VT_FUNC_ARGS_DECL)
{
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+ SCRN_INFO_PTR(arg);
SMIPtr pSmi = SMIPTR(pScrn);
ENTER();
@@ -1620,9 +1619,9 @@
/* This gets called at the start of each server generation. */
static Bool
-SMI_ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+SMI_ScreenInit(SCREEN_INIT_ARGS_DECL)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
SMIPtr pSmi = SMIPTR(pScrn);
EntityInfoPtr pEnt;
@@ -1832,9 +1831,9 @@
*/
static Bool
-SMI_CloseScreen(int scrnIndex, ScreenPtr pScreen)
+SMI_CloseScreen(CLOSE_SCREEN_ARGS_DECL)
{
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
SMIPtr pSmi = SMIPTR(pScrn);
Bool ret;
@@ -1845,11 +1844,13 @@
if (pScrn->vtSema)
/* Restore console mode and unmap framebuffer */
- SMI_LeaveVT(scrnIndex, 0);
+ SMI_LeaveVT(VT_FUNC_ARGS);
+#ifdef HAVE_XAA_H
if (pSmi->XAAInfoRec != NULL) {
XAADestroyInfoRec(pSmi->XAAInfoRec);
}
+#endif
if (pSmi->EXADriverPtr) {
exaDriverFini(pScreen);
pSmi->EXADriverPtr = NULL;
@@ -1871,21 +1872,22 @@
pScrn->vtSema = FALSE;
pScreen->CloseScreen = pSmi->CloseScreen;
- ret = (*pScreen->CloseScreen)(scrnIndex, pScreen);
+ ret = (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS);
LEAVE(ret);
}
static void
-SMI_FreeScreen(int scrnIndex, int flags)
+SMI_FreeScreen(FREE_SCREEN_ARGS_DECL)
{
- SMI_FreeRec(xf86Screens[scrnIndex]);
+ SCRN_INFO_PTR(arg);
+ SMI_FreeRec(pScrn);
}
static Bool
SMI_SaveScreen(ScreenPtr pScreen, int mode)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
ENTER();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xf86-video-siliconmotion-1.7.6/src/smi_exa.c
new/xf86-video-siliconmotion-1.7.7/src/smi_exa.c
--- old/xf86-video-siliconmotion-1.7.6/src/smi_exa.c 2012-03-24
03:49:32.000000000 +0100
+++ new/xf86-video-siliconmotion-1.7.7/src/smi_exa.c 2012-07-17
06:53:21.000000000 +0200
@@ -91,7 +91,7 @@
Bool
SMI_EXAInit(ScreenPtr pScreen)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
SMIPtr pSmi = SMIPTR(pScrn);
ENTER();
@@ -187,7 +187,7 @@
static void
SMI_EXASync(ScreenPtr pScreen, int marker)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
ENTER();
@@ -222,7 +222,7 @@
SMI_PrepareCopy(PixmapPtr pSrcPixmap, PixmapPtr pDstPixmap, int xdir, int ydir,
int alu, Pixel planemask)
{
- ScrnInfoPtr pScrn = xf86Screens[pDstPixmap->drawable.pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pDstPixmap->drawable.pScreen);
SMIPtr pSmi = SMIPTR(pScrn);
int src_pitch, dst_pitch;
unsigned long src_offset, dst_offset;
@@ -289,7 +289,7 @@
SMI_Copy(PixmapPtr pDstPixmap, int srcX, int srcY, int dstX,
int dstY, int width, int height)
{
- ScrnInfoPtr pScrn = xf86Screens[pDstPixmap->drawable.pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pDstPixmap->drawable.pScreen);
SMIPtr pSmi = SMIPTR(pScrn);
ENTER();
@@ -367,7 +367,7 @@
static Bool
SMI_PrepareSolid(PixmapPtr pPixmap, int alu, Pixel planemask, Pixel fg)
{
- ScrnInfoPtr pScrn = xf86Screens[pPixmap->drawable.pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pPixmap->drawable.pScreen);
SMIPtr pSmi = SMIPTR(pScrn);
int dst_pitch;
unsigned long dst_offset;
@@ -437,7 +437,7 @@
static void
SMI_Solid(PixmapPtr pPixmap, int x1, int y1, int x2, int y2)
{
- ScrnInfoPtr pScrn = xf86Screens[pPixmap->drawable.pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pPixmap->drawable.pScreen);
SMIPtr pSmi = SMIPTR(pScrn);
int w, h;
@@ -509,7 +509,7 @@
SMI_UploadToScreen(PixmapPtr pDst, int x, int y, int w, int h,
char *src, int src_pitch)
{
- ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pDst->drawable.pScreen);
SMIPtr pSmi = SMIPTR(pScrn);
int dst_pixelpitch, src_pixelpitch, align, aligned_pitch;
unsigned long dst_offset;
@@ -621,7 +621,7 @@
SMI_PrepareComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture,
PicturePtr pDstPicture,
PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
{
- ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pDst->drawable.pScreen);
SMIPtr pSmi = SMIPTR(pScrn);
int src_pitch = exaGetPixmapPitch(pSrc) / (pSrc->drawable.bitsPerPixel >>
3);
int dst_pitch = exaGetPixmapPitch(pDst) / (pDst->drawable.bitsPerPixel >>
3);
@@ -671,7 +671,7 @@
SMI_Composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
int dstX, int dstY, int width, int height)
{
- ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pDst->drawable.pScreen);
SMIPtr pSmi = SMIPTR(pScrn);
PictTransformPtr t = pSmi->renderTransform;
PictVector v;
@@ -711,7 +711,7 @@
SMI730_Composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
int dstX, int dstY, int width, int height)
{
- ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pDst->drawable.pScreen);
SMIPtr pSmi = SMIPTR(pScrn);
int maxPixels;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xf86-video-siliconmotion-1.7.6/src/smi_video.c
new/xf86-video-siliconmotion-1.7.7/src/smi_video.c
--- old/xf86-video-siliconmotion-1.7.6/src/smi_video.c 2012-03-24
03:49:32.000000000 +0100
+++ new/xf86-video-siliconmotion-1.7.7/src/smi_video.c 2012-07-17
06:53:21.000000000 +0200
@@ -123,8 +123,7 @@
static void SMI_DisplayVideo0730(ScrnInfoPtr pScrn, int id, int offset,
short width, short height, int pitch, int x1, int y1, int x2,
int y2,
BoxPtr dstBox, short vid_w, short vid_h, short drw_w, short
drw_h);
-static void SMI_BlockHandler(int i, pointer blockData, pointer pTimeout,
- pointer pReadMask);
+static void SMI_BlockHandler(BLOCKHANDLER_ARGS_DECL);
/*static int SMI_SendI2C(ScrnInfoPtr pScrn, CARD8 device, char *devName,
SMI_I2CDataPtr i2cData);*/
@@ -612,7 +611,7 @@
void
SMI_InitVideo(ScreenPtr pScreen)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
XF86VideoAdaptorPtr *ptrAdaptors, *newAdaptors = NULL;
XF86VideoAdaptorPtr newAdaptor = NULL;
int numAdaptors;
@@ -815,7 +814,7 @@
static XF86VideoAdaptorPtr
SMI_SetupVideo(ScreenPtr pScreen)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
SMIPtr pSmi = SMIPTR(pScrn);
SMI_PortPtr smiPortPtr;
XF86VideoAdaptorPtr ptrAdaptor;
@@ -2060,20 +2059,15 @@
}
static void
-SMI_BlockHandler(
- int i,
- pointer blockData,
- pointer pTimeout,
- pointer pReadMask
-)
+SMI_BlockHandler(BLOCKHANDLER_ARGS_DECL)
{
- ScreenPtr pScreen = screenInfo.screens[i];
- ScrnInfoPtr pScrn = xf86Screens[i];
+ SCREEN_PTR(arg);
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
SMIPtr pSmi = SMIPTR(pScrn);
SMI_PortPtr pPort = (SMI_PortPtr) pSmi->ptrAdaptor->pPortPrivates[0].ptr;
pScreen->BlockHandler = pSmi->BlockHandler;
- (*pScreen->BlockHandler)(i, blockData, pTimeout, pReadMask);
+ (*pScreen->BlockHandler)(BLOCKHANDLER_ARGS);
pScreen->BlockHandler = SMI_BlockHandler;
if (pPort->videoStatus & TIMER_MASK) {
@@ -2156,7 +2150,7 @@
)
{
XF86OffscreenImagePtr offscreenImages;
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
SMIPtr pSmi = SMIPTR(pScrn);
SMI_PortPtr pPort = (SMI_PortPtr) pSmi->ptrAdaptor->pPortPrivates[0].ptr;
@@ -2194,7 +2188,7 @@
static void
SMI_VideoSave(ScreenPtr pScreen, ExaOffscreenArea *area)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
SMIPtr pSmi = SMIPTR(pScrn);
SMI_PortPtr pPort = pSmi->ptrAdaptor->pPortPrivates[0].ptr;
@@ -2209,7 +2203,7 @@
CARD32
SMI_AllocateMemory(ScrnInfoPtr pScrn, void **mem_struct, int size)
{
- ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex];
+ ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
SMIPtr pSmi = SMIPTR(pScrn);
int offset = 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xf86-video-siliconmotion-1.7.6/src/smi_xaa.c
new/xf86-video-siliconmotion-1.7.7/src/smi_xaa.c
--- old/xf86-video-siliconmotion-1.7.6/src/smi_xaa.c 2012-03-24
03:49:32.000000000 +0100
+++ new/xf86-video-siliconmotion-1.7.7/src/smi_xaa.c 2012-07-17
06:53:21.000000000 +0200
@@ -32,6 +32,8 @@
#include "smi.h"
#include "smi_501.h"
+#ifdef HAVE_XAA_H
+
#include "miline.h"
#include "xaalocal.h"
#include "xaarop.h"
@@ -62,11 +64,13 @@
static void SMI_SubsequentImageWriteRect(ScrnInfoPtr, int, int, int, int, int);
#endif
+#endif
Bool
SMI_XAAInit(ScreenPtr pScreen)
{
+#ifdef HAVE_XAA_H
XAAInfoRecPtr infoPtr;
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
SMIPtr pSmi = SMIPTR(pScrn);
/*BoxRec AvailFBArea;*/
Bool ret;
@@ -187,8 +191,13 @@
ret = XAAInit(pScreen, infoPtr);
LEAVE(ret);
+#else
+ return FALSE;
+#endif
}
+
+#ifdef HAVE_XAA_H
/******************************************************************************/
/* Screen to Screen Copies */
/******************************************************************************/
@@ -720,3 +729,4 @@
LEAVE();
}
#endif
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xf86-video-siliconmotion-1.7.6/src/smilynx_hw.c
new/xf86-video-siliconmotion-1.7.7/src/smilynx_hw.c
--- old/xf86-video-siliconmotion-1.7.6/src/smilynx_hw.c 2012-03-24
03:49:32.000000000 +0100
+++ new/xf86-video-siliconmotion-1.7.7/src/smilynx_hw.c 2012-07-17
06:53:21.000000000 +0200
@@ -584,7 +584,7 @@
tmp = VGAIN8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0x72);
VGAOUT8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0x72, tmp | 0x20);
- pMon = xf86PrintEDID(xf86DoEDID_DDC1(pScrn->scrnIndex,
+ pMon = xf86PrintEDID(xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn),
vgaHWddc1SetSpeedWeak(),
SMILynx_ddc1Read));
VGAOUT8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0x72, tmp);
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
