Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:19:23 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_audio.c
Log Message:
Give intel_audio.c half a chance of compiling.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_audio.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/intel_audio.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_audio.c:1.2 src/sys/external/bsd/drm2/dist/drm/i915/intel_audio.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_audio.c:1.2 Mon Aug 27 04:58:24 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_audio.c Mon Aug 27 07:19:23 2018
@@ -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 @@ static bool intel_eld_uptodate(struct dr
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 @@ static void hsw_audio_codec_disable(stru
{
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 @@ static void hsw_audio_codec_enable(struc
{
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 @@ static void ilk_audio_codec_disable(stru
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 @@ static void ilk_audio_codec_enable(struc
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 @@ static int i915_audio_component_sync_aud
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;
