diff options
author | Dave Airlie <airlied@redhat.com> | 2019-01-17 18:20:10 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2019-01-17 18:31:28 -0500 |
commit | f164a94c2c87752caeb1a3cbe068c440e7f7921f (patch) | |
tree | e914296ef0ce1df83e506a12bf4306d5aa468b24 /drivers/gpu/drm/drm_dp_helper.c | |
parent | b122153c7198e35fcb981ca9efd63b0df8ef3eab (diff) | |
parent | 94520db52fc0e931327bb77fe79a952a0e9dd2b0 (diff) |
Merge tag 'drm-misc-next-2019-01-16' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for 5.1:
UAPI Changes:
- New fourcc identifier for ARM Framebuffer Compression v1.3
Cross-subsystem Changes:
Core Changes:
- Reorganisation of drm_device and drm_framebuffer headers
- Cleanup of the drmP inclusion
- Fix leaks in the fb-helpers
- Allow for depth different from bpp in fb-helper fbdev emulation
- Remove drm_mode_object from drm_display_mode
Driver Changes:
- Add reflection properties to rockchip
- a bunch of fixes for virtio
- a bunch of fixes for dp_mst and drivers using it, and introduction of a
new refcounting scheme
- Convertion of bochs to atomic and generic fbdev emulation
- Allow meson to remove the firmware framebuffers
[airlied: patch rcar-du to add drm_modes.h]
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190116200428.u2n4jbk4mzza7n6e@flea
Diffstat (limited to 'drivers/gpu/drm/drm_dp_helper.c')
-rw-r--r-- | drivers/gpu/drm/drm_dp_helper.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_dp_helper.c b/drivers/gpu/drm/drm_dp_helper.c index 2d6c491a0542..f51a116543f7 100644 --- a/drivers/gpu/drm/drm_dp_helper.c +++ b/drivers/gpu/drm/drm_dp_helper.c | |||
@@ -154,6 +154,7 @@ u8 drm_dp_link_rate_to_bw_code(int link_rate) | |||
154 | default: | 154 | default: |
155 | WARN(1, "unknown DP link rate %d, using %x\n", link_rate, | 155 | WARN(1, "unknown DP link rate %d, using %x\n", link_rate, |
156 | DP_LINK_BW_1_62); | 156 | DP_LINK_BW_1_62); |
157 | /* fall through */ | ||
157 | case 162000: | 158 | case 162000: |
158 | return DP_LINK_BW_1_62; | 159 | return DP_LINK_BW_1_62; |
159 | case 270000: | 160 | case 270000: |
@@ -171,6 +172,7 @@ int drm_dp_bw_code_to_link_rate(u8 link_bw) | |||
171 | switch (link_bw) { | 172 | switch (link_bw) { |
172 | default: | 173 | default: |
173 | WARN(1, "unknown DP link BW code %x, using 162000\n", link_bw); | 174 | WARN(1, "unknown DP link BW code %x, using 162000\n", link_bw); |
175 | /* fall through */ | ||
174 | case DP_LINK_BW_1_62: | 176 | case DP_LINK_BW_1_62: |
175 | return 162000; | 177 | return 162000; |
176 | case DP_LINK_BW_2_7: | 178 | case DP_LINK_BW_2_7: |
@@ -552,6 +554,7 @@ int drm_dp_downstream_max_bpc(const u8 dpcd[DP_RECEIVER_CAP_SIZE], | |||
552 | case DP_DS_16BPC: | 554 | case DP_DS_16BPC: |
553 | return 16; | 555 | return 16; |
554 | } | 556 | } |
557 | /* fall through */ | ||
555 | default: | 558 | default: |
556 | return 0; | 559 | return 0; |
557 | } | 560 | } |