[Openchrome-devel] xf86-video-openchrome: 4 commits - configure.ac src/via_display.c src/via_kms.c src/via_ums.h
Kevin Brace
kevinbrace at kemper.freedesktop.org
Wed Apr 25 04:47:42 UTC 2018
configure.ac | 2 +-
src/via_display.c | 54 ------------------------------------------------------
src/via_kms.c | 2 --
src/via_ums.h | 31 +++++++++++++++++++++++++++++++
4 files changed, 32 insertions(+), 57 deletions(-)
New commits:
commit 3c882cf8e694c752541153a4a535f398fe7175c6
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Tue Apr 24 21:47:13 2018 -0700
Version bumped to 0.6.174
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/configure.ac b/configure.ac
index 83904ba..db5d5ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ(2.57)
AC_INIT([xf86-video-openchrome],
- [0.6.173],
+ [0.6.174],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
[xf86-video-openchrome])
commit 485c5527489c0677b917eb01be0661bb234fc6d8
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Tue Apr 24 21:45:34 2018 -0700
Make viaSetPaletteLUTAccess an inline function
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_display.c b/src/via_display.c
index a6e4542..79887fa 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -87,28 +87,6 @@ ViaPrintMode(ScrnInfoPtr pScrn, DisplayModePtr mode)
}
/*
- * Sets IGA1 or IGA2 for palette LUT access.
- * This function should be called before changing the
- * contents of the palette.
- */
-static void
-viaSetPaletteLUTAccess(ScrnInfoPtr pScrn, CARD8 displaySource)
-{
- vgaHWPtr hwp = VGAHWPTR(pScrn);
-
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Entered viaSetPaletteLUTAccess.\n"));
-
- ViaSeqMask(hwp, 0x1A, displaySource, 0x01);
- xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Palette LUT Access: IGA%d\n",
- (displaySource & 0x01) + 1);
-
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Exiting viaSetPaletteLUTAccess.\n"));
-}
-
-/*
* Sets IGA1 color depth.
*/
static void
diff --git a/src/via_ums.h b/src/via_ums.h
index 2190800..efcc5cc 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -341,6 +341,20 @@ typedef struct _VIADPAINDEXTABLE {
#define NUMBER_VIA_DPA_TABLE (sizeof(viaDPAIndexTable) / sizeof(*(viaDPAIndexTable)))
+/*
+ * Sets IGA1 or IGA2 for palette LUT access.
+ * This function should be called before changing the
+ * contents of the palette.
+ */
+static inline void
+viaSetPaletteLUTAccess(ScrnInfoPtr pScrn, CARD8 displaySource)
+{
+ ViaSeqMask(VGAHWPTR(pScrn), 0x1A,
+ displaySource, BIT(0));
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Palette LUT Access: IGA%d\n",
+ (displaySource & BIT(0)) + 1));
+}
/*
* Resets IGA1 hardware.
commit 80b72596c1350b897841fba43985f8cd245f8978
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Tue Apr 24 21:45:02 2018 -0700
Make viaIGA2SetPaletteLUTResolution an inline function
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_display.c b/src/via_display.c
index 5336963..a6e4542 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -410,30 +410,6 @@ viaIGA2SetColorDepth(ScrnInfoPtr pScrn, CARD8 bitsPerPixel)
}
/*
- * Sets IGA2 palette LUT resolution. (6-bit or 8-bit)
- */
-static void
-viaIGA2SetPaletteLUTResolution(ScrnInfoPtr pScrn, CARD8 paletteLUT)
-{
- vgaHWPtr hwp = VGAHWPTR(pScrn);
-
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Entered viaIGA2SetPaletteLUTResolution.\n"));
-
- /* Set the palette LUT resolution for IGA2. */
- /* 3X5.6A[5] - IGA2 6 / 8 Bit LUT
- * 0: 6-bit
- * 1: 8-bit */
- ViaCrtcMask(hwp, 0x6A, paletteLUT << 5, 0x20);
- xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "IGA2 Palette LUT Resolution: %s bit\n",
- (paletteLUT & 0x01) ? "8" : "6");
-
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Exiting viaIGA2SetPaletteLUTResolution.\n"));
-}
-
-/*
* Controls IGA2 gamma correction state.
*/
static void
diff --git a/src/via_ums.h b/src/via_ums.h
index 4bf6160..2190800 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -375,6 +375,23 @@ viaIGA1SetPaletteLUTResolution(ScrnInfoPtr pScrn, Bool paletteLUT)
}
/*
+ * Sets IGA2 palette LUT resolution. (6-bit or 8-bit)
+ */
+static inline void
+viaIGA2SetPaletteLUTResolution(ScrnInfoPtr pScrn, Bool paletteLUT)
+{
+ /* Set the palette LUT resolution for IGA2. */
+ /* 3X5.6A[5] - IGA2 6 / 8 Bit LUT
+ * 0: 6-bit
+ * 1: 8-bit */
+ ViaCrtcMask(VGAHWPTR(pScrn), 0x6A,
+ paletteLUT ? BIT(5) : 0x00, BIT(5));
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "IGA2 Palette LUT Resolution: %s bit\n",
+ paletteLUT ? "8" : "6"));
+}
+
+/*
* Sets IGA1 display output state.
*/
static inline void
commit 8a48b0dc30ef3994488c33ea9bcd3c25183677c5
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Tue Apr 24 21:43:46 2018 -0700
Remove deprecated xf86_reload_cursors
Started noticing compilation warnings when compiled against X.Org
X Server 1.19.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_display.c b/src/via_display.c
index 35c413b..5336963 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -3731,14 +3731,10 @@ static void
iga1_crtc_commit(xf86CrtcPtr crtc)
{
ScrnInfoPtr pScrn = crtc->scrn;
- VIAPtr pVia = VIAPTR(pScrn);
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entering iga1_crtc_commit.\n"));
- if (crtc->scrn->pScreen != NULL && pVia->drmmode.hwcursor)
- xf86_reload_cursors(crtc->scrn->pScreen);
-
/* Turn on IGA1. */
viaIGA1SetDisplayOutput(pScrn, TRUE);
@@ -4135,14 +4131,10 @@ static void
iga2_crtc_commit(xf86CrtcPtr crtc)
{
ScrnInfoPtr pScrn = crtc->scrn;
- VIAPtr pVia = VIAPTR(pScrn);
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entering iga2_crtc_commit.\n"));
- if (crtc->scrn->pScreen != NULL && pVia->drmmode.hwcursor)
- xf86_reload_cursors(crtc->scrn->pScreen);
-
/* Turn on IGA2. */
viaIGA2SetDisplayOutput(pScrn, TRUE);
diff --git a/src/via_kms.c b/src/via_kms.c
index 2bb0a86..e8e9126 100644
--- a/src/via_kms.c
+++ b/src/via_kms.c
@@ -227,8 +227,6 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
crtc->gamma_blue, crtc->gamma_size);
#endif
- if (pScrn->pScreen && drmmode->hwcursor)
- xf86_reload_cursors(pScrn->pScreen);
done:
free(output_ids);
return (ret < 0 ? FALSE : TRUE);
More information about the Openchrome-devel
mailing list