diff options
| author |   Dave Airlie <airlied@redhat.com> | 2020-05-01 10:41:59 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-05-01 10:42:09 +1000 |
| commit | c62098c991a835903a31b5e135fe4f08b86bd603 (patch) | |
| tree | 3b51a40309a0e192c755f0932d82216df132aacf /drivers/gpu/drm/drm_dp_mst_topology.c | |
| parent | Linux 5.7-rc3 (diff) | |
| parent | dma-buf: fix documentation build warnings (diff) | |
| download | linux-dev-c62098c991a835903a31b5e135fe4f08b86bd603.tar.xz linux-dev-c62098c991a835903a31b5e135fe4f08b86bd603.zip | |
Merge tag 'drm-misc-fixes-2020-04-30' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
A few resources-related fixes for qxl, some doc build warnings and ioctl
fixes for dma-buf, an off-by-one fix in edid, and a return code fix in
DP-MST
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20200430153201.wx6of2b2gsoip7bk@gilmour.lan
Diffstat (limited to 'drivers/gpu/drm/drm_dp_mst_topology.c')
| -rw-r--r-- | drivers/gpu/drm/drm_dp_mst_topology.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 283615e44838..9d89ebf3a749 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -3442,8 +3442,12 @@ static int drm_dp_send_dpcd_write(struct drm_dp_mst_topology_mgr *mgr, drm_dp_queue_down_tx(mgr, txmsg); ret = drm_dp_mst_wait_tx_reply(mstb, txmsg); - if (ret > 0 && txmsg->reply.reply_type == DP_SIDEBAND_REPLY_NAK) - ret = -EIO; + if (ret > 0) { + if (txmsg->reply.reply_type == DP_SIDEBAND_REPLY_NAK) + ret = -EIO; + else + ret = size; + } kfree(txmsg); fail_put: |