Merge tag 'media/v4.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[mirror_ubuntu-artful-kernel.git] / drivers / gpu / drm / exynos / exynos_hdmi.c

diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
index bc4c8d0a66f41748964d2ab95244d0d472d94d71..1ff6ab6371e8e7aaa6bce6b1fe1dee64c9e08390 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -45,7 +45,6 @@
 
 #include <media/cec-notifier.h>
 
-#include "exynos_drm_drv.h"
 #include "exynos_drm_crtc.h"
 
 #define HOTPLUG_DEBOUNCE_MS            1100
@@ -926,7 +925,6 @@ static int hdmi_create_connector(struct drm_encoder *encoder)
        }
 
        drm_connector_helper_add(connector, &hdmi_connector_helper_funcs);
-       drm_connector_register(connector);
        drm_mode_connector_attach_encoder(connector, encoder);
 
        if (hdata->bridge) {
@@ -1709,6 +1707,8 @@ static int hdmi_bind(struct device *dev, struct device *master, void *data)
        struct drm_device *drm_dev = data;
        struct hdmi_context *hdata = dev_get_drvdata(dev);
        struct drm_encoder *encoder = &hdata->encoder;
+       struct exynos_drm_crtc *exynos_crtc;
+       struct drm_crtc *crtc;
        int ret, pipe;
 
        hdata->drm_dev = drm_dev;
@@ -1720,7 +1720,9 @@ static int hdmi_bind(struct device *dev, struct device *master, void *data)
 
        hdata->phy_clk.enable = hdmiphy_clk_enable;
 
-       exynos_drm_crtc_from_pipe(drm_dev, pipe)->pipe_clk = &hdata->phy_clk;
+       crtc = drm_crtc_from_index(drm_dev, pipe);
+       exynos_crtc = to_exynos_crtc(crtc);
+       exynos_crtc->pipe_clk = &hdata->phy_clk;
 
        encoder->possible_crtcs = 1 << pipe;