OSDN Git Service

drm/i915: Rewrite IVB FDI bifurcation conflict checks
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Wed, 11 Mar 2015 16:52:31 +0000 (18:52 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 17 Mar 2015 21:30:28 +0000 (22:30 +0100)
commitd272ddfa30b088870a925decba3c4a7f1a45badc
treec43f6f855b1e1b21e88eea97615f05d7f4d3924b
parent251cc67c7a28c216c9d4377ff5bf435c4248679e
drm/i915: Rewrite IVB FDI bifurcation conflict checks

Ignore the current state of the pipe and just check crtc_state->enable
and the number of FDI lanes required. This means we don't accidentally
mistake the FDI lanes as being available of one of the pipes just
happens to be disabled at the time of the check. Also we no longer
consider pipe C to require FDI lanes when it's driving the eDP
transcoder.

We also take the opportunity to make the code a bit nicer looking by
hiding the ugly bits in the new pipe_required_fdi_lanes() function.

Cc: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_display.c