From d2ee17ae9f6ff5d5d2d926b183f8d521a0a678cd Mon Sep 17 00:00:00 2001 From: Wyon Bi Date: Tue, 8 Oct 2019 16:41:53 +0800 Subject: [PATCH] drm/rockchip: rk618: fix compile error Change-Id: I959217c605f0edf0db5ec60ebfd4a61c8c58479c Signed-off-by: Wyon Bi --- drivers/gpu/drm/rockchip/Kconfig | 3 +++ drivers/gpu/drm/rockchip/Makefile | 2 ++ drivers/gpu/drm/rockchip/rk618/rk618_dsi.c | 9 ++------- drivers/gpu/drm/rockchip/rk618/rk618_hdmi.c | 18 +++++------------ drivers/gpu/drm/rockchip/rk618/rk618_lvds.c | 9 ++------- drivers/gpu/drm/rockchip/rk618/rk618_rgb.c | 15 +++----------- drivers/gpu/drm/rockchip/rk618/rk618_scaler.c | 20 ++++++++----------- drivers/gpu/drm/rockchip/rk618/rk618_vif.c | 12 ++--------- 8 files changed, 27 insertions(+), 61 deletions(-) diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig index d1e29ddab069..e53b89122569 100644 --- a/drivers/gpu/drm/rockchip/Kconfig +++ b/drivers/gpu/drm/rockchip/Kconfig @@ -92,4 +92,7 @@ config ROCKCHIP_RGB Some Rockchip CRTCs, like rv1108, can directly output parallel and serial RGB format to panel or connect to a conversion chip. say Y to enable its driver. + +source "drivers/gpu/drm/rockchip/rk618/Kconfig" + endif diff --git a/drivers/gpu/drm/rockchip/Makefile b/drivers/gpu/drm/rockchip/Makefile index e67c3a37930d..6982d2f59181 100644 --- a/drivers/gpu/drm/rockchip/Makefile +++ b/drivers/gpu/drm/rockchip/Makefile @@ -18,3 +18,5 @@ rockchipdrm-$(CONFIG_ROCKCHIP_DRM_TVE) += rockchip_drm_tve.o rockchipdrm-$(CONFIG_ROCKCHIP_RGB) += rockchip_rgb.o obj-$(CONFIG_DRM_ROCKCHIP) += rockchipdrm.o + +obj-$(CONFIG_DRM_ROCKCHIP_RK618) += rk618/ diff --git a/drivers/gpu/drm/rockchip/rk618/rk618_dsi.c b/drivers/gpu/drm/rockchip/rk618/rk618_dsi.c index 8f130c468934..dd2c01ded2aa 100644 --- a/drivers/gpu/drm/rockchip/rk618/rk618_dsi.c +++ b/drivers/gpu/drm/rockchip/rk618/rk618_dsi.c @@ -756,7 +756,6 @@ static void rk618_dsi_connector_destroy(struct drm_connector *connector) } static const struct drm_connector_funcs rk618_dsi_connector_funcs = { - .dpms = drm_atomic_helper_connector_dpms, .detect = rk618_dsi_connector_detect, .fill_modes = drm_helper_probe_single_connector_modes, .destroy = rk618_dsi_connector_destroy, @@ -819,7 +818,7 @@ static int rk618_dsi_bridge_attach(struct drm_bridge *bridge) } drm_connector_helper_add(connector, &rk618_dsi_connector_helper_funcs); - drm_mode_connector_attach_encoder(connector, bridge->encoder); + drm_connector_attach_encoder(connector, bridge->encoder); ret = drm_panel_attach(dsi->panel, connector); if (ret) { @@ -1145,11 +1144,7 @@ static int rk618_dsi_probe(struct platform_device *pdev) dsi->base.funcs = &rk618_dsi_bridge_funcs; dsi->base.of_node = dev->of_node; - ret = drm_bridge_add(&dsi->base); - if (ret) { - dev_err(dev, "failed to add drm_bridge: %d\n", ret); - return ret; - } + drm_bridge_add(&dsi->base); dsi->host.dev = dev; dsi->host.ops = &rk618_dsi_host_ops; diff --git a/drivers/gpu/drm/rockchip/rk618/rk618_hdmi.c b/drivers/gpu/drm/rockchip/rk618/rk618_hdmi.c index 341d774028e6..30e98f1674cd 100644 --- a/drivers/gpu/drm/rockchip/rk618/rk618_hdmi.c +++ b/drivers/gpu/drm/rockchip/rk618/rk618_hdmi.c @@ -705,6 +705,7 @@ static int rk618_hdmi_config_video_vsi(struct rk618_hdmi *hdmi, int rc; rc = drm_hdmi_vendor_infoframe_from_display_mode(&frame.vendor.hdmi, + &hdmi->connector, mode); return rk618_hdmi_upload_frame(hdmi, rc, &frame, @@ -970,7 +971,7 @@ static int rk618_hdmi_connector_get_modes(struct drm_connector *connector) if (edid) { hdmi->hdmi_data.sink_is_hdmi = drm_detect_hdmi_monitor(edid); hdmi->hdmi_data.sink_has_audio = drm_detect_monitor_audio(edid); - drm_mode_connector_update_edid_property(connector, edid); + drm_connector_update_edid_property(connector, edid); ret = drm_add_edid_modes(connector, edid); kfree(edid); } else { @@ -1024,7 +1025,6 @@ rk618_hdmi_probe_single_connector_modes(struct drm_connector *connector, } static const struct drm_connector_funcs rk618_hdmi_connector_funcs = { - .dpms = drm_atomic_helper_connector_dpms, .fill_modes = rk618_hdmi_probe_single_connector_modes, .detect = rk618_hdmi_connector_detect, .destroy = drm_connector_cleanup, @@ -1091,7 +1091,7 @@ static int rk618_hdmi_bridge_attach(struct drm_bridge *bridge) drm_connector_helper_add(connector, &rk618_hdmi_connector_helper_funcs); - drm_mode_connector_attach_encoder(connector, bridge->encoder); + drm_connector_attach_encoder(connector, bridge->encoder); endpoint = of_graph_get_endpoint_by_regs(dev->of_node, 1, -1); if (endpoint && of_device_is_available(endpoint)) { @@ -1107,15 +1107,11 @@ static int rk618_hdmi_bridge_attach(struct drm_bridge *bridge) if (!hdmi->bridge) return -EPROBE_DEFER; - hdmi->bridge->encoder = bridge->encoder; - - ret = drm_bridge_attach(bridge->dev, hdmi->bridge); + ret = drm_bridge_attach(bridge->encoder, hdmi->bridge, bridge); if (ret) { dev_err(dev, "failed to attach bridge\n"); return ret; } - - bridge->next = hdmi->bridge; } return 0; @@ -1551,11 +1547,7 @@ static int rk618_hdmi_probe(struct platform_device *pdev) hdmi->base.funcs = &rk618_hdmi_bridge_funcs; hdmi->base.of_node = dev->of_node; - ret = drm_bridge_add(&hdmi->base); - if (ret) { - dev_err(dev, "failed to add drm_bridge: %d\n", ret); - return ret; - } + drm_bridge_add(&hdmi->base); #ifdef CONFIG_SWITCH hdmi->switchdev.name = "hdmi"; diff --git a/drivers/gpu/drm/rockchip/rk618/rk618_lvds.c b/drivers/gpu/drm/rockchip/rk618/rk618_lvds.c index 0dccf6e77c8b..f03a41bd7b9e 100644 --- a/drivers/gpu/drm/rockchip/rk618/rk618_lvds.c +++ b/drivers/gpu/drm/rockchip/rk618/rk618_lvds.c @@ -89,7 +89,6 @@ static void rk618_lvds_connector_destroy(struct drm_connector *connector) } static const struct drm_connector_funcs rk618_lvds_connector_funcs = { - .dpms = drm_atomic_helper_connector_dpms, .detect = rk618_lvds_connector_detect, .fill_modes = drm_helper_probe_single_connector_modes, .destroy = rk618_lvds_connector_destroy, @@ -186,7 +185,7 @@ static int rk618_lvds_bridge_attach(struct drm_bridge *bridge) } drm_connector_helper_add(connector, &rk618_lvds_connector_helper_funcs); - drm_mode_connector_attach_encoder(connector, bridge->encoder); + drm_connector_attach_encoder(connector, bridge->encoder); ret = drm_panel_attach(lvds->panel, connector); if (ret) { @@ -271,11 +270,7 @@ static int rk618_lvds_probe(struct platform_device *pdev) lvds->base.funcs = &rk618_lvds_bridge_funcs; lvds->base.of_node = dev->of_node; - ret = drm_bridge_add(&lvds->base); - if (ret) { - dev_err(dev, "failed to add drm_bridge: %d\n", ret); - return ret; - } + drm_bridge_add(&lvds->base); return 0; } diff --git a/drivers/gpu/drm/rockchip/rk618/rk618_rgb.c b/drivers/gpu/drm/rockchip/rk618/rk618_rgb.c index 6de7df9daf3e..8af377c13655 100644 --- a/drivers/gpu/drm/rockchip/rk618/rk618_rgb.c +++ b/drivers/gpu/drm/rockchip/rk618/rk618_rgb.c @@ -82,7 +82,6 @@ static void rk618_rgb_connector_destroy(struct drm_connector *connector) } static const struct drm_connector_funcs rk618_rgb_connector_funcs = { - .dpms = drm_atomic_helper_connector_dpms, .detect = rk618_rgb_connector_detect, .fill_modes = drm_helper_probe_single_connector_modes, .destroy = rk618_rgb_connector_destroy, @@ -185,18 +184,14 @@ static int rk618_rgb_bridge_attach(struct drm_bridge *bridge) drm_connector_helper_add(connector, &rk618_rgb_connector_helper_funcs); - drm_mode_connector_attach_encoder(connector, bridge->encoder); + drm_connector_attach_encoder(connector, bridge->encoder); drm_panel_attach(rgb->panel, connector); } else { - rgb->bridge->encoder = bridge->encoder; - - ret = drm_bridge_attach(bridge->dev, rgb->bridge); + ret = drm_bridge_attach(bridge->encoder, rgb->bridge, bridge); if (ret) { dev_err(dev, "failed to attach bridge\n"); return ret; } - - bridge->next = rgb->bridge; } return 0; @@ -265,11 +260,7 @@ static int rk618_rgb_probe(struct platform_device *pdev) rgb->base.funcs = &rk618_rgb_bridge_funcs; rgb->base.of_node = dev->of_node; - ret = drm_bridge_add(&rgb->base); - if (ret) { - dev_err(dev, "failed to add drm_bridge: %d\n", ret); - return ret; - } + drm_bridge_add(&rgb->base); return 0; } diff --git a/drivers/gpu/drm/rockchip/rk618/rk618_scaler.c b/drivers/gpu/drm/rockchip/rk618/rk618_scaler.c index 85a822fced2b..7ea34e3d9b30 100644 --- a/drivers/gpu/drm/rockchip/rk618/rk618_scaler.c +++ b/drivers/gpu/drm/rockchip/rk618/rk618_scaler.c @@ -15,7 +15,8 @@ #include #include -#include +#include +#include #include