Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/external/bsd/drm2/dist/drm Ifdef out vga switcheroo stuff.
details: https://anonhg.NetBSD.org/src/rev/27b5a27d723c
branches: trunk
changeset: 1027865:27b5a27d723c
user: riastradh <riastradh%NetBSD.org@localhost>
date: Sun Dec 19 00:59:42 2021 +0000
description:
Ifdef out vga switcheroo stuff.
diffstat:
sys/external/bsd/drm2/dist/drm/drm_edid.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diffs (37 lines):
diff -r 21b163dc2ad8 -r 27b5a27d723c sys/external/bsd/drm2/dist/drm/drm_edid.c
--- a/sys/external/bsd/drm2/dist/drm/drm_edid.c Sun Dec 19 00:59:34 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/drm_edid.c Sun Dec 19 00:59:42 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_edid.c,v 1.10 2021/12/19 00:56:49 riastradh Exp $ */
+/* $NetBSD: drm_edid.c,v 1.11 2021/12/19 00:59:42 riastradh Exp $ */
/*
* Copyright (c) 2006 Luc Verhaegen (quirks list)
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_edid.c,v 1.10 2021/12/19 00:56:49 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_edid.c,v 1.11 2021/12/19 00:59:42 riastradh Exp $");
#include <linux/hdmi.h>
#include <linux/i2c.h>
@@ -2039,12 +2039,18 @@
struct edid *drm_get_edid_switcheroo(struct drm_connector *connector,
struct i2c_adapter *adapter)
{
+#ifndef __NetBSD__ /* XXX vga switcheroo */
struct pci_dev *pdev = connector->dev->pdev;
+#endif
struct edid *edid;
+#ifndef __NetBSD__ /* XXX vga switcheroo */
vga_switcheroo_lock_ddc(pdev);
+#endif
edid = drm_get_edid(connector, adapter);
+#ifndef __NetBSD__ /* XXX vga switcheroo */
vga_switcheroo_unlock_ddc(pdev);
+#endif
return edid;
}
Home |
Main Index |
Thread Index |
Old Index