diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-01-13 10:14:34 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-01-13 10:14:34 +0300 |
| commit | 688486a49cf500a193dfe15be9eb5aa468887769 (patch) | |
| tree | 54feeb089809f0cfbdbb72e3b9e368bebef6de8b /drivers/gpu/drm/drm_dp_aux_dev.c | |
| parent | d5d88cd6ee6b668520c461b960077b5dbd440bc2 (diff) | |
| parent | 485b747ea6ecf491bf07c69a4ea36c0ccf3c8435 (diff) | |
| download | linux-688486a49cf500a193dfe15be9eb5aa468887769.tar.xz | |
Merge tag 'amd-drm-next-5.6-2020-01-10-dp-mst-dsc' of git://people.freedesktop.org/~agd5f/linux into drm-next
amd-drm-next-5.6-2020-01-10-dp-mst-dsc:
drm:
- Add MST helper for PBN calculation of DSC modes
- Parse FEC caps on MST ports
- Add MST DPCD R/W functions
- Add MST helpers for virtual DPCD aux
- Add MST HUB quirk
- Add MST DSC enablement helpers
amdgpu:
- Enable MST DSC
- Add fair share algo for DSC bandwidth calcs
- Fix for 32 bit builds
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200110214328.308549-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/drm_dp_aux_dev.c')
| -rw-r--r-- | drivers/gpu/drm/drm_dp_aux_dev.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/gpu/drm/drm_dp_aux_dev.c b/drivers/gpu/drm/drm_dp_aux_dev.c index 0cfb386754c3..2510717d5a08 100644 --- a/drivers/gpu/drm/drm_dp_aux_dev.c +++ b/drivers/gpu/drm/drm_dp_aux_dev.c @@ -163,11 +163,7 @@ static ssize_t auxdev_read_iter(struct kiocb *iocb, struct iov_iter *to) break; } - if (aux_dev->aux->is_remote) - res = drm_dp_mst_dpcd_read(aux_dev->aux, pos, buf, - todo); - else - res = drm_dp_dpcd_read(aux_dev->aux, pos, buf, todo); + res = drm_dp_dpcd_read(aux_dev->aux, pos, buf, todo); if (res <= 0) break; @@ -215,11 +211,7 @@ static ssize_t auxdev_write_iter(struct kiocb *iocb, struct iov_iter *from) break; } - if (aux_dev->aux->is_remote) - res = drm_dp_mst_dpcd_write(aux_dev->aux, pos, buf, - todo); - else - res = drm_dp_dpcd_write(aux_dev->aux, pos, buf, todo); + res = drm_dp_dpcd_write(aux_dev->aux, pos, buf, todo); if (res <= 0) break; |