]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
drm/i915: Avoid spurious WARNs about the wrong pipe in the PPS code
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Wed, 8 Feb 2017 17:52:54 +0000 (19:52 +0200)
committerJani Nikula <jani.nikula@intel.com>
Thu, 16 Feb 2017 09:59:13 +0000 (11:59 +0200)
commitaa9323dd49b23932a09023012f050556de64f118
tree004ab4480f77f0fc466567885f2e7ab0e3959bd2
parent44a027058b24541cc7ec499e6fb91db4b130648a
drm/i915: Avoid spurious WARNs about the wrong pipe in the PPS code

Until recently vlv_steal_power_sequencer() wasn't being called for
normal DP ports, and hence it could assert that it should only be
called for pipe A and B (since pipe C doesn't support eDP). However
that changed when we started to consider normal DP ports as well when
choosing a PPS. So we will now get spurious warnings when
vlv_steal_power_sequencer() does get called for pipe C. Avoid this by
moving the WARN down into vlv_detach_power_sequencer() where this
assertion should still hold.

Cc: Imre Deak <imre.deak@intel.com>
Cc: stable@vger.kernel.org
Fixes: 9f2bdb006a7e ("drm/i915: Prevent PPS stealing from a normal DP port on VLV/CHV")
References: https://bugs.freedesktop.org/show_bug.cgi?id=95287
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170208175254.10958-1-ville.syrjala@linux.intel.com
Reviewed-by: Imre Deak <imre.deak@intel.com>
(cherry picked from commit d158694f452252d0fef335a775aeb3eb74fe7af0)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/intel_dp.c