From 1c4860ff182bb6ab33077c210679235d12489f38 Mon Sep 17 00:00:00 2001 From: Eugeni Dodonov Date: Wed, 9 May 2012 15:37:13 -0300 Subject: [PATCH] --- yaml --- r: 307433 b: refs/heads/master c: 6e4c1677fef47a5f538e8d031998a68aaf87275a h: refs/heads/master i: 307431: 8bf7526886f532597726a8e9e1ecf6bb5a5cb1c1 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_hdmi.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 139e4c51e713..6b4cab0f9c89 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5826eca5ac58469a704984bceaebfda5bcb383db +refs/heads/master: 6e4c1677fef47a5f538e8d031998a68aaf87275a diff --git a/trunk/drivers/gpu/drm/i915/intel_hdmi.c b/trunk/drivers/gpu/drm/i915/intel_hdmi.c index 4a9d553719f6..8da8dfe1b4fa 100644 --- a/trunk/drivers/gpu/drm/i915/intel_hdmi.c +++ b/trunk/drivers/gpu/drm/i915/intel_hdmi.c @@ -661,6 +661,10 @@ void intel_hdmi_init(struct drm_device *dev, int sdvox_reg) intel_encoder->clone_mask = (1 << INTEL_HDMIF_CLONE_BIT); intel_hdmi->ddc_bus = GMBUS_PORT_DPD; dev_priv->hotplug_supported_mask |= HDMID_HOTPLUG_INT_STATUS; + } else { + /* If we got an unknown sdvox_reg, things are pretty much broken + * in a way that we should let the kernel know about it */ + BUG(); } intel_hdmi->sdvox_reg = sdvox_reg;