diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-03-26 22:47:18 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-03-26 22:47:18 -0700 |
| commit | 10ea8a72f6da3c61de49cde522420843b04be943 (patch) | |
| tree | 48ed70289b529978ece8e6072b0372d9a6e63b31 | |
| parent | 83fc1fe4359fc125e68031db6e80da5c0f08070b (diff) | |
| parent | 38e93647f7801c887076b0ad88662572615c97b1 (diff) | |
Merge "drm/msm: read V' only for non-zero device count repeater"
| -rw-r--r-- | drivers/gpu/drm/msm/sde_hdcp_1x.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/msm/sde_hdcp_1x.c b/drivers/gpu/drm/msm/sde_hdcp_1x.c index ddbe54f6280f..49ce37393e81 100644 --- a/drivers/gpu/drm/msm/sde_hdcp_1x.c +++ b/drivers/gpu/drm/msm/sde_hdcp_1x.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved. +/* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -1310,10 +1310,6 @@ static int sde_hdcp_1x_authentication_part2(struct sde_hdcp_1x *hdcp) } do { - rc = sde_hdcp_1x_transfer_v_h(hdcp); - if (rc) - goto error; - /* * Do not proceed further if no device connected * If no downstream devices are attached to the repeater @@ -1325,6 +1321,10 @@ static int sde_hdcp_1x_authentication_part2(struct sde_hdcp_1x *hdcp) goto error; } + rc = sde_hdcp_1x_transfer_v_h(hdcp); + if (rc) + goto error; + rc = sde_hdcp_1x_write_ksv_fifo(hdcp); } while (--v_retry && rc); error: |