Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Minor overlapping changes in the btusb and ixgbe drivers.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 9 insertions, 1 deletions

diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index 18e4cba76720..8aa6a31e8ad0 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@ -128,7 +128,15 @@ static int intel_dp_mst_compute_config(struct intel_encoder *encoder,
         limits.max_lane_count = intel_dp_max_lane_count(intel_dp);
 
         limits.min_bpp = intel_dp_min_bpp(pipe_config);
-        limits.max_bpp = pipe_config->pipe_bpp;
+        /*
+         * FIXME: If all the streams can't fit into the link with
+         * their current pipe_bpp we should reduce pipe_bpp across
+         * the board until things start to fit. Until then we
+         * limit to <= 8bpc since that's what was hardcoded for all
+         * MST streams previously. This hack should be removed once
+         * we have the proper retry logic in place.
+         */
+        limits.max_bpp = min(pipe_config->pipe_bpp, 24);
 
         intel_dp_adjust_compliance_config(intel_dp, pipe_config, &limits);