summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-09-30 14:37:27 +0200
committerTakashi Iwai <tiwai@suse.de>2015-09-30 14:37:27 +0200
commit3c95e0c5a6fa36406fe5ba9a2d85a11c1483bfd0 (patch)
tree5a983fb5bab4a576d995ddbdfd30821f4257a64c
parent02e6ef9fba3ed85e31b13cbd6bb2185412b44c9e (diff)
parent87f77eff710db012a994ee319b5627c26a7b2204 (diff)
downloadlwn-3c95e0c5a6fa36406fe5ba9a2d85a11c1483bfd0.tar.gz
lwn-3c95e0c5a6fa36406fe5ba9a2d85a11c1483bfd0.zip
Merge branch 'topic/drm-sync-audio-rate' into for-next
-rw-r--r--drivers/gpu/drm/i915/intel_audio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
index bf2642eb4ee7..ae8df0a43de6 100644
--- a/drivers/gpu/drm/i915/intel_audio.c
+++ b/drivers/gpu/drm/i915/intel_audio.c
@@ -144,7 +144,7 @@ static uint32_t audio_config_setup_n_reg(int n, uint32_t val)
/* check whether N/CTS/M need be set manually */
static bool audio_rate_need_prog(struct intel_crtc *crtc,
- struct drm_display_mode *mode)
+ const struct drm_display_mode *mode)
{
if (((mode->clock == TMDS_297M) ||
(mode->clock == TMDS_296M)) &&