[Openchrome-devel] xf86-video-openchrome: 6 commits - configure.ac src/via_vt1632.c src/via_vt1632.h
Kevin Brace
kevinbrace at kemper.freedesktop.org
Sat Aug 20 06:11:16 UTC 2016
configure.ac | 2
src/via_vt1632.c | 117 +++++++++++++++++++++++++++----------------------------
src/via_vt1632.h | 7 +--
3 files changed, 62 insertions(+), 64 deletions(-)
New commits:
commit 27926279640476aee9b8feee970b7b39e31e719d
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Aug 19 23:10:57 2016 -0700
Version bumped to 0.5.132
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/configure.ac b/configure.ac
index c22ee48..4493c31 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ(2.57)
AC_INIT([xf86-video-openchrome],
- [0.5.131],
+ [0.5.132],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
[xf86-video-openchrome])
commit 2e5f975529f8a105a9fb079bb54222c00d528040
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Aug 19 23:03:56 2016 -0700
Altered the names related to viaVT1632Rec
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_vt1632.c b/src/via_vt1632.c
index c1f5045..7bcfb83 100644
--- a/src/via_vt1632.c
+++ b/src/via_vt1632.c
@@ -145,7 +145,7 @@ viaVT1632Power(ScrnInfoPtr pScrn, I2CDevPtr pDev, Bool powerState)
static void
viaVT1632SaveRegisters(ScrnInfoPtr pScrn, I2CDevPtr pDev,
- ViaVT1632Ptr pVIAVT1632Rec)
+ viaVT1632RecPtr pVIAVT1632Rec)
{
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entered viaVT1632SaveRegisters.\n"));
@@ -163,7 +163,7 @@ viaVT1632SaveRegisters(ScrnInfoPtr pScrn, I2CDevPtr pDev,
static void
viaVT1632RestoreRegisters(ScrnInfoPtr pScrn, I2CDevPtr pDev,
- ViaVT1632Ptr pVIAVT1632Rec)
+ viaVT1632RecPtr pVIAVT1632Rec)
{
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entered viaVT1632RestoreRegisters.\n"));
@@ -183,7 +183,7 @@ static int
viaVT1632CheckModeValidity(xf86OutputPtr output, DisplayModePtr pMode)
{
ScrnInfoPtr pScrn = output->scrn;
- ViaVT1632Ptr pVIAVT1632Rec = output->driver_private;
+ viaVT1632RecPtr pVIAVT1632Rec = output->driver_private;
int status = MODE_OK;
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
@@ -211,7 +211,7 @@ via_vt1632_mode_set(xf86OutputPtr output, DisplayModePtr mode,
ScrnInfoPtr pScrn = output->scrn;
drmmode_crtc_private_ptr iga = output->crtc->driver_private;
VIAPtr pVia = VIAPTR(pScrn);
- ViaVT1632Ptr pVIAVT1632Rec = output->driver_private;
+ viaVT1632RecPtr pVIAVT1632Rec = output->driver_private;
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entered via_vt1632_mode_set.\n"));
@@ -246,7 +246,7 @@ static void
via_vt1632_dpms(xf86OutputPtr output, int mode)
{
ScrnInfoPtr pScrn = output->scrn;
- ViaVT1632Ptr pVIAVT1632Rec = output->driver_private;
+ viaVT1632RecPtr pVIAVT1632Rec = output->driver_private;
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entered via_vt1632_dpms.\n"));
@@ -272,7 +272,7 @@ static void
via_vt1632_save(xf86OutputPtr output)
{
ScrnInfoPtr pScrn = output->scrn;
- ViaVT1632Ptr pVIAVT1632Rec = output->driver_private;
+ viaVT1632RecPtr pVIAVT1632Rec = output->driver_private;
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entered via_vt1632_save.\n"));
@@ -287,7 +287,7 @@ static void
via_vt1632_restore(xf86OutputPtr output)
{
ScrnInfoPtr pScrn = output->scrn;
- ViaVT1632Ptr pVIAVT1632Rec = output->driver_private;
+ viaVT1632RecPtr pVIAVT1632Rec = output->driver_private;
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entered via_vt1632_restore.\n"));
@@ -328,7 +328,7 @@ via_vt1632_detect(xf86OutputPtr output)
xf86MonPtr mon;
xf86OutputStatus status = XF86OutputStatusDisconnected;
ScrnInfoPtr pScrn = output->scrn;
- ViaVT1632Ptr pVIAVT1632Rec = output->driver_private;
+ viaVT1632RecPtr pVIAVT1632Rec = output->driver_private;
/* Check for the DVI presence via VT1632 first before accessing
* I2C bus. */
@@ -399,7 +399,7 @@ Bool
viaVT1632Init(ScrnInfoPtr pScrn, I2CBusPtr pI2CBus)
{
xf86OutputPtr output;
- ViaVT1632Ptr pVIAVT1632Rec = NULL;
+ viaVT1632RecPtr pVIAVT1632Rec = NULL;
I2CDevPtr pI2CDevice = NULL;
I2CSlaveAddr i2cAddr = 0x10;
CARD8 buf;
@@ -456,7 +456,7 @@ viaVT1632Init(ScrnInfoPtr pScrn, I2CBusPtr pI2CBus)
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
"VT1632 external TMDS transmitter detected.\n");
- pVIAVT1632Rec = xnfcalloc(1, sizeof(ViaVT1632Rec));
+ pVIAVT1632Rec = xnfcalloc(1, sizeof(viaVT1632Rec));
if (!pVIAVT1632Rec) {
xf86DestroyI2CDevRec(pI2CDevice, TRUE);
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
diff --git a/src/via_vt1632.h b/src/via_vt1632.h
index 594f71e..1ec78b1 100644
--- a/src/via_vt1632.h
+++ b/src/via_vt1632.h
@@ -31,7 +31,7 @@
#define VIA_VT1632_EDGE 0x02
#define VIA_VT1632_PDB 0x01
-typedef struct _ViaVT1632 {
+typedef struct _viaVT1632Rec {
I2CDevPtr VT1632I2CDev;
int DotclockMin;
@@ -40,7 +40,7 @@ typedef struct _ViaVT1632 {
CARD8 Register09;
CARD8 Register0A;
CARD8 Register0C;
-} ViaVT1632Rec, *ViaVT1632Ptr;
+} viaVT1632Rec, *viaVT1632RecPtr;
const xf86OutputFuncsRec via_vt1632_funcs;
commit 72af9f6d263b671fd1c6be0a1ec53d9178949f67
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Aug 19 22:28:48 2016 -0700
Moved via_vt1632_set_property and via_vt1632_get_property
Moved the location of via_vt1632_set_property and
via_vt1632_get_property functions.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_vt1632.c b/src/via_vt1632.c
index 5cd4771..c1f5045 100644
--- a/src/via_vt1632.c
+++ b/src/via_vt1632.c
@@ -242,21 +242,6 @@ via_vt1632_create_resources(xf86OutputPtr output)
{
}
-#ifdef RANDR_12_INTERFACE
-static Bool
-via_vt1632_set_property(xf86OutputPtr output, Atom property,
- RRPropertyValuePtr value)
-{
- return TRUE;
-}
-
-static Bool
-via_vt1632_get_property(xf86OutputPtr output, Atom property)
-{
- return FALSE;
-}
-#endif
-
static void
via_vt1632_dpms(xf86OutputPtr output, int mode)
{
@@ -369,6 +354,21 @@ via_vt1632_detect(xf86OutputPtr output)
return status;
}
+#ifdef RANDR_12_INTERFACE
+static Bool
+via_vt1632_set_property(xf86OutputPtr output, Atom property,
+ RRPropertyValuePtr value)
+{
+ return TRUE;
+}
+
+static Bool
+via_vt1632_get_property(xf86OutputPtr output, Atom property)
+{
+ return FALSE;
+}
+#endif
+
static void
via_vt1632_destroy(xf86OutputPtr output)
{
@@ -376,12 +376,6 @@ via_vt1632_destroy(xf86OutputPtr output)
const xf86OutputFuncsRec via_vt1632_funcs = {
.create_resources = via_vt1632_create_resources,
-#ifdef RANDR_12_INTERFACE
- .set_property = via_vt1632_set_property,
-#endif
-#ifdef RANDR_13_INTERFACE
- .get_property = via_vt1632_get_property,
-#endif
.dpms = via_vt1632_dpms,
.save = via_vt1632_save,
.restore = via_vt1632_restore,
@@ -392,6 +386,12 @@ const xf86OutputFuncsRec via_vt1632_funcs = {
.mode_set = via_vt1632_mode_set,
.detect = via_vt1632_detect,
.get_modes = xf86OutputGetEDIDModes,
+#ifdef RANDR_12_INTERFACE
+ .set_property = via_vt1632_set_property,
+#endif
+#ifdef RANDR_13_INTERFACE
+ .get_property = via_vt1632_get_property,
+#endif
.destroy = via_vt1632_destroy,
};
commit 334b3c241f162a82fa325d196a17e38e45791f6b
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Aug 19 14:57:58 2016 -0700
Rewrote viaVT1632CheckModeValidity
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_vt1632.c b/src/via_vt1632.c
index 0fe1da9..5cd4771 100644
--- a/src/via_vt1632.c
+++ b/src/via_vt1632.c
@@ -179,30 +179,29 @@ viaVT1632RestoreRegisters(ScrnInfoPtr pScrn, I2CDevPtr pDev,
"Exiting viaVT1632RestoreRegisters.\n"));
}
-int
+static int
viaVT1632CheckModeValidity(xf86OutputPtr output, DisplayModePtr pMode)
{
- ViaVT1632Ptr Private = output->driver_private;
ScrnInfoPtr pScrn = output->scrn;
+ ViaVT1632Ptr pVIAVT1632Rec = output->driver_private;
+ int status = MODE_OK;
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entered viaVT1632CheckModeValidity.\n"));
- if (pMode->Clock < Private->DotclockMin) {
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Exiting viaVT1632CheckModeValidity.\n"));
- return MODE_CLOCK_LOW;
+ if (pMode->Clock < pVIAVT1632Rec->DotclockMin) {
+ status = MODE_CLOCK_LOW;
+ goto exit;
}
- if (pMode->Clock > Private->DotclockMax) {
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Exiting viaVT1632CheckModeValidity.\n"));
- return MODE_CLOCK_HIGH;
+ if (pMode->Clock > pVIAVT1632Rec->DotclockMax) {
+ status = MODE_CLOCK_HIGH;
}
+exit:
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Exiting viaVT1632CheckModeValidity.\n"));
- return MODE_OK;
+ return status;
}
void
diff --git a/src/via_vt1632.h b/src/via_vt1632.h
index 897e48f..594f71e 100644
--- a/src/via_vt1632.h
+++ b/src/via_vt1632.h
@@ -45,7 +45,6 @@ typedef struct _ViaVT1632 {
const xf86OutputFuncsRec via_vt1632_funcs;
-int viaVT1632CheckModeValidity(xf86OutputPtr output, DisplayModePtr pMode);
Bool viaVT1632Init(ScrnInfoPtr pScrn, I2CBusPtr pI2CBus);
#endif /* _VIA_VT1632_H_ */
commit f13b361642478d76fdcf995ef266b53eb000b63a
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Aug 19 14:50:08 2016 -0700
Changed via_dvi_* to via_vt1632_* in via_vt1632.c
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_vt1632.c b/src/via_vt1632.c
index c3d301f..0fe1da9 100644
--- a/src/via_vt1632.c
+++ b/src/via_vt1632.c
@@ -239,20 +239,20 @@ via_vt1632_mode_set(xf86OutputPtr output, DisplayModePtr mode,
}
static void
-via_dvi_create_resources(xf86OutputPtr output)
+via_vt1632_create_resources(xf86OutputPtr output)
{
}
#ifdef RANDR_12_INTERFACE
static Bool
-via_dvi_set_property(xf86OutputPtr output, Atom property,
+via_vt1632_set_property(xf86OutputPtr output, Atom property,
RRPropertyValuePtr value)
{
return TRUE;
}
static Bool
-via_dvi_get_property(xf86OutputPtr output, Atom property)
+via_vt1632_get_property(xf86OutputPtr output, Atom property)
{
return FALSE;
}
@@ -316,25 +316,25 @@ via_vt1632_restore(xf86OutputPtr output)
}
static int
-via_dvi_mode_valid(xf86OutputPtr output, DisplayModePtr pMode)
+via_vt1632_mode_valid(xf86OutputPtr output, DisplayModePtr pMode)
{
return viaVT1632CheckModeValidity(output, pMode);
}
static Bool
-via_dvi_mode_fixup(xf86OutputPtr output, DisplayModePtr mode,
+via_vt1632_mode_fixup(xf86OutputPtr output, DisplayModePtr mode,
DisplayModePtr adjusted_mode)
{
return TRUE;
}
static void
-via_dvi_prepare(xf86OutputPtr output)
+via_vt1632_prepare(xf86OutputPtr output)
{
}
static void
-via_dvi_commit(xf86OutputPtr output)
+via_vt1632_commit(xf86OutputPtr output)
{
}
@@ -371,29 +371,29 @@ via_vt1632_detect(xf86OutputPtr output)
}
static void
-via_dvi_destroy(xf86OutputPtr output)
+via_vt1632_destroy(xf86OutputPtr output)
{
}
-const xf86OutputFuncsRec via_dvi_funcs = {
- .create_resources = via_dvi_create_resources,
+const xf86OutputFuncsRec via_vt1632_funcs = {
+ .create_resources = via_vt1632_create_resources,
#ifdef RANDR_12_INTERFACE
- .set_property = via_dvi_set_property,
+ .set_property = via_vt1632_set_property,
#endif
#ifdef RANDR_13_INTERFACE
- .get_property = via_dvi_get_property,
+ .get_property = via_vt1632_get_property,
#endif
.dpms = via_vt1632_dpms,
.save = via_vt1632_save,
.restore = via_vt1632_restore,
- .mode_valid = via_dvi_mode_valid,
- .mode_fixup = via_dvi_mode_fixup,
- .prepare = via_dvi_prepare,
- .commit = via_dvi_commit,
+ .mode_valid = via_vt1632_mode_valid,
+ .mode_fixup = via_vt1632_mode_fixup,
+ .prepare = via_vt1632_prepare,
+ .commit = via_vt1632_commit,
.mode_set = via_vt1632_mode_set,
.detect = via_vt1632_detect,
.get_modes = xf86OutputGetEDIDModes,
- .destroy = via_dvi_destroy,
+ .destroy = via_vt1632_destroy,
};
Bool
@@ -479,7 +479,7 @@ viaVT1632Init(ScrnInfoPtr pScrn, I2CBusPtr pI2CBus)
pVIAVT1632Rec->DotclockMin / 1000,
pVIAVT1632Rec->DotclockMax / 1000);
- output = xf86OutputCreate(pScrn, &via_dvi_funcs, "DVI-2");
+ output = xf86OutputCreate(pScrn, &via_vt1632_funcs, "DVI-2");
if (!output) {
free(pVIAVT1632Rec);
xf86DestroyI2CDevRec(pI2CDevice, TRUE);
diff --git a/src/via_vt1632.h b/src/via_vt1632.h
index 9f14a5e..897e48f 100644
--- a/src/via_vt1632.h
+++ b/src/via_vt1632.h
@@ -43,7 +43,7 @@ typedef struct _ViaVT1632 {
} ViaVT1632Rec, *ViaVT1632Ptr;
-const xf86OutputFuncsRec via_dvi_funcs;
+const xf86OutputFuncsRec via_vt1632_funcs;
int viaVT1632CheckModeValidity(xf86OutputPtr output, DisplayModePtr pMode);
Bool viaVT1632Init(ScrnInfoPtr pScrn, I2CBusPtr pI2CBus);
commit f0530262dc1e5aa07d8b71b0d93428a5789951fd
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Aug 19 14:44:11 2016 -0700
Changed via_vt1632_mode_valid to viaVT1632CheckModeValidity
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_vt1632.c b/src/via_vt1632.c
index 8ae9c8e..c3d301f 100644
--- a/src/via_vt1632.c
+++ b/src/via_vt1632.c
@@ -180,28 +180,28 @@ viaVT1632RestoreRegisters(ScrnInfoPtr pScrn, I2CDevPtr pDev,
}
int
-via_vt1632_mode_valid(xf86OutputPtr output, DisplayModePtr pMode)
+viaVT1632CheckModeValidity(xf86OutputPtr output, DisplayModePtr pMode)
{
ViaVT1632Ptr Private = output->driver_private;
ScrnInfoPtr pScrn = output->scrn;
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Entered via_vt1632_mode_valid.\n"));
+ "Entered viaVT1632CheckModeValidity.\n"));
if (pMode->Clock < Private->DotclockMin) {
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Exiting via_vt1632_mode_valid.\n"));
+ "Exiting viaVT1632CheckModeValidity.\n"));
return MODE_CLOCK_LOW;
}
if (pMode->Clock > Private->DotclockMax) {
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Exiting via_vt1632_mode_valid.\n"));
+ "Exiting viaVT1632CheckModeValidity.\n"));
return MODE_CLOCK_HIGH;
}
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Exiting via_vt1632_mode_valid.\n"));
+ "Exiting viaVT1632CheckModeValidity.\n"));
return MODE_OK;
}
@@ -318,7 +318,7 @@ via_vt1632_restore(xf86OutputPtr output)
static int
via_dvi_mode_valid(xf86OutputPtr output, DisplayModePtr pMode)
{
- return via_vt1632_mode_valid(output, pMode);
+ return viaVT1632CheckModeValidity(output, pMode);
}
static Bool
diff --git a/src/via_vt1632.h b/src/via_vt1632.h
index 111aee3..9f14a5e 100644
--- a/src/via_vt1632.h
+++ b/src/via_vt1632.h
@@ -45,7 +45,7 @@ typedef struct _ViaVT1632 {
const xf86OutputFuncsRec via_dvi_funcs;
-int via_vt1632_mode_valid(xf86OutputPtr output, DisplayModePtr pMode);
+int viaVT1632CheckModeValidity(xf86OutputPtr output, DisplayModePtr pMode);
Bool viaVT1632Init(ScrnInfoPtr pScrn, I2CBusPtr pI2CBus);
#endif /* _VIA_VT1632_H_ */
More information about the Openchrome-devel
mailing list