Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:46:20 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915/display: intel_hdmi.c
Log Message:
ifdef out sysfs, unused static function
Author: Maya Rashish <m...@netbsd.org>
Committer: Taylor R Campbell <riastr...@netbsd.org>
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/i915/display/intel_hdmi.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/i915/display/intel_hdmi.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/display/intel_hdmi.c:1.4 src/sys/external/bsd/drm2/dist/drm/i915/display/intel_hdmi.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/i915/display/intel_hdmi.c:1.4 Sun Dec 19 11:45:50 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/display/intel_hdmi.c Sun Dec 19 11:46:19 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_hdmi.c,v 1.4 2021/12/19 11:45:50 riastradh Exp $ */
+/* $NetBSD: intel_hdmi.c,v 1.5 2021/12/19 11:46:19 riastradh Exp $ */
/*
* Copyright 2006 Dave Airlie <airl...@linux.ie>
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_hdmi.c,v 1.4 2021/12/19 11:45:50 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_hdmi.c,v 1.5 2021/12/19 11:46:19 riastradh Exp $");
#include <linux/delay.h>
#include <linux/hdmi.h>
@@ -2775,6 +2775,7 @@ static void chv_hdmi_pre_enable(struct i
chv_phy_release_cl2_override(encoder);
}
+#ifndef __NetBSD__
static struct i2c_adapter *
intel_hdmi_get_i2c_adapter(struct drm_connector *connector)
{
@@ -2783,9 +2784,11 @@ intel_hdmi_get_i2c_adapter(struct drm_co
return intel_gmbus_get_adapter(dev_priv, intel_hdmi->ddc_bus);
}
+#endif
static void intel_hdmi_create_i2c_symlink(struct drm_connector *connector)
{
+#ifndef __NetBSD__ /* XXX i915 hdmi sysfs */
struct i2c_adapter *adapter = intel_hdmi_get_i2c_adapter(connector);
struct kobject *i2c_kobj = &adapter->dev.kobj;
struct kobject *connector_kobj = &connector->kdev->kobj;
@@ -2794,15 +2797,18 @@ static void intel_hdmi_create_i2c_symlin
ret = sysfs_create_link(connector_kobj, i2c_kobj, i2c_kobj->name);
if (ret)
DRM_ERROR("Failed to create i2c symlink (%d)\n", ret);
+#endif
}
static void intel_hdmi_remove_i2c_symlink(struct drm_connector *connector)
{
+#ifndef __NetBSD__ /* XXX i915 hdmi sysfs */
struct i2c_adapter *adapter = intel_hdmi_get_i2c_adapter(connector);
struct kobject *i2c_kobj = &adapter->dev.kobj;
struct kobject *connector_kobj = &connector->kdev->kobj;
sysfs_remove_link(connector_kobj, i2c_kobj->name);
+#endif
}
static int
