]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
drm/i915: Unbreak check_digital_port_conflicts()
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Thu, 10 Dec 2015 16:22:31 +0000 (18:22 +0200)
committerJani Nikula <jani.nikula@intel.com>
Tue, 22 Dec 2015 12:28:16 +0000 (14:28 +0200)
commit0bff4858653312a10c83709e0009c3adb87e6f1e
treef9bc2c4393dc76d86c108d181b7069d178274f4c
parent152b22627c67c6e5f29ad6ec939ac7e6f52e6c7d
drm/i915: Unbreak check_digital_port_conflicts()

Atomic changes broke check_digital_port_conflicts(). It needs to look
at the global situation instead of just trying to find a conflict
within the current atomic state.

This bug made my HSW explode spectacularly after I had split the DDI
encoders into separate DP and HDMI encoders. With the fix, things
seem much more solid.

I hope holding the connection_mutex is enough protection that we can
actually walk the connectors even if they're not part of the current
atomic state...

v2: Regenerate the patch so that it actually applies (Jani)

Cc: stable@vger.kernel.org
Cc: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Fixes: 5448a00d3f06 ("drm/i915: Don't use staged config in check_digital_port_conflicts()")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1449764551-12466-1-git-send-email-ville.syrjala@linux.intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/intel_display.c