Module Name: src
Committed By: riastradh
Date: Sun Dec 19 00:59:42 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_edid.c
Log Message:
Ifdef out vga switcheroo stuff.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/drm2/dist/drm/drm_edid.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/drm_edid.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_edid.c:1.10 src/sys/external/bsd/drm2/dist/drm/drm_edid.c:1.11
--- src/sys/external/bsd/drm2/dist/drm/drm_edid.c:1.10 Sun Dec 19 00:56:49 2021
+++ src/sys/external/bsd/drm2/dist/drm/drm_edid.c Sun Dec 19 00:59:42 2021
@@ -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 @@ EXPORT_SYMBOL(drm_get_edid);
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;
}
