diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2013-10-11 10:01:09 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-11-06 13:36:19 +1000 |
| commit | 121a6a17439b000b9699c3fa876636db20fa4107 (patch) | |
| tree | 21f82542ba40531df4a8d882cd7a885d67e89dfd /drivers/gpu/drm | |
| parent | 3cf70dafd7bbbc91df0a9ecb081d46f9f3d867f6 (diff) | |
| download | blackbird-op-linux-121a6a17439b000b9699c3fa876636db20fa4107.tar.gz blackbird-op-linux-121a6a17439b000b9699c3fa876636db20fa4107.zip | |
drm/cirrus: use drm_set_preferred_mode
Explicitly set 1024x768 as default mode, so the display doesn't come up
with the largest supported mode.
While being at it drop first three drm_add_modes_noedid calls. As
drm_add_modes_noedid fills the mode list with modes from the database
*up to* the specified size it is pretty pointless to call it multiple
times with different sizes.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/cirrus/cirrus_mode.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/gpu/drm/cirrus/cirrus_mode.c b/drivers/gpu/drm/cirrus/cirrus_mode.c index 60685b21cc36..adabc3daaa5b 100644 --- a/drivers/gpu/drm/cirrus/cirrus_mode.c +++ b/drivers/gpu/drm/cirrus/cirrus_mode.c @@ -494,13 +494,12 @@ static struct drm_encoder *cirrus_encoder_init(struct drm_device *dev) int cirrus_vga_get_modes(struct drm_connector *connector) { - /* Just add a static list of modes */ - drm_add_modes_noedid(connector, 640, 480); - drm_add_modes_noedid(connector, 800, 600); - drm_add_modes_noedid(connector, 1024, 768); - drm_add_modes_noedid(connector, 1280, 1024); + int count; - return 4; + /* Just add a static list of modes */ + count = drm_add_modes_noedid(connector, 1280, 1024); + drm_set_preferred_mode(connector, 1024, 768); + return count; } static int cirrus_vga_mode_valid(struct drm_connector *connector, |
