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/msm/edp/edp_bridge.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/msm/edp/edp_bridge.c')
-rw-r--r-- | drivers/gpu/drm/msm/edp/edp_bridge.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/gpu/drm/msm/edp/edp_bridge.c b/drivers/gpu/drm/msm/edp/edp_bridge.c index 86366ba03e60..11166bf232ff 100644 --- a/drivers/gpu/drm/msm/edp/edp_bridge.c +++ b/drivers/gpu/drm/msm/edp/edp_bridge.c | |||
@@ -60,14 +60,7 @@ static void edp_bridge_mode_set(struct drm_bridge *bridge, | |||
60 | struct edp_bridge *edp_bridge = to_edp_bridge(bridge); | 60 | struct edp_bridge *edp_bridge = to_edp_bridge(bridge); |
61 | struct msm_edp *edp = edp_bridge->edp; | 61 | struct msm_edp *edp = edp_bridge->edp; |
62 | 62 | ||
63 | DBG("set mode: %d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x", | 63 | DBG("set mode: " DRM_MODE_FMT, DRM_MODE_ARG(mode)); |
64 | mode->base.id, mode->name, | ||
65 | mode->vrefresh, mode->clock, | ||
66 | mode->hdisplay, mode->hsync_start, | ||
67 | mode->hsync_end, mode->htotal, | ||
68 | mode->vdisplay, mode->vsync_start, | ||
69 | mode->vsync_end, mode->vtotal, | ||
70 | mode->type, mode->flags); | ||
71 | 64 | ||
72 | list_for_each_entry(connector, &dev->mode_config.connector_list, head) { | 65 | list_for_each_entry(connector, &dev->mode_config.connector_list, head) { |
73 | if ((connector->encoder != NULL) && | 66 | if ((connector->encoder != NULL) && |