drm/kms: start adding command line interface using fb.

[note this requires an fb patch posted to linux-fbdev-devel already]

This uses the normal video= command line option to control the kms
output setup at boot time. It is used to override the autodetection
done by kms.

video= normally takes a framebuffer as the first parameter, in kms
it will take a connector name, DVI-I-1, or LVDS-1 etc. If no output
connector is specified the mode string will apply to all connectors.

The mode specification used will match down the probed modes, and if
no mode is found it will add a CVT mode that matches.

video=1024x768 - all connectors match a 1024x768 mode or add a CVT on
video=VGA-1:1024x768, VGA-1 connector gets mode only.

The same strings as used in current fb modedb.c are used, except I've
added three more letters, e, D, d, e = enable, D = enable Digital,
d = disable, which allow a connector to be forced into a certain state.

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

2 files changed, 43 insertions, 8 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
index f8cb8b4e2b17..db155d5e60ce 100644
--- a/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
@@ -26,6 +26,7 @@
 #include "drmP.h"
 #include "drm_edid.h"
 #include "drm_crtc_helper.h"
+#include "drm_fb_helper.h"
 #include "radeon_drm.h"
 #include "radeon.h"
 #include "atom.h"
@@ -245,7 +246,7 @@ static void radeon_add_common_modes(struct drm_encoder *encoder, struct drm_conn
                 if (common_modes[i].w < 320 || common_modes[i].h < 200)
                         continue;
 
-                mode = drm_cvt_mode(dev, common_modes[i].w, common_modes[i].h, 60, false, false);
+                mode = drm_cvt_mode(dev, common_modes[i].w, common_modes[i].h, 60, false, false, false);
                 drm_mode_probed_add(connector, mode);
         }
 }
@@ -559,7 +560,7 @@ static int radeon_tv_get_modes(struct drm_connector *connector)
                 radeon_add_common_modes(encoder, connector);
         else {
                 /* only 800x600 is supported right now on pre-avivo chips */
-                tv_mode = drm_cvt_mode(dev, 800, 600, 60, false, false);
+                tv_mode = drm_cvt_mode(dev, 800, 600, 60, false, false, false);
                 tv_mode->type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED;
                 drm_mode_probed_add(connector, tv_mode);
         }
@@ -743,6 +744,15 @@ struct drm_encoder *radeon_dvi_encoder(struct drm_connector *connector)
         return NULL;
 }
 
+static void radeon_dvi_force(struct drm_connector *connector)
+{
+        struct radeon_connector *radeon_connector = to_radeon_connector(connector);
+        if (connector->force == DRM_FORCE_ON)
+                radeon_connector->use_digital = false;
+        if (connector->force == DRM_FORCE_ON_DIGITAL)
+                radeon_connector->use_digital = true;
+}
+
 struct drm_connector_helper_funcs radeon_dvi_connector_helper_funcs = {
         .get_modes = radeon_dvi_get_modes,
         .mode_valid = radeon_vga_mode_valid,
@@ -755,6 +765,7 @@ struct drm_connector_funcs radeon_dvi_connector_funcs = {
         .fill_modes = drm_helper_probe_single_connector_modes,
         .set_property = radeon_connector_set_property,
         .destroy = radeon_connector_destroy,
+        .force = radeon_dvi_force,
 };
 
 void
@@ -771,6 +782,7 @@ radeon_add_atom_connector(struct drm_device *dev,
         struct radeon_connector *radeon_connector;
         struct radeon_connector_atom_dig *radeon_dig_connector;
         uint32_t subpixel_order = SubPixelNone;
+        int ret;
 
         /* fixme - tv/cv/din */
         if (connector_type == DRM_MODE_CONNECTOR_Unknown)
@@ -914,6 +926,10 @@ radeon_add_atom_connector(struct drm_device *dev,
                 break;
         }
 
+        ret = drm_fb_helper_add_connector(connector);
+        if (ret)
+                goto failed;
+
         connector->display_info.subpixel_order = subpixel_order;
         drm_sysfs_connector_add(connector);
         return;
@@ -936,6 +952,7 @@ radeon_add_legacy_connector(struct drm_device *dev,
         struct drm_connector *connector;
         struct radeon_connector *radeon_connector;
         uint32_t subpixel_order = SubPixelNone;
+        int ret;
 
         /* fixme - tv/cv/din */
         if (connector_type == DRM_MODE_CONNECTOR_Unknown)
@@ -1027,6 +1044,10 @@ radeon_add_legacy_connector(struct drm_device *dev,
                 break;
         }
 
+        ret = drm_fb_helper_add_connector(connector);
+        if (ret)
+                goto failed;
+
         connector->display_info.subpixel_order = subpixel_order;
         drm_sysfs_connector_add(connector);
         return;
diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c
index 944e4fa78db5..1ba704eedefb 100644
--- a/drivers/gpu/drm/radeon/radeon_fb.c
+++ b/drivers/gpu/drm/radeon/radeon_fb.c
@@ -128,6 +128,7 @@ static struct drm_fb_helper_funcs radeon_fb_helper_funcs = {
 int radeonfb_create(struct drm_device *dev,
                     uint32_t fb_width, uint32_t fb_height,
                     uint32_t surface_width, uint32_t surface_height,
+                    uint32_t surface_depth, uint32_t surface_bpp,
                     struct drm_framebuffer **fb_p)
 {
         struct radeon_device *rdev = dev->dev_private;
@@ -148,10 +149,10 @@ int radeonfb_create(struct drm_device *dev,
 
         mode_cmd.width = surface_width;
         mode_cmd.height = surface_height;
-        mode_cmd.bpp = 32;
+        mode_cmd.bpp = surface_bpp;
         /* need to align pitch with crtc limits */
         mode_cmd.pitch = radeon_align_pitch(rdev, mode_cmd.width, mode_cmd.bpp, fb_tiled) * ((mode_cmd.bpp + 1) / 8);
-        mode_cmd.depth = 24;
+        mode_cmd.depth = surface_depth;
 
         size = mode_cmd.pitch * mode_cmd.height;
         aligned_size = ALIGN(size, PAGE_SIZE);
@@ -290,13 +291,26 @@ out:
         return ret;
 }
 
+static char *mode_option;
+int radeon_parse_options(char *options)
+{
+        char *this_opt;
+
+        if (!options || !*options)
+                return 0;
+
+        while ((this_opt = strsep(&options, ",")) != NULL) {
+                if (!*this_opt)
+                        continue;
+                mode_option = this_opt;
+        }
+        return 0;
+}
+
 int radeonfb_probe(struct drm_device *dev)
 {
-        int ret;
-        ret = drm_fb_helper_single_fb_probe(dev, &radeonfb_create);
-        return ret;
+        return drm_fb_helper_single_fb_probe(dev, &radeonfb_create);
 }
-EXPORT_SYMBOL(radeonfb_probe);
 
 int radeonfb_remove(struct drm_device *dev, struct drm_framebuffer *fb)
 {