xserver-xorg-video-siliconmotion: Changes to 'upstream-unstable'
configure.ac | 2 +-
src/smi.h | 21 ++++++++++++++-------
src/smi_accel.c | 2 +-
src/smi_driver.c | 11 ++++++-----
src/smi_i2c.c | 1 -
src/smi_video.c | 8 ++++----
src/smilynx_hw.c | 8 +++++++-
7 files changed, 33 insertions(+), 20 deletions(-)
New commits:
commit 70d3d3a384651e5d22840a0de8644eb8b10c5775
Author: Julien Cristau <jcristau@debian.org>
Date: Sat May 9 16:56:51 2015 +0200
Bump to 1.7.8
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/configure.ac b/configure.ac
index da5ecfd..431a564 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-siliconmotion],
- [1.7.7],
+ [1.7.8],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/siliconmotion],
[xf86-video-siliconmotion])
commit b22c590a546b2ea5f256e7654c4a6b165b320e80
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 8 13:40:46 2015 +0200
Fix a couple const-ness warnings
smi_accel.c: In function 'SMI_GEReset':
smi_accel.c:51:1: warning: passing argument 4 of 'SMI_GEReset' discards 'const' qualifier from pointer target type
WaitIdle();
^
smi_accel.c:38:1: note: expected 'char *' but argument is of type 'const char *'
SMI_GEReset(ScrnInfoPtr pScrn, int from_timeout, int line, char *file)
^
[...]
smi_driver.c: In function 'SMI_DetectPanelSize':
smi_driver.c:1011:12: warning: assignment discards 'const' qualifier from pointer target type
if ((s = xf86GetOptValString(pSmi->Options, OPTION_PANEL_SIZE)) != NULL) {
^
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/src/smi.h b/src/smi.h
index e03a0c9..5e44892 100644
--- a/src/smi.h
+++ b/src/smi.h
@@ -372,7 +372,7 @@ Bool SMI_I2CInit(ScrnInfoPtr pScrn);
/* smi_accel.c */
void SMI_AccelSync(ScrnInfoPtr pScrn);
-void SMI_GEReset(ScrnInfoPtr pScrn, int from_timeout, int line, char *file);
+void SMI_GEReset(ScrnInfoPtr pScrn, int from_timeout, int line, const char *file);
void SMI_EngineReset(ScrnInfoPtr);
void SMI_SetClippingRectangle(ScrnInfoPtr, int, int, int, int);
void SMI_DisableClipping(ScrnInfoPtr);
diff --git a/src/smi_accel.c b/src/smi_accel.c
index b6a3b35..61a686d 100644
--- a/src/smi_accel.c
+++ b/src/smi_accel.c
@@ -35,7 +35,7 @@ authorization from the XFree86 Project and silicon Motion.
#include "smi_501.h"
void
-SMI_GEReset(ScrnInfoPtr pScrn, int from_timeout, int line, char *file)
+SMI_GEReset(ScrnInfoPtr pScrn, int from_timeout, int line, const char *file)
{
SMIPtr pSmi = SMIPTR(pScrn);
int32_t tmp;
diff --git a/src/smi_driver.c b/src/smi_driver.c
index 1c0b355..2568637 100644
--- a/src/smi_driver.c
+++ b/src/smi_driver.c
@@ -1002,7 +1002,7 @@ SMI_LeaveVT(VT_FUNC_ARGS_DECL)
static void
SMI_DetectPanelSize(ScrnInfoPtr pScrn)
{
- char *s;
+ const char *s;
int width, height;
SMIPtr pSmi = SMIPTR(pScrn);
commit ca1c4c19d688d215b52f4e7e2a634c0cbcfff3c1
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 8 13:41:01 2015 +0200
Fix SwitchMode and AdjustFrame hooks
smi_driver.c: In function 'SMI_Probe':
smi_driver.c:360:24: warning: assignment from incompatible pointer type
pScrn->SwitchMode = SMI_SwitchMode;
^
smi_driver.c:361:24: warning: assignment from incompatible pointer type
pScrn->AdjustFrame = SMI_AdjustFrame;
^
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/src/smi.h b/src/smi.h
index 9d6671a..e03a0c9 100644
--- a/src/smi.h
+++ b/src/smi.h
@@ -390,8 +390,8 @@ Bool SMI_HWCursorInit(ScreenPtr pScrn);
/* smi_driver.c */
Bool SMI_MapMem(ScrnInfoPtr pScrn);
void SMI_UnmapMem(ScrnInfoPtr pScrn);
-void SMI_AdjustFrame(int scrnIndex, int x, int y, int flags);
-Bool SMI_SwitchMode(int scrnIndex, DisplayModePtr mode, int flags);
+void SMI_AdjustFrame(ADJUST_FRAME_ARGS_DECL);
+Bool SMI_SwitchMode(SWITCH_MODE_ARGS_DECL);
void SMI_LoadPalette(ScrnInfoPtr pScrn, int numColors, int *indicies,
LOCO *colors, VisualPtr pVisual);
xf86MonPtr SMI_ddc1(ScrnInfoPtr pScrn);
diff --git a/src/smi_driver.c b/src/smi_driver.c
index 134db79..1c0b355 100644
--- a/src/smi_driver.c
+++ b/src/smi_driver.c
@@ -1899,9 +1899,10 @@ SMI_SaveScreen(ScreenPtr pScreen, int mode)
}
void
-SMI_AdjustFrame(int scrnIndex, int x, int y, int flags)
+SMI_AdjustFrame(ADJUST_FRAME_ARGS_DECL)
{
- xf86CrtcConfigPtr crtcConf = XF86_CRTC_CONFIG_PTR(xf86Screens[scrnIndex]);
+ SCRN_INFO_PTR(arg);
+ xf86CrtcConfigPtr crtcConf = XF86_CRTC_CONFIG_PTR(pScrn);
xf86CrtcPtr compat_crtc = crtcConf->output[crtcConf->compat_output]->crtc;
ENTER();
@@ -1912,10 +1913,10 @@ SMI_AdjustFrame(int scrnIndex, int x, int y, int flags)
}
Bool
-SMI_SwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
+SMI_SwitchMode(SWITCH_MODE_ARGS_DECL)
{
Bool ret;
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+ SCRN_INFO_PTR(arg);
SMIPtr pSmi = SMIPTR(pScrn);
ENTER();
commit d06454e89384957fa2b77ff35b35108dc657a510
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 8 13:27:56 2015 +0200
Fix BlockHandler declaration
smi_video.c: In function 'SMI_SetupVideo':
smi_video.c:940:24: warning: assignment from incompatible pointer type
pSmi->BlockHandler = pScreen->BlockHandler;
^
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/src/smi.h b/src/smi.h
index dce82e6..9d6671a 100644
--- a/src/smi.h
+++ b/src/smi.h
@@ -276,8 +276,7 @@ typedef struct
Bool interlaced; /* True: Interlaced Video */
XF86VideoAdaptorPtr ptrAdaptor; /* Pointer to VideoAdapter
structure */
- void (*BlockHandler)(int i, pointer blockData, pointer pTimeout,
- pointer pReadMask);
+ void (*BlockHandler)(BLOCKHANDLER_ARGS_DECL);
#if SMI501_CLI_DEBUG
/* SMI 501/502 Command List Interpreter */
Bool batch_active;
commit 6073828547bdff86d147ab54accb12bc4230d6aa
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 8 13:26:00 2015 +0200
Fix shadow compiler warning
smi_video.c: In function 'SetAttrSAA7111':
smi_video.c:795:6: warning: declaration of 'i' shadows a parameter [-Wshadow]
int i;
^
smi_video.c:723:39: warning: shadowed declaration is here [-Wshadow]
SetAttrSAA7111(ScrnInfoPtr pScrn, int i, int value)
^
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/src/smi_video.c b/src/smi_video.c
index 7900b3e..27df68d 100644
--- a/src/smi_video.c
+++ b/src/smi_video.c
@@ -792,12 +792,12 @@ SetAttrSAA7111(ScrnInfoPtr pScrn, int i, int value)
/* debug: show registers */
{
I2CByte i2c_bytes[32];
- int i;
+ int j;
xf86I2CReadBytes(&(pPort->I2CDev), 0, i2c_bytes, 32);
DEBUG("SAA7111 Registers\n");
- for (i=0; i<32; i++) {
- DEBUG("%02X=%02X ", i, i2c_bytes[i]);
- if ((i&7) == 7) DEBUG("\n");
+ for (j=0; j<32; j++) {
+ DEBUG("%02X=%02X ", j, i2c_bytes[j]);
+ if ((j&7) == 7) DEBUG("\n");
}
}
commit c31d7f853d7469085f96f1e37923c260884c611c
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Sep 30 10:34:07 2014 -0400
Remove dependency on xf86PciInfo.h
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/smi.h b/src/smi.h
index 8ca760e..dce82e6 100644
--- a/src/smi.h
+++ b/src/smi.h
@@ -37,7 +37,6 @@ authorization from the XFree86 Project and Silicon Motion.
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86PciInfo.h"
#include "xf86Pci.h"
#include "xf86Cursor.h"
#include "vgaHW.h"
@@ -68,6 +67,15 @@ authorization from the XFree86 Project and Silicon Motion.
/* D E F I N I T I O N S */
/******************************************************************************/
+#define PCI_VENDOR_SMI 0x126F
+#define PCI_CHIP_SMI910 0x0910
+#define PCI_CHIP_SMI810 0x0810
+#define PCI_CHIP_SMI820 0x0820
+#define PCI_CHIP_SMI710 0x0710
+#define PCI_CHIP_SMI712 0x0712
+#define PCI_CHIP_SMI720 0x0720
+#define PCI_CHIP_SMI731 0x0730
+
#ifndef SMI_DEBUG
#define SMI_DEBUG 0
#endif
diff --git a/src/smi_i2c.c b/src/smi_i2c.c
index f38b514..ecf350e 100644
--- a/src/smi_i2c.c
+++ b/src/smi_i2c.c
@@ -35,7 +35,6 @@ authorization from the XFree86 Project and Silicon Motion.
#include "xf86_OSproc.h"
#include "compiler.h"
#include "xf86Pci.h"
-#include "xf86PciInfo.h"
#include "vgaHW.h"
#include "smi.h"
commit 08d459d2b548ce89264f45c7018f1cda9f08d795
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Sep 30 10:31:52 2014 -0400
Fix a typo
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/smilynx_hw.c b/src/smilynx_hw.c
index 7f6a8f2..b2ee8a5 100644
--- a/src/smilynx_hw.c
+++ b/src/smilynx_hw.c
@@ -573,7 +573,7 @@ SMILynx_ddc1Read(ScrnInfoPtr pScrn)
}
static void
-SMILynx_ddc1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeec speed)
+SMILynx_ddc1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed)
{
vgaHWddc1SetSpeed(pScrn, speed);
}
commit b0b287209cfba5c64c7584b1a82ed2a2f1eab7e6
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Sep 30 10:28:48 2014 -0400
Fix build against xserver 1.17
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/smi.h b/src/smi.h
index 956c14f..8ca760e 100644
--- a/src/smi.h
+++ b/src/smi.h
@@ -221,7 +221,7 @@ typedef struct
CARD8 * DataPortBase; /* Base of data port */
int DataPortSize; /* Size of data port */
CARD8 * IOBase; /* Base of MMIO VGA ports */
- IOADDRESS PIOBase; /* Base of I/O ports */
+ unsigned int PIOBase; /* Base of I/O ports */
unsigned char * FBBase; /* Base of FB */
CARD32 fbMapOffset; /* offset for fb mapping */
CARD32 FBOffset; /* Current visual FB starting
commit 9b563415326e02f0b89f716c29b2fc22f393fb96
Author: Adam Jackson <ajax@redhat.com>
Date: Wed May 21 14:01:02 2014 -0400
Use own thunk function instead of vgaHW*Weak
I plan to remove the Weak functions from a future server.
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/smilynx_hw.c b/src/smilynx_hw.c
index 9a10a31..7f6a8f2 100644
--- a/src/smilynx_hw.c
+++ b/src/smilynx_hw.c
@@ -572,6 +572,12 @@ SMILynx_ddc1Read(ScrnInfoPtr pScrn)
LEAVE(ret);
}
+static void
+SMILynx_ddc1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeec speed)
+{
+ vgaHWddc1SetSpeed(pScrn, speed);
+}
+
xf86MonPtr
SMILynx_ddc1(ScrnInfoPtr pScrn)
{
@@ -585,7 +591,7 @@ SMILynx_ddc1(ScrnInfoPtr pScrn)
VGAOUT8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0x72, tmp | 0x20);
pMon = xf86PrintEDID(xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn),
- vgaHWddc1SetSpeedWeak(),
+ SMILynx_ddc1SetSpeed,
SMILynx_ddc1Read));
VGAOUT8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0x72, tmp);
Reply to: