[Openchrome-devel] xf86-video-openchrome: 3 commits - configure.ac src/via_display.c src/via_lvds.c
Kevin Brace
kevinbrace at kemper.freedesktop.org
Fri Nov 18 03:35:13 UTC 2016
configure.ac | 2 -
src/via_display.c | 73 ------------------------------------------------------
src/via_lvds.c | 4 +-
3 files changed, 3 insertions(+), 76 deletions(-)
New commits:
commit 62de0cfac2cd5db74ea0a6ab61066d48af95b027
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Thu Nov 17 19:16:31 2016 -0800
Version bumped to 0.5.172
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/configure.ac b/configure.ac
index b5c0612..aac0e28 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ(2.57)
AC_INIT([xf86-video-openchrome],
- [0.5.171],
+ [0.5.172],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
[xf86-video-openchrome])
commit 2a7918b1f8c97b17cec91bf357a8dd5a8ce1812a
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Thu Nov 17 19:14:25 2016 -0800
Minor adjustments made to log messages
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_lvds.c b/src/via_lvds.c
index 1e054b2..18dbf3e 100644
--- a/src/via_lvds.c
+++ b/src/via_lvds.c
@@ -322,7 +322,7 @@ viaLVDS2SetDithering(ScrnInfoPtr pScrn, CARD8 ditheringStatus)
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"LVDS2 Output Color Dithering: %s\n",
- ditheringStatus ? "On (18-bit)" : "Off (24-bit)");
+ ditheringStatus ? "On (18 bit)" : "Off (24 bit)");
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Exiting viaLVDS2SetDithering.\n"));
@@ -775,7 +775,7 @@ viaLVDSGetFPInfoFromScratchPad(xf86OutputPtr output)
panel->useDualEdge ? "On" : "Off");
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Flat Panel Output Color Dithering: %s\n",
- panel->useDithering ? "On (18-bit)" : "Off (24-bit)");
+ panel->useDithering ? "On (18 bit)" : "Off (24 bit)");
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Exiting viaLVDSGetFPInfoFromScratchPad.\n"));
commit 9c5c436d1ee9f156859f35d7a5d1c604a9b5ad9c
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Thu Nov 17 19:09:21 2016 -0800
Removing debug messages related to hardware cursor
Putting debug messages inside functions that handle hardware cursor
clutters up Xorg.n.log. (i.e., Xorg.0.log)
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_display.c b/src/via_display.c
index 2bfe2a7..c25c408 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -271,9 +271,6 @@ viaIGA1InitHI(ScrnInfoPtr pScrn)
{
VIAPtr pVia = VIAPTR(pScrn);
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Entered viaIGA1InitHI.\n"));
-
switch(pVia->Chipset) {
case VIA_PM800:
case VIA_CX700:
@@ -299,9 +296,6 @@ viaIGA1InitHI(ScrnInfoPtr pScrn)
VIASETREG(HI_CONTROL, 0x76000004);
break;
}
-
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Exiting viaIGA1InitHI.\n"));
}
static void
@@ -312,9 +306,6 @@ viaIGA1SetHIStartingAddress(xf86CrtcPtr crtc)
ScrnInfoPtr pScrn = crtc->scrn;
VIAPtr pVia = VIAPTR(pScrn);
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Entered viaIGA1SetHIStartingAddress.\n"));
-
switch(pVia->Chipset) {
case VIA_PM800:
case VIA_CX700:
@@ -330,9 +321,6 @@ viaIGA1SetHIStartingAddress(xf86CrtcPtr crtc)
VIASETREG(HI_FBOFFSET, iga->cursor_bo->offset);
break;
}
-
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Exiting viaIGA1SetHIStartingAddress.\n"));
}
/*
@@ -344,9 +332,6 @@ viaIGA1DisplayHI(ScrnInfoPtr pScrn, Bool HI_Status)
VIAPtr pVia = VIAPTR(pScrn);
CARD32 temp;
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Entered viaIGA1DisplayHI.\n"));
-
switch(pVia->Chipset) {
case VIA_PM800:
case VIA_CX700:
@@ -371,9 +356,6 @@ viaIGA1DisplayHI(ScrnInfoPtr pScrn, Bool HI_Status)
VIASETREG(HI_CONTROL, temp);
break;
}
-
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Exiting viaIGA1DisplayHI.\n"));
}
static void
@@ -571,9 +553,6 @@ viaIGA2InitHI(ScrnInfoPtr pScrn)
{
VIAPtr pVia = VIAPTR(pScrn);
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Entered viaIGA2InitHI.\n"));
-
switch(pVia->Chipset) {
case VIA_PM800:
case VIA_CX700:
@@ -596,9 +575,6 @@ viaIGA2InitHI(ScrnInfoPtr pScrn)
VIASETREG(HI_CONTROL, 0xF6000004);
break;
}
-
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Exiting viaIGA2InitHI.\n"));
}
static void
@@ -608,13 +584,7 @@ viaIGA2SetHIStartingAddress(xf86CrtcPtr crtc)
ScrnInfoPtr pScrn = crtc->scrn;
VIAPtr pVia = VIAPTR(pScrn);
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Entered viaIGA2SetHIStartingAddress.\n"));
-
VIASETREG(HI_FBOFFSET, iga->cursor_bo->offset);
-
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Exiting viaIGA2SetHIStartingAddress.\n"));
}
/*
@@ -626,9 +596,6 @@ viaIGA2DisplayHI(ScrnInfoPtr pScrn, Bool HI_Status)
VIAPtr pVia = VIAPTR(pScrn);
CARD32 temp;
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Entered viaIGA2DisplayHI.\n"));
-
switch(pVia->Chipset) {
case VIA_PM800:
case VIA_CX700:
@@ -653,9 +620,6 @@ viaIGA2DisplayHI(ScrnInfoPtr pScrn, Bool HI_Status)
VIASETREG(HI_CONTROL, temp);
break;
}
-
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Exiting viaIGA2DisplayHI.\n"));
}
static void
@@ -4059,13 +4023,7 @@ iga1_crtc_show_cursor(xf86CrtcPtr crtc)
{
ScrnInfoPtr pScrn = crtc->scrn;
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Entered iga1_crtc_show_cursor.\n"));
-
viaIGA1DisplayHI(pScrn, TRUE);
-
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Exiting iga1_crtc_show_cursor.\n"));
}
static void
@@ -4073,13 +4031,7 @@ iga1_crtc_hide_cursor(xf86CrtcPtr crtc)
{
ScrnInfoPtr pScrn = crtc->scrn;
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Entered iga1_crtc_hide_cursor.\n"));
-
viaIGA1DisplayHI(pScrn, FALSE);
-
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Exiting iga1_crtc_hide_cursor.\n"));
}
static void
@@ -4089,9 +4041,6 @@ iga1_crtc_load_cursor_argb(xf86CrtcPtr crtc, CARD32 *image)
ScrnInfoPtr pScrn = crtc->scrn;
void *dst;
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Entered iga1_crtc_load_cursor_argb.\n"));
-
dst = drm_bo_map(pScrn, iga->cursor_bo);
memset(dst, 0x00, iga->cursor_bo->size);
memcpy(dst, image, iga->cursor_bo->size);
@@ -4099,9 +4048,6 @@ iga1_crtc_load_cursor_argb(xf86CrtcPtr crtc, CARD32 *image)
viaIGA1InitHI(pScrn);
viaIGA1SetHIStartingAddress(crtc);
-
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Exiting iga1_crtc_load_cursor_argb.\n"));
}
static void
@@ -4480,14 +4426,7 @@ iga2_crtc_show_cursor(xf86CrtcPtr crtc)
{
ScrnInfoPtr pScrn = crtc->scrn;
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Entered iga2_crtc_show_cursor.\n"));
-
viaIGA2DisplayHI(pScrn, TRUE);
-
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Exiting iga2_crtc_show_cursor.\n"));
-
}
static void
@@ -4495,13 +4434,7 @@ iga2_crtc_hide_cursor(xf86CrtcPtr crtc)
{
ScrnInfoPtr pScrn = crtc->scrn;
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Entered iga2_crtc_hide_cursor.\n"));
-
viaIGA2DisplayHI(pScrn, FALSE);
-
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Exiting iga2_crtc_hide_cursor.\n"));
}
static void
@@ -4511,9 +4444,6 @@ iga2_crtc_load_cursor_argb(xf86CrtcPtr crtc, CARD32 *image)
ScrnInfoPtr pScrn = crtc->scrn;
void *dst;
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Entered iga2_crtc_load_cursor_argb.\n"));
-
dst = drm_bo_map(pScrn, iga->cursor_bo);
memset(dst, 0x00, iga->cursor_bo->size);
memcpy(dst, image, iga->cursor_bo->size);
@@ -4521,9 +4451,6 @@ iga2_crtc_load_cursor_argb(xf86CrtcPtr crtc, CARD32 *image)
viaIGA2InitHI(pScrn);
viaIGA2SetHIStartingAddress(crtc);
-
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Exiting iga2_crtc_load_cursor_argb.\n"));
}
const xf86CrtcFuncsRec iga2_crtc_funcs = {
More information about the Openchrome-devel
mailing list