diff options
author | Dave Airlie <airlied@redhat.com> | 2019-01-16 17:48:42 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2019-01-17 02:29:29 -0500 |
commit | b122153c7198e35fcb981ca9efd63b0df8ef3eab (patch) | |
tree | 80319b40bdafb8e2dfbdb1406a924ebbd07c2ce0 /drivers/gpu/drm/msm/edp/edp_bridge.c | |
parent | e3d093070eb0b5e3df668d3eb04100ea79343c65 (diff) | |
parent | 9a47db8e7a9dabe0b88a0071f1677722be167e68 (diff) |
Merge tag 'du-next-20190114' of git://linuxtv.org/pinchartl/media into drm-next
Renesas display drivers changes for v5.1:
- R8A774C0 support
- D3/E3 RGB output routing fixes
- Miscellaneous fixes
- Constify drm_bridge .mode_set() arguments
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1743477.dgErSCK0Q8@avalon
Diffstat (limited to 'drivers/gpu/drm/msm/edp/edp_bridge.c')
-rw-r--r-- | drivers/gpu/drm/msm/edp/edp_bridge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/msm/edp/edp_bridge.c b/drivers/gpu/drm/msm/edp/edp_bridge.c index 931a5c97cccf..86366ba03e60 100644 --- a/drivers/gpu/drm/msm/edp/edp_bridge.c +++ b/drivers/gpu/drm/msm/edp/edp_bridge.c | |||
@@ -52,8 +52,8 @@ static void edp_bridge_post_disable(struct drm_bridge *bridge) | |||
52 | } | 52 | } |
53 | 53 | ||
54 | static void edp_bridge_mode_set(struct drm_bridge *bridge, | 54 | static void edp_bridge_mode_set(struct drm_bridge *bridge, |
55 | struct drm_display_mode *mode, | 55 | const struct drm_display_mode *mode, |
56 | struct drm_display_mode *adjusted_mode) | 56 | const struct drm_display_mode *adjusted_mode) |
57 | { | 57 | { |
58 | struct drm_device *dev = bridge->dev; | 58 | struct drm_device *dev = bridge->dev; |
59 | struct drm_connector *connector; | 59 | struct drm_connector *connector; |