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/i915 Give intel_audio.c half ...
details: https://anonhg.NetBSD.org/src/rev/4d3f5616490b
branches: trunk
changeset: 992633:4d3f5616490b
user: riastradh <riastradh%NetBSD.org@localhost>
date: Mon Aug 27 07:19:23 2018 +0000
description:
Give intel_audio.c half a chance of compiling.
diffstat:
sys/external/bsd/drm2/dist/drm/i915/intel_audio.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diffs (72 lines):
diff -r 24f94bf99304 -r 4d3f5616490b sys/external/bsd/drm2/dist/drm/i915/intel_audio.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_audio.c Mon Aug 27 07:19:13 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_audio.c Mon Aug 27 07:19:23 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_audio.c,v 1.2 2018/08/27 04:58:24 riastradh Exp $ */
+/* $NetBSD: intel_audio.c,v 1.3 2018/08/27 07:19:23 riastradh Exp $ */
/*
* Copyright © 2014 Intel Corporation
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_audio.c,v 1.2 2018/08/27 04:58:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_audio.c,v 1.3 2018/08/27 07:19:23 riastradh Exp $");
#include <linux/kernel.h>
#include <linux/component.h>
@@ -186,7 +186,7 @@
I915_WRITE(reg_elda, tmp);
for (i = 0; i < drm_eld_size(eld) / 4; i++)
- if (I915_READ(reg_edid) != *((uint32_t *)eld + i))
+ if (I915_READ(reg_edid) != *((const uint32_t *)eld + i))
return false;
return true;
@@ -254,7 +254,7 @@
{
struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;
struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc);
- enum pipe pipe = intel_crtc->pipe;
+ enum i915_pipe pipe = intel_crtc->pipe;
uint32_t tmp;
DRM_DEBUG_KMS("Disable audio codec on pipe %c\n", pipe_name(pipe));
@@ -286,7 +286,7 @@
{
struct drm_i915_private *dev_priv = connector->dev->dev_private;
struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc);
- enum pipe pipe = intel_crtc->pipe;
+ enum i915_pipe pipe = intel_crtc->pipe;
struct i915_audio_component *acomp = dev_priv->audio_component;
const uint8_t *eld = connector->eld;
struct intel_digital_port *intel_dig_port =
@@ -367,7 +367,7 @@
struct intel_digital_port *intel_dig_port =
enc_to_dig_port(&encoder->base);
enum port port = intel_dig_port->port;
- enum pipe pipe = intel_crtc->pipe;
+ enum i915_pipe pipe = intel_crtc->pipe;
uint32_t tmp, eldv;
int aud_config;
int aud_cntrl_st2;
@@ -416,7 +416,7 @@
struct intel_digital_port *intel_dig_port =
enc_to_dig_port(&encoder->base);
enum port port = intel_dig_port->port;
- enum pipe pipe = intel_crtc->pipe;
+ enum i915_pipe pipe = intel_crtc->pipe;
uint8_t *eld = connector->eld;
uint32_t eldv;
uint32_t tmp;
@@ -643,7 +643,7 @@
struct intel_crtc *crtc;
struct drm_display_mode *mode;
struct i915_audio_component *acomp = dev_priv->audio_component;
- enum pipe pipe = -1;
+ enum i915_pipe pipe = -1;
u32 tmp;
int n;
Home |
Main Index |
Thread Index |
Old Index