From 55bbced2532b6f33a21766df05cea999c3e915ee Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 8 Aug 2020 11:04:43 +0200 Subject: [PATCH] ANDROID: fix up lt9611 driver due to recent drm upstream changes This fixes up the drivers/gpu/drm/bridge/lontium-lt9611.c to build properly, should still work just as well as no logic changed, but would be good if someone verified this... Bug: 146449535 Cc: John Stultz Signed-off-by: Greg Kroah-Hartman Change-Id: I89984053acccff38d3156d24ec28fc165af50013 --- drivers/gpu/drm/bridge/lontium-lt9611.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/bridge/lontium-lt9611.c b/drivers/gpu/drm/bridge/lontium-lt9611.c index c38f89f28651..979a20914f2a 100644 --- a/drivers/gpu/drm/bridge/lontium-lt9611.c +++ b/drivers/gpu/drm/bridge/lontium-lt9611.c @@ -876,7 +876,9 @@ err_unregister_dsi0: } static enum drm_mode_status -lt9611_bridge_mode_valid(struct drm_bridge *bridge, const struct drm_display_mode *mode) +lt9611_bridge_mode_valid(struct drm_bridge *bridge, + const struct drm_display_info *info, + const struct drm_display_mode *mode) { struct lt9611_mode *lt9611_mode = lt9611_find_mode(mode); struct lt9611 *lt9611 = bridge_to_lt9611(bridge); @@ -919,9 +921,8 @@ static void lt9611_bridge_mode_set(struct drm_bridge *bridge, struct hdmi_avi_infoframe avi_frame; int ret; - dev_dbg(lt9611->dev, "bridge mode_set: hdisplay=%d, vdisplay=%d, vrefresh=%d, clock=%d\n", - adj_mode->hdisplay, adj_mode->vdisplay, - adj_mode->vrefresh, adj_mode->clock); + dev_dbg(lt9611->dev, "bridge mode_set: hdisplay=%d, vdisplay=%d, clock=%d\n", + adj_mode->hdisplay, adj_mode->vdisplay, adj_mode->clock); lt9611_bridge_pre_enable(bridge);