Merge tag 'drm-intel-fixes-2016-08-15' of git://anongit.freedesktop.org/drm-intel...

[cascardo/linux.git] / drivers / gpu / drm / rcar-du / rcar_du_hdmienc.c

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c b/drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c
index 461662d..e03004f 100644 (file)
--- a/drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c
@@ -16,7 +16,6 @@
 #include <drm/drmP.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_crtc_helper.h>
-#include <drm/drm_encoder_slave.h>
 
 #include "rcar_du_drv.h"
 #include "rcar_du_encoder.h"
@@ -25,20 +24,14 @@
 
 struct rcar_du_hdmienc {
        struct rcar_du_encoder *renc;
-       struct device *dev;
        bool enabled;
 };
 
 #define to_rcar_hdmienc(e)     (to_rcar_encoder(e)->hdmi)
-#define to_slave_funcs(e)      (to_rcar_encoder(e)->slave.slave_funcs)
 
 static void rcar_du_hdmienc_disable(struct drm_encoder *encoder)
 {
        struct rcar_du_hdmienc *hdmienc = to_rcar_hdmienc(encoder);
-       const struct drm_encoder_slave_funcs *sfuncs = to_slave_funcs(encoder);
-
-       if (sfuncs->dpms)
-               sfuncs->dpms(encoder, DRM_MODE_DPMS_OFF);
 
        if (hdmienc->renc->lvds)
                rcar_du_lvdsenc_enable(hdmienc->renc->lvds, encoder->crtc,
@@ -50,15 +43,11 @@ static void rcar_du_hdmienc_disable(struct drm_encoder *encoder)
 static void rcar_du_hdmienc_enable(struct drm_encoder *encoder)
 {
        struct rcar_du_hdmienc *hdmienc = to_rcar_hdmienc(encoder);
-       const struct drm_encoder_slave_funcs *sfuncs = to_slave_funcs(encoder);
 
        if (hdmienc->renc->lvds)
                rcar_du_lvdsenc_enable(hdmienc->renc->lvds, encoder->crtc,
                                       true);
 
-       if (sfuncs->dpms)
-               sfuncs->dpms(encoder, DRM_MODE_DPMS_ON);
-
        hdmienc->enabled = true;
 }
 
@@ -67,29 +56,21 @@ static int rcar_du_hdmienc_atomic_check(struct drm_encoder *encoder,
                                        struct drm_connector_state *conn_state)
 {
        struct rcar_du_hdmienc *hdmienc = to_rcar_hdmienc(encoder);
-       const struct drm_encoder_slave_funcs *sfuncs = to_slave_funcs(encoder);
        struct drm_display_mode *adjusted_mode = &crtc_state->adjusted_mode;
-       const struct drm_display_mode *mode = &crtc_state->mode;
 
        if (hdmienc->renc->lvds)
                rcar_du_lvdsenc_atomic_check(hdmienc->renc->lvds,
                                             adjusted_mode);
 
-       if (sfuncs->mode_fixup == NULL)
-               return 0;
-
-       return sfuncs->mode_fixup(encoder, mode, adjusted_mode) ? 0 : -EINVAL;
+       return 0;
 }
 
+
 static void rcar_du_hdmienc_mode_set(struct drm_encoder *encoder,
                                     struct drm_display_mode *mode,
                                     struct drm_display_mode *adjusted_mode)
 {
        struct rcar_du_hdmienc *hdmienc = to_rcar_hdmienc(encoder);
-       const struct drm_encoder_slave_funcs *sfuncs = to_slave_funcs(encoder);
-
-       if (sfuncs->mode_set)
-               sfuncs->mode_set(encoder, mode, adjusted_mode);
 
        rcar_du_crtc_route_output(encoder->crtc, hdmienc->renc->output);
 }
@@ -109,7 +90,6 @@ static void rcar_du_hdmienc_cleanup(struct drm_encoder *encoder)
                rcar_du_hdmienc_disable(encoder);
 
        drm_encoder_cleanup(encoder);
-       put_device(hdmienc->dev);
 }
 
 static const struct drm_encoder_funcs encoder_funcs = {
@@ -120,8 +100,7 @@ int rcar_du_hdmienc_init(struct rcar_du_device *rcdu,
                         struct rcar_du_encoder *renc, struct device_node *np)
 {
        struct drm_encoder *encoder = rcar_encoder_to_drm_encoder(renc);
-       struct drm_i2c_encoder_driver *driver;
-       struct i2c_client *i2c_slave;
+       struct drm_bridge *bridge;
        struct rcar_du_hdmienc *hdmienc;
        int ret;
 
@@ -129,44 +108,30 @@ int rcar_du_hdmienc_init(struct rcar_du_device *rcdu,
        if (hdmienc == NULL)
                return -ENOMEM;
 
-       /* Locate the slave I2C device and driver. */
-       i2c_slave = of_find_i2c_device_by_node(np);
-       if (!i2c_slave || !i2c_get_clientdata(i2c_slave)) {
-               dev_dbg(rcdu->dev,
-                       "can't get I2C slave for %s, deferring probe\n",
-                       of_node_full_name(np));
+       /* Locate drm bridge from the hdmi encoder DT node */
+       bridge = of_drm_find_bridge(np);
+       if (!bridge)
                return -EPROBE_DEFER;
-       }
-
-       hdmienc->dev = &i2c_slave->dev;
-
-       if (hdmienc->dev->driver == NULL) {
-               dev_dbg(rcdu->dev,
-                       "I2C slave %s not probed yet, deferring probe\n",
-                       dev_name(hdmienc->dev));
-               ret = -EPROBE_DEFER;
-               goto error;
-       }
-
-       /* Initialize the slave encoder. */
-       driver = to_drm_i2c_encoder_driver(to_i2c_driver(hdmienc->dev->driver));
-       ret = driver->encoder_init(i2c_slave, rcdu->ddev, &renc->slave);
-       if (ret < 0)
-               goto error;
 
        ret = drm_encoder_init(rcdu->ddev, encoder, &encoder_funcs,
                               DRM_MODE_ENCODER_TMDS, NULL);
        if (ret < 0)
-               goto error;
+               return ret;
 
        drm_encoder_helper_add(encoder, &encoder_helper_funcs);
 
        renc->hdmi = hdmienc;
        hdmienc->renc = renc;
 
-       return 0;
+       /* Link drm_bridge to encoder */
+       bridge->encoder = encoder;
+       encoder->bridge = bridge;
+
+       ret = drm_bridge_attach(rcdu->ddev, bridge);
+       if (ret) {
+               drm_encoder_cleanup(encoder);
+               return ret;
+       }
 
-error:
-       put_device(hdmienc->dev);
-       return ret;
+       return 0;
 }