[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915/display i915: tweak hdmi

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/71e2c7495b95
branches:  trunk
changeset: 1028686:71e2c7495b95
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 11:45:50 2021 +0000

description:
i915: tweak hdmi

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/display/intel_hdcp.c |  12 ++++++++++--
 sys/external/bsd/drm2/dist/drm/i915/display/intel_hdmi.c |   7 ++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diffs (77 lines):

diff -r 36096ac8d804 -r 71e2c7495b95 sys/external/bsd/drm2/dist/drm/i915/display/intel_hdcp.c
--- a/sys/external/bsd/drm2/dist/drm/i915/display/intel_hdcp.c  Sun Dec 19 11:45:41 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/display/intel_hdcp.c  Sun Dec 19 11:45:50 2021 +0000
@@ -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 @@
                                      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 @@
        .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 @@
 
        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);
diff -r 36096ac8d804 -r 71e2c7495b95 sys/external/bsd/drm2/dist/drm/i915/display/intel_hdmi.c
--- a/sys/external/bsd/drm2/dist/drm/i915/display/intel_hdmi.c  Sun Dec 19 11:45:41 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/display/intel_hdmi.c  Sun Dec 19 11:45:50 2021 +0000
@@ -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 <airlied%linux.ie@localhost>
@@ -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 @@
                                           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;