diff options
| -rw-r--r-- | drivers/gpu/drm/drm_dp_mst_topology.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index fc93a71c42b0..a63a4d32962a 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c | |||
| @@ -2731,7 +2731,8 @@ bool drm_dp_mst_allocate_vcpi(struct drm_dp_mst_topology_mgr *mgr, | |||
| 2731 | return false; | 2731 | return false; |
| 2732 | 2732 | ||
| 2733 | if (port->vcpi.vcpi > 0) { | 2733 | if (port->vcpi.vcpi > 0) { |
| 2734 | DRM_DEBUG_KMS("payload: vcpi %d already allocated for pbn %d - requested pbn %d\n", port->vcpi.vcpi, port->vcpi.pbn, pbn); | 2734 | DRM_DEBUG_KMS("payload: vcpi %d already allocated for pbn %d - requested pbn %d\n", |
| 2735 | port->vcpi.vcpi, port->vcpi.pbn, pbn); | ||
| 2735 | if (pbn == port->vcpi.pbn) { | 2736 | if (pbn == port->vcpi.pbn) { |
| 2736 | drm_dp_put_port(port); | 2737 | drm_dp_put_port(port); |
| 2737 | return true; | 2738 | return true; |
| @@ -2741,11 +2742,11 @@ bool drm_dp_mst_allocate_vcpi(struct drm_dp_mst_topology_mgr *mgr, | |||
| 2741 | ret = drm_dp_init_vcpi(mgr, &port->vcpi, pbn, slots); | 2742 | ret = drm_dp_init_vcpi(mgr, &port->vcpi, pbn, slots); |
| 2742 | if (ret) { | 2743 | if (ret) { |
| 2743 | DRM_DEBUG_KMS("failed to init vcpi slots=%d max=63 ret=%d\n", | 2744 | DRM_DEBUG_KMS("failed to init vcpi slots=%d max=63 ret=%d\n", |
| 2744 | DIV_ROUND_UP(pbn, mgr->pbn_div), ret); | 2745 | DIV_ROUND_UP(pbn, mgr->pbn_div), ret); |
| 2745 | goto out; | 2746 | goto out; |
| 2746 | } | 2747 | } |
| 2747 | DRM_DEBUG_KMS("initing vcpi for pbn=%d slots=%d\n", | 2748 | DRM_DEBUG_KMS("initing vcpi for pbn=%d slots=%d\n", |
| 2748 | pbn, port->vcpi.num_slots); | 2749 | pbn, port->vcpi.num_slots); |
| 2749 | 2750 | ||
| 2750 | drm_dp_put_port(port); | 2751 | drm_dp_put_port(port); |
| 2751 | return true; | 2752 | return true; |
