drm/radeon/kms: add initial connector properties

This adds:
coherent mode: TMDS coherent mode for atom cards.
scaling mode: LVDS scaler mode
load detect: DAC load detection, DVI-I, VGA, TV
tmds pll: legacy TMDS pll selection
tv standard: TV standard selection.

for later: other TV ones? dvi subconnector selection using std prop

[contains fixes pointed out on dri-devel for atom bios mixups
 by Michel]

Signed-off-by: Dave Airlie <airlied@redhat.com>

7 files changed, 376 insertions, 62 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c
index cb5efcaf2bab..743742128307 100644
--- a/drivers/gpu/drm/radeon/radeon_atombios.c
+++ b/drivers/gpu/drm/radeon/radeon_atombios.c
@@ -719,9 +719,8 @@ bool radeon_atom_get_clock_info(struct drm_device *dev)
         return false;
 }
 
-struct radeon_encoder_int_tmds *radeon_atombios_get_tmds_info(struct
-                                                              radeon_encoder
-                                                              *encoder)
+bool radeon_atombios_get_tmds_info(struct radeon_encoder *encoder,
+                                   struct radeon_encoder_int_tmds *tmds)
 {
         struct drm_device *dev = encoder->base.dev;
         struct radeon_device *rdev = dev->dev_private;
@@ -732,7 +731,6 @@ struct radeon_encoder_int_tmds *radeon_atombios_get_tmds_info(struct
         uint8_t frev, crev;
         uint16_t maxfreq;
         int i;
-        struct radeon_encoder_int_tmds *tmds = NULL;
 
         atom_parse_data_header(mode_info->atom_context, index, NULL, &frev,
                                &crev, &data_offset);
@@ -742,12 +740,6 @@ struct radeon_encoder_int_tmds *radeon_atombios_get_tmds_info(struct
                                        data_offset);
 
         if (tmds_info) {
-                tmds =
-                    kzalloc(sizeof(struct radeon_encoder_int_tmds), GFP_KERNEL);
-
-                if (!tmds)
-                        return NULL;
-
                 maxfreq = le16_to_cpu(tmds_info->usMaxFrequency);
                 for (i = 0; i < 4; i++) {
                         tmds->tmds_pll[i].freq =
@@ -773,8 +765,9 @@ struct radeon_encoder_int_tmds *radeon_atombios_get_tmds_info(struct
                                 break;
                         }
                 }
+                return true;
         }
-        return tmds;
+        return false;
 }
 
 union lvds_info {
diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c
index cb60f5532334..748265a105b3 100644
--- a/drivers/gpu/drm/radeon/radeon_combios.c
+++ b/drivers/gpu/drm/radeon/radeon_combios.c
@@ -998,48 +998,37 @@ static const struct radeon_tmds_pll default_tmds_pll[CHIP_LAST][4] = {
         {{15000, 0xb0155}, {0xffffffff, 0xb01cb}, {0, 0}, {0, 0}},      /* CHIP_RS480 */
 };
 
-static struct radeon_encoder_int_tmds
-    *radeon_legacy_get_tmds_info_from_table(struct radeon_device *rdev)
+bool radeon_legacy_get_tmds_info_from_table(struct radeon_encoder *encoder,
+                                            struct radeon_encoder_int_tmds *tmds)
 {
+        struct drm_device *dev = encoder->base.dev;
+        struct radeon_device *rdev = dev->dev_private;
         int i;
-        struct radeon_encoder_int_tmds *tmds = NULL;
-
-        tmds = kzalloc(sizeof(struct radeon_encoder_int_tmds), GFP_KERNEL);
-
-        if (!tmds)
-                return NULL;
 
         for (i = 0; i < 4; i++) {
                 tmds->tmds_pll[i].value =
-                    default_tmds_pll[rdev->family][i].value;
+                        default_tmds_pll[rdev->family][i].value;
                 tmds->tmds_pll[i].freq = default_tmds_pll[rdev->family][i].freq;
         }
 
-        return tmds;
+        return true;
 }
 
-struct radeon_encoder_int_tmds *radeon_combios_get_tmds_info(struct
-                                                             radeon_encoder
-                                                             *encoder)
+bool radeon_legacy_get_tmds_info_from_combios(struct radeon_encoder *encoder,
+                                              struct radeon_encoder_int_tmds *tmds)
 {
         struct drm_device *dev = encoder->base.dev;
         struct radeon_device *rdev = dev->dev_private;
         uint16_t tmds_info;
         int i, n;
         uint8_t ver;
-        struct radeon_encoder_int_tmds *tmds = NULL;
 
         if (rdev->bios == NULL)
-                return radeon_legacy_get_tmds_info_from_table(rdev);
+                return false;
 
         tmds_info = combios_get_table_offset(dev, COMBIOS_DFP_INFO_TABLE);
 
         if (tmds_info) {
-                tmds =
-                    kzalloc(sizeof(struct radeon_encoder_int_tmds), GFP_KERNEL);
-
-                if (!tmds)
-                        return NULL;
 
                 ver = RBIOS8(tmds_info);
                 DRM_INFO("DFP table revision: %d\n", ver);
@@ -1077,6 +1066,23 @@ struct radeon_encoder_int_tmds *radeon_combios_get_tmds_info(struct
                 }
         } else
                 DRM_INFO("No TMDS info found in BIOS\n");
+        return true;
+}
+
+struct radeon_encoder_int_tmds *radeon_combios_get_tmds_info(struct radeon_encoder *encoder)
+{
+        struct radeon_encoder_int_tmds *tmds = NULL;
+        bool ret;
+
+        tmds = kzalloc(sizeof(struct radeon_encoder_int_tmds), GFP_KERNEL);
+
+        if (!tmds)
+                return NULL;
+
+        ret = radeon_legacy_get_tmds_info_from_combios(encoder, tmds);
+        if (ret == false)
+                radeon_legacy_get_tmds_info_from_table(encoder, tmds);
+
         return tmds;
 }
 
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
index 5ee81b6a8799..af1d551f1a8f 100644
--- a/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
@@ -39,6 +39,15 @@ radeon_atombios_connected_scratch_regs(struct drm_connector *connector,
                                        struct drm_encoder *encoder,
                                        bool connected);
 
+static void radeon_property_change_mode(struct drm_encoder *encoder)
+{
+        struct drm_crtc *crtc = encoder->crtc;
+
+        if (crtc && crtc->enabled) {
+                drm_crtc_helper_set_mode(crtc, &crtc->mode,
+                                         crtc->x, crtc->y, crtc->fb);
+        }
+}
 static void
 radeon_connector_update_scratch_regs(struct drm_connector *connector, enum drm_connector_status status)
 {
@@ -78,6 +87,27 @@ radeon_connector_update_scratch_regs(struct drm_connector *connector, enum drm_c
         }
 }
 
+struct drm_encoder *radeon_find_encoder(struct drm_connector *connector, int encoder_type)
+{
+        struct drm_mode_object *obj;
+        struct drm_encoder *encoder;
+        int i;
+
+        for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {
+                if (connector->encoder_ids[i] == 0)
+                        break;
+
+                obj = drm_mode_object_find(connector->dev, connector->encoder_ids[i], DRM_MODE_OBJECT_ENCODER);
+                if (!obj)
+                        continue;
+
+                encoder = obj_to_encoder(obj);
+                if (encoder->encoder_type == encoder_type)
+                        return encoder;
+        }
+        return NULL;
+}
+
 struct drm_encoder *radeon_best_single_encoder(struct drm_connector *connector)
 {
         int enc_id = connector->encoder_ids[0];
@@ -95,7 +125,6 @@ struct drm_encoder *radeon_best_single_encoder(struct drm_connector *connector)
         return NULL;
 }
 
-
 /*
  * radeon_connector_analog_encoder_conflict_solve
  * - search for other connectors sharing this encoder
@@ -224,6 +253,89 @@ static void radeon_add_common_modes(struct drm_encoder *encoder, struct drm_conn
 int radeon_connector_set_property(struct drm_connector *connector, struct drm_property *property,
                                   uint64_t val)
 {
+        struct drm_device *dev = connector->dev;
+        struct radeon_device *rdev = dev->dev_private;
+        struct drm_encoder *encoder;
+        struct radeon_encoder *radeon_encoder;
+
+        if (property == rdev->mode_info.coherent_mode_property) {
+                struct radeon_encoder_atom_dig *dig;
+
+                /* need to find digital encoder on connector */
+                encoder = radeon_find_encoder(connector, DRM_MODE_ENCODER_TMDS);
+                if (!encoder)
+                        return 0;
+
+                radeon_encoder = to_radeon_encoder(encoder);
+
+                if (!radeon_encoder->enc_priv)
+                        return 0;
+
+                dig = radeon_encoder->enc_priv;
+                dig->coherent_mode = val ? true : false;
+                radeon_property_change_mode(&radeon_encoder->base);
+        }
+
+        if (property == rdev->mode_info.tv_std_property) {
+                encoder = radeon_find_encoder(connector, DRM_MODE_ENCODER_TVDAC);
+                if (!encoder) {
+                        encoder = radeon_find_encoder(connector, DRM_MODE_ENCODER_DAC);
+                }
+
+                if (!encoder)
+                        return 0;
+
+                radeon_encoder = to_radeon_encoder(encoder);
+                if (!radeon_encoder->enc_priv)
+                        return 0;
+                if (rdev->is_atom_bios) {
+                        struct radeon_encoder_atom_dac *dac_int;
+                        dac_int = radeon_encoder->enc_priv;
+                        dac_int->tv_std = val;
+                } else {
+                        struct radeon_encoder_tv_dac *dac_int;
+                        dac_int = radeon_encoder->enc_priv;
+                        dac_int->tv_std = val;
+                }
+                radeon_property_change_mode(&radeon_encoder->base);
+        }
+
+        if (property == rdev->mode_info.load_detect_property) {
+                struct radeon_connector *radeon_connector =
+                        to_radeon_connector(connector);
+
+                if (val == 0)
+                        radeon_connector->dac_load_detect = false;
+                else
+                        radeon_connector->dac_load_detect = true;
+        }
+
+        if (property == rdev->mode_info.tmds_pll_property) {
+                struct radeon_encoder_int_tmds *tmds = NULL;
+                bool ret = false;
+                /* need to find digital encoder on connector */
+                encoder = radeon_find_encoder(connector, DRM_MODE_ENCODER_TMDS);
+                if (!encoder)
+                        return 0;
+
+                radeon_encoder = to_radeon_encoder(encoder);
+
+                tmds = radeon_encoder->enc_priv;
+                if (!tmds)
+                        return 0;
+
+                if (val == 0) {
+                        if (rdev->is_atom_bios)
+                                ret = radeon_atombios_get_tmds_info(radeon_encoder, tmds);
+                        else
+                                ret = radeon_legacy_get_tmds_info_from_combios(radeon_encoder, tmds);
+                }
+                if (val == 1 || ret == false) {
+                        radeon_legacy_get_tmds_info_from_table(radeon_encoder, tmds);
+                }
+                radeon_property_change_mode(&radeon_encoder->base);
+        }
+
         return 0;
 }
 
@@ -320,6 +432,42 @@ static void radeon_connector_destroy(struct drm_connector *connector)
         kfree(connector);
 }
 
+static int radeon_lvds_set_property(struct drm_connector *connector,
+                                    struct drm_property *property,
+                                    uint64_t value)
+{
+        struct drm_device *dev = connector->dev;
+        struct radeon_encoder *radeon_encoder;
+        enum radeon_rmx_type rmx_type;
+
+        DRM_DEBUG("\n");
+        if (property != dev->mode_config.scaling_mode_property)
+                return 0;
+
+        if (connector->encoder)
+                radeon_encoder = to_radeon_encoder(connector->encoder);
+        else {
+                struct drm_connector_helper_funcs *connector_funcs = connector->helper_private;
+                radeon_encoder = to_radeon_encoder(connector_funcs->best_encoder(connector));
+        }
+
+        switch (value) {
+        case DRM_MODE_SCALE_NONE: rmx_type = RMX_OFF; break;
+        case DRM_MODE_SCALE_CENTER: rmx_type = RMX_CENTER; break;
+        case DRM_MODE_SCALE_ASPECT: rmx_type = RMX_ASPECT; break;
+        default:
+        case DRM_MODE_SCALE_FULLSCREEN: rmx_type = RMX_FULL; break;
+        }
+        if (radeon_encoder->rmx_type == rmx_type)
+                return 0;
+
+        radeon_encoder->rmx_type = rmx_type;
+
+        radeon_property_change_mode(&radeon_encoder->base);
+        return 0;
+}
+
+
 struct drm_connector_helper_funcs radeon_lvds_connector_helper_funcs = {
         .get_modes = radeon_lvds_get_modes,
         .mode_valid = radeon_lvds_mode_valid,
@@ -331,7 +479,7 @@ struct drm_connector_funcs radeon_lvds_connector_funcs = {
         .detect = radeon_lvds_detect,
         .fill_modes = drm_helper_probe_single_connector_modes,
         .destroy = radeon_connector_destroy,
-        .set_property = radeon_connector_set_property,
+        .set_property = radeon_lvds_set_property,
 };
 
 static int radeon_vga_get_modes(struct drm_connector *connector)
@@ -368,8 +516,10 @@ static enum drm_connector_status radeon_vga_detect(struct drm_connector *connect
         if (dret)
                 ret = connector_status_connected;
         else {
-                encoder_funcs = encoder->helper_private;
-                ret = encoder_funcs->detect(encoder, connector);
+                if (radeon_connector->dac_load_detect) {
+                        encoder_funcs = encoder->helper_private;
+                        ret = encoder_funcs->detect(encoder, connector);
+                }
         }
 
         if (ret == connector_status_connected)
@@ -426,7 +576,11 @@ static enum drm_connector_status radeon_tv_detect(struct drm_connector *connecto
 {
         struct drm_encoder *encoder;
         struct drm_encoder_helper_funcs *encoder_funcs;
-        int ret;
+        struct radeon_connector *radeon_connector = to_radeon_connector(connector);
+        enum drm_connector_status ret = connector_status_disconnected;
+
+        if (!radeon_connector->dac_load_detect)
+                return ret;
 
         encoder = radeon_best_single_encoder(connector);
         if (!encoder)
@@ -510,27 +664,29 @@ static enum drm_connector_status radeon_dvi_detect(struct drm_connector *connect
                 goto out;
 
         /* find analog encoder */
-        for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {
-                if (connector->encoder_ids[i] == 0)
-                        break;
+        if (radeon_connector->dac_load_detect) {
+                for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {
+                        if (connector->encoder_ids[i] == 0)
+                                break;
 
-                obj = drm_mode_object_find(connector->dev,
-                                           connector->encoder_ids[i],
-                                           DRM_MODE_OBJECT_ENCODER);
-                if (!obj)
-                        continue;
+                        obj = drm_mode_object_find(connector->dev,
+                                                   connector->encoder_ids[i],
+                                                   DRM_MODE_OBJECT_ENCODER);
+                        if (!obj)
+                                continue;
 
-                encoder = obj_to_encoder(obj);
+                        encoder = obj_to_encoder(obj);
 
-                encoder_funcs = encoder->helper_private;
-                if (encoder_funcs->detect) {
-                        if (ret != connector_status_connected) {
-                                ret = encoder_funcs->detect(encoder, connector);
-                                if (ret == connector_status_connected) {
-                                        radeon_connector->use_digital = false;
+                        encoder_funcs = encoder->helper_private;
+                        if (encoder_funcs->detect) {
+                                if (ret != connector_status_connected) {
+                                        ret = encoder_funcs->detect(encoder, connector);
+                                        if (ret == connector_status_connected) {
+                                                radeon_connector->use_digital = false;
+                                        }
                                 }
+                                break;
                         }
-                        break;
                 }
         }
 
@@ -610,6 +766,7 @@ radeon_add_atom_connector(struct drm_device *dev,
                           bool linkb,
                           uint32_t igp_lane_info)
 {
+        struct radeon_device *rdev = dev->dev_private;
         struct drm_connector *connector;
         struct radeon_connector *radeon_connector;
         struct radeon_connector_atom_dig *radeon_dig_connector;
@@ -645,6 +802,9 @@ radeon_add_atom_connector(struct drm_device *dev,
                         if (!radeon_connector->ddc_bus)
                                 goto failed;
                 }
+                drm_connector_attach_property(&radeon_connector->base,
+                                              rdev->mode_info.load_detect_property,
+                                              1);
                 break;
         case DRM_MODE_CONNECTOR_DVIA:
                 drm_connector_init(dev, &radeon_connector->base, &radeon_vga_connector_funcs, connector_type);
@@ -654,6 +814,9 @@ radeon_add_atom_connector(struct drm_device *dev,
                         if (!radeon_connector->ddc_bus)
                                 goto failed;
                 }
+                drm_connector_attach_property(&radeon_connector->base,
+                                              rdev->mode_info.load_detect_property,
+                                              1);
                 break;
         case DRM_MODE_CONNECTOR_DVII:
         case DRM_MODE_CONNECTOR_DVID:
@@ -671,6 +834,12 @@ radeon_add_atom_connector(struct drm_device *dev,
                                 goto failed;
                 }
                 subpixel_order = SubPixelHorizontalRGB;
+                drm_connector_attach_property(&radeon_connector->base,
+                                              rdev->mode_info.coherent_mode_property,
+                                              1);
+                drm_connector_attach_property(&radeon_connector->base,
+                                              rdev->mode_info.load_detect_property,
+                                              1);
                 break;
         case DRM_MODE_CONNECTOR_HDMIA:
         case DRM_MODE_CONNECTOR_HDMIB:
@@ -687,6 +856,9 @@ radeon_add_atom_connector(struct drm_device *dev,
                         if (!radeon_connector->ddc_bus)
                                 goto failed;
                 }
+                drm_connector_attach_property(&radeon_connector->base,
+                                              rdev->mode_info.coherent_mode_property,
+                                              1);
                 subpixel_order = SubPixelHorizontalRGB;
                 break;
         case DRM_MODE_CONNECTOR_DisplayPort:
@@ -712,6 +884,9 @@ radeon_add_atom_connector(struct drm_device *dev,
                         drm_connector_init(dev, &radeon_connector->base, &radeon_tv_connector_funcs, connector_type);
                         drm_connector_helper_add(&radeon_connector->base, &radeon_tv_connector_helper_funcs);
                 }
+                drm_connector_attach_property(&radeon_connector->base,
+                                              rdev->mode_info.load_detect_property,
+                                              1);
                 break;
         case DRM_MODE_CONNECTOR_LVDS:
                 radeon_dig_connector = kzalloc(sizeof(struct radeon_connector_atom_dig), GFP_KERNEL);
@@ -727,6 +902,10 @@ radeon_add_atom_connector(struct drm_device *dev,
                         if (!radeon_connector->ddc_bus)
                                 goto failed;
                 }
+                drm_mode_create_scaling_mode_property(dev);
+                drm_connector_attach_property(&radeon_connector->base,
+                                              dev->mode_config.scaling_mode_property,
+                                              DRM_MODE_SCALE_FULLSCREEN);
                 subpixel_order = SubPixelHorizontalRGB;
                 break;
         }
@@ -749,6 +928,7 @@ radeon_add_legacy_connector(struct drm_device *dev,
                             int connector_type,
                             struct radeon_i2c_bus_rec *i2c_bus)
 {
+        struct radeon_device *rdev = dev->dev_private;
         struct drm_connector *connector;
         struct radeon_connector *radeon_connector;
         uint32_t subpixel_order = SubPixelNone;
@@ -783,6 +963,9 @@ radeon_add_legacy_connector(struct drm_device *dev,
                         if (!radeon_connector->ddc_bus)
                                 goto failed;
                 }
+                drm_connector_attach_property(&radeon_connector->base,
+                                              rdev->mode_info.load_detect_property,
+                                              1);
                 break;
         case DRM_MODE_CONNECTOR_DVIA:
                 drm_connector_init(dev, &radeon_connector->base, &radeon_vga_connector_funcs, connector_type);
@@ -792,6 +975,9 @@ radeon_add_legacy_connector(struct drm_device *dev,
                         if (!radeon_connector->ddc_bus)
                                 goto failed;
                 }
+                drm_connector_attach_property(&radeon_connector->base,
+                                              rdev->mode_info.load_detect_property,
+                                              1);
                 break;
         case DRM_MODE_CONNECTOR_DVII:
         case DRM_MODE_CONNECTOR_DVID:
@@ -801,6 +987,9 @@ radeon_add_legacy_connector(struct drm_device *dev,
                         radeon_connector->ddc_bus = radeon_i2c_create(dev, i2c_bus, "DVI");
                         if (!radeon_connector->ddc_bus)
                                 goto failed;
+                        drm_connector_attach_property(&radeon_connector->base,
+                                                      rdev->mode_info.load_detect_property,
+                                                      1);
                 }
                 subpixel_order = SubPixelHorizontalRGB;
                 break;
@@ -810,6 +999,9 @@ radeon_add_legacy_connector(struct drm_device *dev,
                 if (radeon_tv == 1) {
                         drm_connector_init(dev, &radeon_connector->base, &radeon_tv_connector_funcs, connector_type);
                         drm_connector_helper_add(&radeon_connector->base, &radeon_tv_connector_helper_funcs);
+                        drm_connector_attach_property(&radeon_connector->base,
+                                                      rdev->mode_info.load_detect_property,
+                                                      1);
                 }
                 break;
         case DRM_MODE_CONNECTOR_LVDS:
@@ -820,6 +1012,9 @@ radeon_add_legacy_connector(struct drm_device *dev,
                         if (!radeon_connector->ddc_bus)
                                 goto failed;
                 }
+                drm_connector_attach_property(&radeon_connector->base,
+                                              dev->mode_config.scaling_mode_property,
+                                              DRM_MODE_SCALE_FULLSCREEN);
                 subpixel_order = SubPixelHorizontalRGB;
                 break;
         }
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
index 22da85fe5ae7..5d8141b13765 100644
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -623,6 +623,83 @@ static const struct drm_mode_config_funcs radeon_mode_funcs = {
         .fb_changed = radeonfb_probe,
 };
 
+struct drm_prop_enum_list {
+        int type;
+        char *name;
+};
+
+static struct drm_prop_enum_list radeon_tmds_pll_enum_list[] =
+{       { 0, "driver" },
+        { 1, "bios" },
+};
+
+static struct drm_prop_enum_list radeon_tv_std_enum_list[] =
+{       { TV_STD_NTSC, "ntsc" },
+        { TV_STD_PAL, "pal" },
+        { TV_STD_PAL_M, "pal-m" },
+        { TV_STD_PAL_60, "pal-60" },
+        { TV_STD_NTSC_J, "ntsc-j" },
+        { TV_STD_SCART_PAL, "scart-pal" },
+        { TV_STD_PAL_CN, "pal-cn" },
+        { TV_STD_SECAM, "secam" },
+};
+
+int radeon_modeset_create_props(struct radeon_device *rdev)
+{
+        int i, sz;
+
+        if (rdev->is_atom_bios) {
+                rdev->mode_info.coherent_mode_property =
+                        drm_property_create(rdev->ddev,
+                                            DRM_MODE_PROP_RANGE,
+                                            "coherent", 2);
+                if (!rdev->mode_info.coherent_mode_property)
+                        return -ENOMEM;
+
+                rdev->mode_info.coherent_mode_property->values[0] = 0;
+                rdev->mode_info.coherent_mode_property->values[0] = 1;
+        }
+
+        if (!ASIC_IS_AVIVO(rdev)) {
+                sz = ARRAY_SIZE(radeon_tmds_pll_enum_list);
+                rdev->mode_info.tmds_pll_property =
+                        drm_property_create(rdev->ddev,
+                                            DRM_MODE_PROP_ENUM,
+                                            "tmds_pll", sz);
+                for (i = 0; i < sz; i++) {
+                        drm_property_add_enum(rdev->mode_info.tmds_pll_property,
+                                              i,
+                                              radeon_tmds_pll_enum_list[i].type,
+                                              radeon_tmds_pll_enum_list[i].name);
+                }
+        }
+
+        rdev->mode_info.load_detect_property =
+                drm_property_create(rdev->ddev,
+                                    DRM_MODE_PROP_RANGE,
+                                    "load detection", 2);
+        if (!rdev->mode_info.load_detect_property)
+                return -ENOMEM;
+        rdev->mode_info.load_detect_property->values[0] = 0;
+        rdev->mode_info.load_detect_property->values[0] = 1;
+
+        drm_mode_create_scaling_mode_property(rdev->ddev);
+
+        sz = ARRAY_SIZE(radeon_tv_std_enum_list);
+        rdev->mode_info.tv_std_property =
+                drm_property_create(rdev->ddev,
+                                    DRM_MODE_PROP_ENUM,
+                                    "tv standard", sz);
+        for (i = 0; i < sz; i++) {
+                drm_property_add_enum(rdev->mode_info.tv_std_property,
+                                      i,
+                                      radeon_tv_std_enum_list[i].type,
+                                      radeon_tv_std_enum_list[i].name);
+        }
+
+        return 0;
+}
+
 int radeon_modeset_init(struct radeon_device *rdev)
 {
         int num_crtc = 2, i;
@@ -643,6 +720,10 @@ int radeon_modeset_init(struct radeon_device *rdev)
 
         rdev->ddev->mode_config.fb_base = rdev->mc.aper_base;
 
+        ret = radeon_modeset_create_props(rdev);
+        if (ret) {
+                return ret;
+        }
         /* allocate crtcs - TODO single crtc */
         for (i = 0; i < num_crtc; i++) {
                 radeon_crtc_init(rdev->ddev, i);
diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c
index e274bb13866e..621646752cd2 100644
--- a/drivers/gpu/drm/radeon/radeon_encoders.c
+++ b/drivers/gpu/drm/radeon/radeon_encoders.c
@@ -241,9 +241,12 @@ atombios_dac_setup(struct drm_encoder *encoder, int action)
         struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
         DAC_ENCODER_CONTROL_PS_ALLOCATION args;
         int index = 0, num = 0;
-        /* fixme - fill in enc_priv for atom dac */
+        struct radeon_encoder_atom_dac *dac_info = radeon_encoder->enc_priv;
         enum radeon_tv_std tv_std = TV_STD_NTSC;
 
+        if (dac_info->tv_std)
+                tv_std = dac_info->tv_std;
+
         memset(&args, 0, sizeof(args));
 
         switch (radeon_encoder->encoder_id) {
@@ -296,9 +299,12 @@ atombios_tv_setup(struct drm_encoder *encoder, int action)
         struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
         TV_ENCODER_CONTROL_PS_ALLOCATION args;
         int index = 0;
-        /* fixme - fill in enc_priv for atom dac */
+        struct radeon_encoder_atom_dac *dac_info = radeon_encoder->enc_priv;
         enum radeon_tv_std tv_std = TV_STD_NTSC;
 
+        if (dac_info->tv_std)
+                tv_std = dac_info->tv_std;
+
         memset(&args, 0, sizeof(args));
 
         index = GetIndexIntoMasterTable(COMMAND, TVEncoderControl);
diff --git a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
index 0aaafcd2089f..b1547f700d73 100644
--- a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
+++ b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
@@ -1271,6 +1271,30 @@ static const struct drm_encoder_funcs radeon_legacy_tv_dac_enc_funcs = {
         .destroy = radeon_enc_destroy,
 };
 
+
+static struct radeon_encoder_int_tmds *radeon_legacy_get_tmds_info(struct radeon_encoder *encoder)
+{
+        struct drm_device *dev = encoder->base.dev;
+        struct radeon_device *rdev = dev->dev_private;
+        struct radeon_encoder_int_tmds *tmds = NULL;
+        bool ret;
+
+        tmds = kzalloc(sizeof(struct radeon_encoder_int_tmds), GFP_KERNEL);
+
+        if (!tmds)
+                return NULL;
+
+        if (rdev->is_atom_bios)
+                ret = radeon_atombios_get_tmds_info(encoder, tmds);
+        else
+                ret = radeon_legacy_get_tmds_info_from_combios(encoder, tmds);
+
+        if (ret == false)
+                radeon_legacy_get_tmds_info_from_table(encoder, tmds);
+
+        return tmds;
+}
+
 void
 radeon_add_legacy_encoder(struct drm_device *dev, uint32_t encoder_id, uint32_t supported_device)
 {
@@ -1317,10 +1341,7 @@ radeon_add_legacy_encoder(struct drm_device *dev, uint32_t encoder_id, uint32_t
         case ENCODER_OBJECT_ID_INTERNAL_TMDS1:
                 drm_encoder_init(dev, encoder, &radeon_legacy_tmds_int_enc_funcs, DRM_MODE_ENCODER_TMDS);
                 drm_encoder_helper_add(encoder, &radeon_legacy_tmds_int_helper_funcs);
-                if (rdev->is_atom_bios)
-                        radeon_encoder->enc_priv = radeon_atombios_get_tmds_info(radeon_encoder);
-                else
-                        radeon_encoder->enc_priv = radeon_combios_get_tmds_info(radeon_encoder);
+                radeon_encoder->enc_priv = radeon_legacy_get_tmds_info(radeon_encoder);
                 break;
         case ENCODER_OBJECT_ID_INTERNAL_DAC1:
                 drm_encoder_init(dev, encoder, &radeon_legacy_primary_dac_enc_funcs, DRM_MODE_ENCODER_DAC);
diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h
index dde13817dee0..570a58729daf 100644
--- a/drivers/gpu/drm/radeon/radeon_mode.h
+++ b/drivers/gpu/drm/radeon/radeon_mode.h
@@ -175,6 +175,15 @@ struct radeon_mode_info {
         enum radeon_connector_table connector_table;
         bool mode_config_initialized;
         struct radeon_crtc *crtcs[2];
+        /* DVI-I properties */
+        struct drm_property *coherent_mode_property;
+        /* DAC enable load detect */
+        struct drm_property *load_detect_property;
+        /* TV standard load detect */
+        struct drm_property *tv_std_property;
+        /* legacy TMDS PLL detect */
+        struct drm_property *tmds_pll_property;
+
 };
 
 struct radeon_native_mode {
@@ -304,6 +313,7 @@ struct radeon_connector {
            and get modes due to analog/digital/tvencoder */
         struct edid *edid;
         void *con_priv;
+        bool dac_load_detect;
 };
 
 struct radeon_framebuffer {
@@ -364,16 +374,18 @@ extern bool radeon_atom_get_clock_info(struct drm_device *dev);
 extern bool radeon_combios_get_clock_info(struct drm_device *dev);
 extern struct radeon_encoder_atom_dig *
 radeon_atombios_get_lvds_info(struct radeon_encoder *encoder);
-extern struct radeon_encoder_int_tmds *
-radeon_atombios_get_tmds_info(struct radeon_encoder *encoder);
+bool radeon_atombios_get_tmds_info(struct radeon_encoder *encoder,
+                                   struct radeon_encoder_int_tmds *tmds);
+bool radeon_legacy_get_tmds_info_from_combios(struct radeon_encoder *encoder,
+                                           struct radeon_encoder_int_tmds *tmds);
+bool radeon_legacy_get_tmds_info_from_table(struct radeon_encoder *encoder,
+                                            struct radeon_encoder_int_tmds *tmds);
 extern struct radeon_encoder_primary_dac *
 radeon_atombios_get_primary_dac_info(struct radeon_encoder *encoder);
 extern struct radeon_encoder_tv_dac *
 radeon_atombios_get_tv_dac_info(struct radeon_encoder *encoder);
 extern struct radeon_encoder_lvds *
 radeon_combios_get_lvds_info(struct radeon_encoder *encoder);
-extern struct radeon_encoder_int_tmds *
-radeon_combios_get_tmds_info(struct radeon_encoder *encoder);
 extern void radeon_combios_get_ext_tmds_info(struct radeon_encoder *encoder);
 extern struct radeon_encoder_tv_dac *
 radeon_combios_get_tv_dac_info(struct radeon_encoder *encoder);