[openchrome-devel] drm-openchrome: Branch 'drm-next-5.20' - 4 commits - drivers/gpu/drm
Kevin Brace
kevinbrace at kemper.freedesktop.org
Sat Jul 9 23:53:19 UTC 2022
drivers/gpu/drm/via/via_drv.h | 6 +++---
drivers/gpu/drm/via/via_pll.c | 26 +++++++++-----------------
drivers/gpu/drm/via/via_tmds.c | 20 ++++++++++----------
3 files changed, 22 insertions(+), 30 deletions(-)
New commits:
commit ca101da115af15893226ff020f3477586423c7b3
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date: Sat Jul 9 17:26:08 2022 -0500
drm/via: Version bumped to 3.5.5
Put in a small fix for DVI on AGP based UniChrome (Pro) graphics.
Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
index 9e66395c4746..1746ed436014 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
@@ -50,10 +50,10 @@
#define DRIVER_MAJOR 3
#define DRIVER_MINOR 5
-#define DRIVER_PATCHLEVEL 4
+#define DRIVER_PATCHLEVEL 5
#define DRIVER_NAME "via"
#define DRIVER_DESC "OpenChrome DRM for VIA Technologies Chrome"
-#define DRIVER_DATE "20220705"
+#define DRIVER_DATE "20220709"
#define DRIVER_AUTHOR "OpenChrome Project"
commit 573b8b7bc307cc13da169b21197573de002c3133
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date: Sat Jul 9 17:22:13 2022 -0500
drm/via: Update driver description
Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
index 5b4a1b0b8234..9e66395c4746 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
@@ -52,7 +52,7 @@
#define DRIVER_MINOR 5
#define DRIVER_PATCHLEVEL 4
#define DRIVER_NAME "via"
-#define DRIVER_DESC "OpenChrome DRM for VIA Technologies Chrome IGP"
+#define DRIVER_DESC "OpenChrome DRM for VIA Technologies Chrome"
#define DRIVER_DATE "20220705"
#define DRIVER_AUTHOR "OpenChrome Project"
commit 22adc5021d988b580c43f8010a42d7ff5fa4a2a9
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date: Sat Jul 9 16:37:14 2022 -0500
drm/via: Fix for DVI on AGP based UniChrome (Pro) graphics
Even with the use of strapping resistors, it is quite challenging to
automatically detect an external flat panel, TV encoder, or DVI
transmitter properly. It turns out that there are complicated rules
to figure out if DVP0 is configured for DVI transmitter use. The
configuration is not well documented even inside VIA Technologies
official documentation. The code was tested on Wyse V10LE thin
client. This model does not support ACPI S3 State (Suspend to RAM),
so it is not clear if the screen will recover properly when coming out
of standby.
Reported-by: Eric Kudzin <knoppix1337 at yahoo.com>
Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_tmds.c b/drivers/gpu/drm/via/via_tmds.c
index 41c3aca226bb..71dad264a46b 100644
--- a/drivers/gpu/drm/via/via_tmds.c
+++ b/drivers/gpu/drm/via/via_tmds.c
@@ -653,18 +653,18 @@ void via_ext_dvi_probe(struct drm_device *dev)
case PCI_DEVICE_ID_VIA_K8M800_GFX:
case PCI_DEVICE_ID_VIA_P4M800_PRO_GFX:
case PCI_DEVICE_ID_VIA_PM800_GFX:
- /* 3C5.12[6] - DVP0D6 pin strapping
- * 0: Disable DVP0 (Digital Video Port 0) for
- * DVI or TV out use
- * 1: Enable DVP0 (Digital Video Port 0) for
- * DVI or TV out use
- * 3C5.12[5] - DVP0D5 pin strapping
- * 0: TMDS transmitter (DVI)
- * 1: TV encoder */
- if ((sr12 & BIT(6)) && (!(sr12 & BIT(5)))) {
+ /*
+ * For DVP0 to be configured to not be used for
+ * a TV encoder, DVP0D[6] (SR12[6]) needs to be
+ * strapped low (0). In addition, DVP0D[5]
+ * (SR12[5]) also needs to be strapped low (0)
+ * for DVP0 to be configured for DVI
+ * transmitter use.
+ */
+ if (!(sr12 & BIT(6)) && (!(sr12 & BIT(5)))) {
dev_priv->ext_tmds_di_port = VIA_DI_PORT_DVP0;
} else {
- dev_priv->ext_tmds_di_port = VIA_DI_PORT_DVP1;
+ dev_priv->ext_tmds_di_port = VIA_DI_PORT_NONE;
}
break;
commit 983fbb5cd9155ab50aaac252ca4e25bc454004a4
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date: Fri Jul 8 18:51:10 2022 -0500
drm/via: Revert via_pll.c back to GPL
Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_pll.c b/drivers/gpu/drm/via/via_pll.c
index 3adf54e1c7bd..4ebaa5ce1b70 100644
--- a/drivers/gpu/drm/via/via_pll.c
+++ b/drivers/gpu/drm/via/via_pll.c
@@ -3,24 +3,16 @@
* Copyright 1998-2009 VIA Technologies, Inc. All Rights Reserved.
* Copyright 2001-2009 S3 Graphics, Inc. All Rights Reserved.
*
- * 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, sub license,
- * 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:
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation;
+ * either version 2, or (at your option) any later version.
*
- * 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 NON-INFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHOR(S) OR COPYRIGHT HOLDER(S) 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
*
* Author(s):
* James Simmons <jsimmons at infradead.org>
More information about the openchrome-devel
mailing list