Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:45:50 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915/display: intel_hdcp.c
intel_hdmi.c
Log Message:
i915: tweak hdmi
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/i915/display/intel_hdcp.c \
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_hdcp.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/display/intel_hdcp.c:1.3 src/sys/external/bsd/drm2/dist/drm/i915/display/intel_hdcp.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/i915/display/intel_hdcp.c:1.3 Sun Dec 19 11:38:26 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/display/intel_hdcp.c Sun Dec 19 11:45:50 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_hdcp.c,v 1.3 2021/12/19 11:38:26 riastradh Exp $ */
+/* $NetBSD: intel_hdcp.c,v 1.4 2021/12/19 11:45:50 riastradh Exp $ */
/* SPDX-License-Identifier: MIT */
/*
@@ -11,7 +11,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_hdcp.c,v 1.3 2021/12/19 11:38:26 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_hdcp.c,v 1.4 2021/12/19 11:45:50 riastradh Exp $");
#include <linux/component.h>
#include <linux/i2c.h>
@@ -1772,6 +1772,8 @@ static void intel_hdcp_check_work(struct
DRM_HDCP_CHECK_PERIOD_MS);
}
+#ifndef __NetBSD__ /* XXX i915 hdmi audio */
+
static int i915_hdcp_component_bind(struct device *i915_kdev,
struct device *mei_kdev, void *data)
{
@@ -1802,6 +1804,8 @@ static const struct component_ops i915_h
.unbind = i915_hdcp_component_unbind,
};
+#endif
+
static inline
enum mei_fw_ddi intel_get_mei_fw_ddi_index(enum port port)
{
@@ -1890,8 +1894,12 @@ void intel_hdcp_component_init(struct dr
dev_priv->hdcp_comp_added = true;
mutex_unlock(&dev_priv->hdcp_comp_mutex);
+#ifdef __NetBSD__ /* XXX i915 hdmi audio */
+ ret = 0;
+#else
ret = component_add_typed(dev_priv->drm.dev, &i915_hdcp_component_ops,
I915_COMPONENT_HDCP);
+#endif
if (ret < 0) {
DRM_DEBUG_KMS("Failed at component add(%d)\n", ret);
mutex_lock(&dev_priv->hdcp_comp_mutex);
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.3 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.3 Sun Dec 19 11:45:01 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/display/intel_hdmi.c Sun Dec 19 11:45:50 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_hdmi.c,v 1.3 2021/12/19 11:45:01 riastradh Exp $ */
+/* $NetBSD: intel_hdmi.c,v 1.4 2021/12/19 11:45:50 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.3 2021/12/19 11:45:01 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_hdmi.c,v 1.4 2021/12/19 11:45:50 riastradh Exp $");
#include <linux/delay.h>
#include <linux/hdmi.h>
@@ -2382,7 +2382,8 @@ static bool intel_hdmi_limited_color_ran
const struct drm_connector_state *conn_state)
{
const struct intel_digital_connector_state *intel_conn_state =
- to_intel_digital_connector_state(conn_state);
+ const_container_of(conn_state,
+ struct intel_digital_connector_state, base);
const struct drm_display_mode *adjusted_mode =
&crtc_state->hw.adjusted_mode;
