2012/5/25 Chris Wilson <chris at chris-wilson.co.uk>:
> Paulo pointed out that gen4 re-used the SDVO registers for HDMI (the
> separate HDMI registers where introduced with the first PCH) and so
> g4x_hdmi_connected() never selected the right bit and always returned
> disconnected.
>
> Regression in
>
> commit 8ec22b214d76773c9d89f4040505ce10f677ed9a
> Author: Chris Wilson <chris at chris-wilson.co.uk>
> Date: ? Fri May 11 18:01:34 2012 +0100
>
> ? ?drm/i915/hdmi: Query the live connector status bit for G4x
>
> Cc: Paulo Zanoni <przanoni at gmail.com>
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni at intel.com>
Tested-by: Paulo Zanoni <paulo.r.zanoni at intel.com>
Tested on the gen4 machine that stopped working.
This patch adds a conflict with the patch series I sent yesterday
(rename sdvox_reg to hdmi_reg). Please merge this one first. I'll send
an updated version of my patch later.
> ---
> ?drivers/gpu/drm/i915/intel_hdmi.c | ? ?7 ++-----
> ?1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
> index 77f0f8f..4c6f141 100644
> --- a/drivers/gpu/drm/i915/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> @@ -459,15 +459,12 @@ static bool g4x_hdmi_connected(struct intel_hdmi *intel_hdmi)
> ? ? ? ?uint32_t bit;
>
> ? ? ? ?switch (intel_hdmi->sdvox_reg) {
> - ? ? ? case HDMIB:
> + ? ? ? case SDVOB:
> ? ? ? ? ? ? ? ?bit = HDMIB_HOTPLUG_LIVE_STATUS;
> ? ? ? ? ? ? ? ?break;
> - ? ? ? case HDMIC:
> + ? ? ? case SDVOC:
> ? ? ? ? ? ? ? ?bit = HDMIC_HOTPLUG_LIVE_STATUS;
> ? ? ? ? ? ? ? ?break;
> - ? ? ? case HDMID:
> - ? ? ? ? ? ? ? bit = HDMID_HOTPLUG_LIVE_STATUS;
> - ? ? ? ? ? ? ? break;
> ? ? ? ?default:
> ? ? ? ? ? ? ? ?bit = 0;
> ? ? ? ? ? ? ? ?break;
> --
> 1.7.10
>
--
Paulo Zanoni
