drm/omap: Add infoframe & dvi/hdmi mode support

Make the omapdrm driver use the new HDMI ops when possible.

omapdrm will call set_hdmi_mode (when available) to tell the encoder
driver whether the monitor is a DVI or HDMI monitor, and if it's an HDMI
monitor, omapdrm will call set_hdmi_infoframe to to set the AVI
infoframe.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Rob Clark <robdclark@gmail.com>

diff --git a/drivers/gpu/drm/omapdrm/omap_connector.c b/drivers/gpu/drm/omapdrm/omap_connector.c
index 86f4ead0441d0d2b6e27f8441974f14dd68ed801..19492cd31f10a47cdc1f28936b60da3796db946f 100644 (file)
--- a/drivers/gpu/drm/omapdrm/omap_connector.c
+++ b/drivers/gpu/drm/omapdrm/omap_connector.c
@@ -32,8 +32,16 @@ struct omap_connector {
        struct drm_connector base;
        struct omap_dss_device *dssdev;
        struct drm_encoder *encoder;
+       bool hdmi_mode;
 };
 
+bool omap_connector_get_hdmi_mode(struct drm_connector *connector)
+{
+       struct omap_connector *omap_connector = to_omap_connector(connector);
+
+       return omap_connector->hdmi_mode;
+}
+
 void copy_timings_omap_to_drm(struct drm_display_mode *mode,
                struct omap_video_timings *timings)
 {
@@ -162,10 +170,14 @@ static int omap_connector_get_modes(struct drm_connector *connector)
                        drm_mode_connector_update_edid_property(
                                        connector, edid);
                        n = drm_add_edid_modes(connector, edid);
+
+                       omap_connector->hdmi_mode =
+                               drm_detect_hdmi_monitor(edid);
                } else {
                        drm_mode_connector_update_edid_property(
                                        connector, NULL);
                }
+
                kfree(edid);
        } else {
                struct drm_display_mode *mode = drm_mode_create(dev);

diff --git a/drivers/gpu/drm/omapdrm/omap_drv.h b/drivers/gpu/drm/omapdrm/omap_drv.h
index 284b80fc3c54fc4146294656c722fb7af2485b03..c204c1e7ce87386f55deb912429fca18f9465cfa 100644 (file)
--- a/drivers/gpu/drm/omapdrm/omap_drv.h
+++ b/drivers/gpu/drm/omapdrm/omap_drv.h
@@ -194,6 +194,7 @@ struct drm_encoder *omap_connector_attached_encoder(
                struct drm_connector *connector);
 void omap_connector_flush(struct drm_connector *connector,
                int x, int y, int w, int h);
+bool omap_connector_get_hdmi_mode(struct drm_connector *connector);
 
 void copy_timings_omap_to_drm(struct drm_display_mode *mode,
                struct omap_video_timings *timings);

diff --git a/drivers/gpu/drm/omapdrm/omap_encoder.c b/drivers/gpu/drm/omapdrm/omap_encoder.c
index 5290a88c681db3e6cd2d4a9e4fa32c0e50230153..7445fb1491ae7f160cfdb6a1b57d4eab19bcf8f4 100644 (file)
--- a/drivers/gpu/drm/omapdrm/omap_encoder.c
+++ b/drivers/gpu/drm/omapdrm/omap_encoder.c
@@ -17,6 +17,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <drm/drm_edid.h>
+
 #include "omap_drv.h"
 
 #include "drm_crtc.h"
@@ -89,6 +91,31 @@ static void omap_encoder_mode_set(struct drm_encoder *encoder,
                                struct drm_display_mode *mode,
                                struct drm_display_mode *adjusted_mode)
 {
+       struct drm_device *dev = encoder->dev;
+       struct omap_encoder *omap_encoder = to_omap_encoder(encoder);
+       struct omap_dss_device *dssdev = omap_encoder->dssdev;
+       struct drm_connector *connector;
+       bool hdmi_mode;
+       int r;
+
+       hdmi_mode = false;
+       list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+               if (connector->encoder == encoder) {
+                       hdmi_mode = omap_connector_get_hdmi_mode(connector);
+                       break;
+               }
+       }
+
+       if (dssdev->driver->set_hdmi_mode)
+               dssdev->driver->set_hdmi_mode(dssdev, hdmi_mode);
+
+       if (hdmi_mode && dssdev->driver->set_hdmi_infoframe) {
+               struct hdmi_avi_infoframe avi;
+
+               r = drm_hdmi_avi_infoframe_from_display_mode(&avi, adjusted_mode);
+               if (r == 0)
+                       dssdev->driver->set_hdmi_infoframe(dssdev, &avi);
+       }
 }
 
 static void omap_encoder_prepare(struct drm_encoder *encoder)