drm/qxl: video mode tweaks
Subsystems (4)
Gerd Hoffmann
maintainercover drm/qxl: video mode tweaks
Gerd Hoffmann (3):
drm/qxl: add mode/framebuffer check functions
drm/qxl: add qxl_add_mode helper function
drm/qxl: use kernel mode db
drivers/gpu/drm/qxl/qxl_display.c | 138 +++++++++++++++++++------------------- 1 file changed, 70 insertions(+), 68 deletions(-)
Signature · 6 lines
2.9.3 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Gerd Hoffmann
maintainerPATCH 1/3 drm/qxl: add mode/framebuffer check functions
Add a helper functions to check video modes. Also add a helper to check framebuffer buffer objects, using the former for consistency. That way we should not fail in qxl_primary_atomic_check() because video modes which are too big will not be added to the mode list in the first place.
--- drivers/gpu/drm/qxl/qxl_display.c | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-)
drivers/gpu/drm/qxl/qxl_display.c +19 -18
@@ -191,6 +191,21 @@ void qxl_display_read_client_monitors_config(struct qxl_device *qdev) } } +static int qxl_check_mode (struct qxl_device *qdev, +unsigned int width, +unsigned int height) +{ +if (width * height *4 > qdev->vram_size) +return -ENOMEM ; +return 0 ; +} + +static int qxl_check_framebuffer (struct qxl_device *qdev, +struct qxl_bo *bo) +{ +return qxl_check_mode (qdev, bo->surf.width, bo->surf.height); +} +static int qxl_add_monitors_config_modes (struct drm_connector *connector,unsigned *pwidth,unsigned *pheight)
@@ -466,12 +481,7 @@ static int qxl_primary_atomic_check(struct drm_plane *plane, bo =gem_to_qxl_bo (state->fb->obj[0 ]); -if (bo->surf.stride * bo->surf.height > qdev->vram_size) { -DRM_ERROR ("Mode doesn't fit in vram size (vgamem)" ); -return -EINVAL ; - } - -return 0 ; +return qxl_check_framebuffer (qdev, bo); }static int qxl_primary_apply_cursor (struct drm_plane *plane)
@@ -941,20 +951,11 @@ static enum drm_mode_status qxl_conn_mode_valid(struct drm_connector *connector, {struct drm_device *ddev = connector->dev;struct qxl_device *qdev = ddev->dev_private; -int i; -/* TODO: is this called for user defined modes? (xrandr --add-mode) -* TODO: check that the mode fits in the framebuffer */ +if (qxl_check_mode (qdev, mode->hdisplay, mode->vdisplay) !=0 ) +return MODE_BAD ; -if (qdev->monitors_config_width == mode->hdisplay && - qdev->monitors_config_height == mode->vdisplay) -return MODE_OK ; - -for (i =0 ; i <ARRAY_SIZE (common_modes); i++) { -if (common_modes[i].w == mode->hdisplay && common_modes[i].h == mode->vdisplay) -return MODE_OK ; - } -return MODE_BAD ; +return MODE_OK ; }static struct drm_encoder *qxl_best_encoder (struct drm_connector *connector)
Signature · 1 line
2.9.3
Re: [Spice-devel] [PATCH 1/3] drm/qxl: add mode/framebuffer check functions
Quoted 17 lines
Add a helper functions to check video modes. Also add a helper to check framebuffer buffer objects, using the former for consistency. That way we should not fail in
qxl_primary_atomic_check()because video modes which are too big will not be added to the mode list in the first place.Signed-off-by Gerd Hoffmann <[email protected]>--- drivers/gpu/drm/qxl/qxl_display.c | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-)drivers/gpu/drm/qxl/qxl_display.c +0
-0
drivers/gpu/drm/qxl/qxl_display.c void qxl_display_read_client_monitors_config(struct · line 199
Quoted 9 lines
drivers/gpu/drm/qxl/qxl_display.c +5
-0@@ -191,6 +191,21 @@ void qxl_display_read_client_monitors_config(struct qxl_device *qdev) } } +static int qxl_check_mode (struct qxl_device *qdev, +unsigned int width, +unsigned int height) +{ +if (width * height *4 > qdev->vram_size)
Is someone checking for integer overflows already?
Quoted 53 lines
drivers/gpu/drm/qxl/qxl_display.c +10
-0+return -ENOMEM ; +return 0 ; +} + +static int qxl_check_framebuffer (struct qxl_device *qdev, +struct qxl_bo *bo) +{ +return qxl_check_mode (qdev, bo->surf.width, bo->surf.height); +} + static int qxl_add_monitors_config_modes(struct drm_connector *connector, unsigned *pwidth,unsigned *pheight)
drivers/gpu/drm/qxl/qxl_display.c +1
-6@@ -466,12 +481,7 @@ static int qxl_primary_atomic_check(struct drm_plane *plane, bo =gem_to_qxl_bo (state->fb->obj[0 ]); -if (bo->surf.stride * bo->surf.height > qdev->vram_size) { -DRM_ERROR ("Mode doesn't fit in vram size (vgamem)" ); -return -EINVAL ; - } - -return 0 ; +return qxl_check_framebuffer (qdev, bo); }static int
qxl_primary_apply_cursor(struct drm_plane *plane)drivers/gpu/drm/qxl/qxl_display.c +3
-12@@ -941,20 +951,11 @@ static enum drm_mode_status qxl_conn_mode_valid(struct drm_connector *connector, {struct drm_device *ddev = connector->dev;struct qxl_device *qdev = ddev->dev_private; -int i; -/* TODO: is this called for user defined modes? (xrandr --add-mode) -* TODO: check that the mode fits in the framebuffer */ +if (qxl_check_mode (qdev, mode->hdisplay, mode->vdisplay) !=0 ) +return MODE_BAD ; -if (qdev->monitors_config_width == mode->hdisplay && - qdev->monitors_config_height == mode->vdisplay) -return MODE_OK ; - -for (i =0 ; i <ARRAY_SIZE (common_modes); i++) { -if (common_modes[i].w == mode->hdisplay && common_modes[i].h == mode->vdisplay) -return MODE_OK ; - } -return MODE_BAD ; +return MODE_OK ; }
Quoted 1 line
static struct
drm_encoder*qxl_best_encoder(structdrm_connector*connector)
Frediano
_______________________________________________
Spice-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/spice-devel
Gerd Hoffmann
maintainerRe: [Spice-devel] [PATCH 1/3] drm/qxl: add mode/framebuffer check functions
Quoted 7 lines
drivers/gpu/drm/qxl/qxl_display.c void qxl_display_read_client_monitors_config(struct qxl_device *qdev) · line 198
Quoted 5 lines
drivers/gpu/drm/qxl/qxl_display.c +5
-0+static int qxl_check_mode (struct qxl_device *qdev, +unsigned int width, +unsigned int height) +{ +if (width * height *4 > qdev->vram_size)Is someone checking for integer overflows already?
Need to have a look. This is just ...
Quoted 4 lines
drivers/gpu/drm/qxl/qxl_display.c static int qxl_primary_atomic_check(struct drm_plane *plane, · line 472
Quoted 4 lines
drivers/gpu/drm/qxl/qxl_display.c +0
-4-if (bo->surf.stride * bo->surf.height > qdev->vram_size) { -DRM_ERROR ("Mode doesn't fit in vram size (vgamem)" ); -return -EINVAL ; - }
... that check moved into the new function.
cheers,
Gerd
Re: [Spice-devel] [PATCH 1/3] drm/qxl: add mode/framebuffer check functions
Quoted 9 lines · Gerd Hoffmann
Quoted 7 lines
drivers/gpu/drm/qxl/qxl_display.c void qxl_display_read_client_monitors_config(struct qxl_device *qdev) · line 198
Quoted 5 lines
drivers/gpu/drm/qxl/qxl_display.c +5
-0+static int qxl_check_mode (struct qxl_device *qdev, +unsigned int width, +unsigned int height) +{ +if (width * height *4 > qdev->vram_size)Is someone checking for integer overflows already?
Need to have a look. This is just ...
The addfb ioctl checks for integer overflows for you. -Daniel
Quoted 11 lines
Quoted 5 lines
drivers/gpu/drm/qxl/qxl_display.c static int qxl_primary_atomic_check(struct drm_plane *plane, · line 472
Quoted 5 lines
drivers/gpu/drm/qxl/qxl_display.c +0
-4-if (bo->surf.stride * bo->surf.height > qdev->vram_size) { -DRM_ERROR ("Mode doesn't fit in vram size (vgamem)" ); -return -EINVAL ; - }... that check moved into the new function.
cheers,
Gerd
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [Spice-devel] [PATCH 1/3] drm/qxl: add mode/framebuffer check functions
In reply to Gerd HoffmannQuoted 9 lines · Gerd Hoffmann
Quoted 7 lines
drivers/gpu/drm/qxl/qxl_display.c void qxl_display_read_client_monitors_config(struct qxl_device *qdev) · line 198
Quoted 5 lines
drivers/gpu/drm/qxl/qxl_display.c +5
-0+static int qxl_check_mode (struct qxl_device *qdev, +unsigned int width, +unsigned int height) +{ +if (width * height *4 > qdev->vram_size)Is someone checking for integer overflows already?
Need to have a look. This is just ...
The addfb ioctl checks for integer overflows for you. -Daniel
Quoted 11 lines
Quoted 5 lines
drivers/gpu/drm/qxl/qxl_display.c static int qxl_primary_atomic_check(struct drm_plane *plane, · line 472
Quoted 5 lines
drivers/gpu/drm/qxl/qxl_display.c +0
-4-if (bo->surf.stride * bo->surf.height > qdev->vram_size) { -DRM_ERROR ("Mode doesn't fit in vram size (vgamem)" ); -return -EINVAL ; - }... that check moved into the new function.
cheers,
Gerd
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Gerd Hoffmann
maintainerRe: [Spice-devel] [PATCH 1/3] drm/qxl: add mode/framebuffer check functions
In reply to Frediano ZiglioQuoted 7 lines
drivers/gpu/drm/qxl/qxl_display.c void qxl_display_read_client_monitors_config(struct qxl_device *qdev) · line 198
Quoted 5 lines
drivers/gpu/drm/qxl/qxl_display.c +5
-0+static int qxl_check_mode (struct qxl_device *qdev, +unsigned int width, +unsigned int height) +{ +if (width * height *4 > qdev->vram_size)Is someone checking for integer overflows already?
Need to have a look. This is just ...
Quoted 4 lines
drivers/gpu/drm/qxl/qxl_display.c static int qxl_primary_atomic_check(struct drm_plane *plane, · line 472
Quoted 4 lines
drivers/gpu/drm/qxl/qxl_display.c +0
-4-if (bo->surf.stride * bo->surf.height > qdev->vram_size) { -DRM_ERROR ("Mode doesn't fit in vram size (vgamem)" ); -return -EINVAL ; - }
... that check moved into the new function.
cheers,
Gerd
Gerd Hoffmann
maintainerPATCH 1/3 drm/qxl: add mode/framebuffer check functions
In reply to Gerd HoffmannAdd a helper functions to check video modes. Also add a helper to check framebuffer buffer objects, using the former for consistency. That way we should not fail in qxl_primary_atomic_check() because video modes which are too big will not be added to the mode list in the first place.
--- drivers/gpu/drm/qxl/qxl_display.c | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-)
drivers/gpu/drm/qxl/qxl_display.c +19 -18
@@ -191,6 +191,21 @@ void qxl_display_read_client_monitors_config(struct qxl_device *qdev) } } +static int qxl_check_mode (struct qxl_device *qdev, +unsigned int width, +unsigned int height) +{ +if (width * height *4 > qdev->vram_size) +return -ENOMEM ; +return 0 ; +} + +static int qxl_check_framebuffer (struct qxl_device *qdev, +struct qxl_bo *bo) +{ +return qxl_check_mode (qdev, bo->surf.width, bo->surf.height); +} +static int qxl_add_monitors_config_modes (struct drm_connector *connector,unsigned *pwidth,unsigned *pheight)
@@ -466,12 +481,7 @@ static int qxl_primary_atomic_check(struct drm_plane *plane, bo =gem_to_qxl_bo (state->fb->obj[0 ]); -if (bo->surf.stride * bo->surf.height > qdev->vram_size) { -DRM_ERROR ("Mode doesn't fit in vram size (vgamem)" ); -return -EINVAL ; - } - -return 0 ; +return qxl_check_framebuffer (qdev, bo); }static int qxl_primary_apply_cursor (struct drm_plane *plane)
@@ -941,20 +951,11 @@ static enum drm_mode_status qxl_conn_mode_valid(struct drm_connector *connector, {struct drm_device *ddev = connector->dev;struct qxl_device *qdev = ddev->dev_private; -int i; -/* TODO: is this called for user defined modes? (xrandr --add-mode) -* TODO: check that the mode fits in the framebuffer */ +if (qxl_check_mode (qdev, mode->hdisplay, mode->vdisplay) !=0 ) +return MODE_BAD ; -if (qdev->monitors_config_width == mode->hdisplay && - qdev->monitors_config_height == mode->vdisplay) -return MODE_OK ; - -for (i =0 ; i <ARRAY_SIZE (common_modes); i++) { -if (common_modes[i].w == mode->hdisplay && common_modes[i].h == mode->vdisplay) -return MODE_OK ; - } -return MODE_BAD ; +return MODE_OK ; }static struct drm_encoder *qxl_best_encoder (struct drm_connector *connector)
Signature · 1 line
2.9.3
Gerd Hoffmann
maintainerPATCH 2/3 drm/qxl: add qxl_add_mode helper function
In reply to Gerd HoffmannAdd a helper function to add custom video modes to a connector.
--- drivers/gpu/drm/qxl/qxl_display.c | 84 +++++++++++++++++++++++---------------- 1 file changed, 49 insertions(+), 35 deletions(-)
drivers/gpu/drm/qxl/qxl_display.c +49 -35
@@ -206,15 +206,36 @@ static int qxl_check_framebuffer(struct qxl_device *qdev,return qxl_check_mode (qdev, bo->surf.width, bo->surf.height); } -static int qxl_add_monitors_config_modes (struct drm_connector *connector, -unsigned *pwidth, -unsigned *pheight) +static int qxl_add_mode (struct drm_connector *connector, +unsigned int width, +unsigned int height, +bool preferred) +{ +struct drm_device *dev = connector->dev; +struct qxl_device *qdev = dev->dev_private; +struct drm_display_mode *mode =NULL ; +int rc; + + rc =qxl_check_mode (qdev, width, height); +if (rc !=0 ) +return 0 ; + + mode =drm_cvt_mode (dev, width, height,60 , false, false, false); +if (preferred) + mode->type |=DRM_MODE_TYPE_PREFERRED ; + mode->hdisplay = width; + mode->vdisplay = height; +drm_mode_set_name (mode); +drm_mode_probed_add (connector, mode); +return 1 ; +} + +static int qxl_add_monitors_config_modes (struct drm_connector *connector) {struct drm_device *dev = connector->dev;struct qxl_device *qdev = dev->dev_private;struct qxl_output *output =drm_connector_to_qxl_output (connector);int h = output->index; -struct drm_display_mode *mode =NULL ;struct qxl_head *head;if (!qdev->monitors_config)
@@ -229,19 +250,7 @@ static int qxl_add_monitors_config_modes(struct drm_connector *connector, head = &qdev->client_monitors_config->heads[h];DRM_DEBUG_KMS ("head %d is %dx%d\n" , h, head->width, head->height); - mode =drm_cvt_mode (dev, head->width, head->height,60 , false, false, - false); - mode->type |=DRM_MODE_TYPE_PREFERRED ; - mode->hdisplay = head->width; - mode->vdisplay = head->height; -drm_mode_set_name (mode); - *pwidth = head->width; - *pheight = head->height; -drm_mode_probed_add (connector, mode); -/* remember the last custom size for mode validation */ - qdev->monitors_config_width = mode->hdisplay; - qdev->monitors_config_height = mode->vdisplay; -return 1 ; +return qxl_add_mode (connector, head->width, head->height, true); } static struct mode_size {
@@ -267,22 +276,16 @@ static struct mode_size { {1920, 1200} }; -static int qxl_add_common_modes (struct drm_connector *connector, -unsigned int pwidth, -unsigned int pheight) +static int qxl_add_common_modes (struct drm_connector *connector) { -struct drm_device *dev = connector->dev; -struct drm_display_mode *mode =NULL ; -int i; +int i, ret =0 ; -for (i =0 ; i <ARRAY_SIZE (common_modes); i++) { - mode =drm_cvt_mode (dev, common_modes[i].w, common_modes[i].h, -60 , false, false, false); -if (common_modes[i].w == pwidth && common_modes[i].h == pheight) - mode->type |=DRM_MODE_TYPE_PREFERRED ; -drm_mode_probed_add (connector, mode); - } -return i -1 ; +for (i =0 ; i <ARRAY_SIZE (common_modes); i++) + ret +=qxl_add_mode (connector, + common_modes[i].w, + common_modes[i].h, + false); +return ret; }static void qxl_send_monitors_config (struct qxl_device *qdev)
@@ -935,14 +938,25 @@ static int qdev_crtc_init(struct drm_device *dev, int crtc_id)static int qxl_conn_get_modes (struct drm_connector *connector) { +struct drm_device *dev = connector->dev; +struct qxl_device *qdev = dev->dev_private; +struct qxl_output *output =drm_connector_to_qxl_output (connector);unsigned int pwidth =1024 ;unsigned int pheight =768 ;int ret =0 ; - ret =qxl_add_monitors_config_modes (connector, &pwidth, &pheight); -if (ret <0 ) -return ret; - ret +=qxl_add_common_modes (connector, pwidth, pheight); +if (qdev->client_monitors_config) { +struct qxl_head *head; + head = &qdev->client_monitors_config->heads[output->index]; +if (head->width) + pwidth = head->width; +if (head->height) + pheight = head->height; + } + + ret +=qxl_add_common_modes (connector); + ret +=qxl_add_monitors_config_modes (connector); +drm_set_preferred_mode (connector, pwidth, pheight);return ret; }
Signature · 6 lines
2.9.3 _______________________________________________ Spice-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/spice-devel
Gerd Hoffmann
maintainerPATCH 2/3 drm/qxl: add qxl_add_mode helper function
In reply to Gerd HoffmannAdd a helper function to add custom video modes to a connector.
--- drivers/gpu/drm/qxl/qxl_display.c | 84 +++++++++++++++++++++++---------------- 1 file changed, 49 insertions(+), 35 deletions(-)
drivers/gpu/drm/qxl/qxl_display.c +49 -35
@@ -206,15 +206,36 @@ static int qxl_check_framebuffer(struct qxl_device *qdev,return qxl_check_mode (qdev, bo->surf.width, bo->surf.height); } -static int qxl_add_monitors_config_modes (struct drm_connector *connector, -unsigned *pwidth, -unsigned *pheight) +static int qxl_add_mode (struct drm_connector *connector, +unsigned int width, +unsigned int height, +bool preferred) +{ +struct drm_device *dev = connector->dev; +struct qxl_device *qdev = dev->dev_private; +struct drm_display_mode *mode =NULL ; +int rc; + + rc =qxl_check_mode (qdev, width, height); +if (rc !=0 ) +return 0 ; + + mode =drm_cvt_mode (dev, width, height,60 , false, false, false); +if (preferred) + mode->type |=DRM_MODE_TYPE_PREFERRED ; + mode->hdisplay = width; + mode->vdisplay = height; +drm_mode_set_name (mode); +drm_mode_probed_add (connector, mode); +return 1 ; +} + +static int qxl_add_monitors_config_modes (struct drm_connector *connector) {struct drm_device *dev = connector->dev;struct qxl_device *qdev = dev->dev_private;struct qxl_output *output =drm_connector_to_qxl_output (connector);int h = output->index; -struct drm_display_mode *mode =NULL ;struct qxl_head *head;if (!qdev->monitors_config)
@@ -229,19 +250,7 @@ static int qxl_add_monitors_config_modes(struct drm_connector *connector, head = &qdev->client_monitors_config->heads[h];DRM_DEBUG_KMS ("head %d is %dx%d\n" , h, head->width, head->height); - mode =drm_cvt_mode (dev, head->width, head->height,60 , false, false, - false); - mode->type |=DRM_MODE_TYPE_PREFERRED ; - mode->hdisplay = head->width; - mode->vdisplay = head->height; -drm_mode_set_name (mode); - *pwidth = head->width; - *pheight = head->height; -drm_mode_probed_add (connector, mode); -/* remember the last custom size for mode validation */ - qdev->monitors_config_width = mode->hdisplay; - qdev->monitors_config_height = mode->vdisplay; -return 1 ; +return qxl_add_mode (connector, head->width, head->height, true); } static struct mode_size {
@@ -267,22 +276,16 @@ static struct mode_size { {1920, 1200} }; -static int qxl_add_common_modes (struct drm_connector *connector, -unsigned int pwidth, -unsigned int pheight) +static int qxl_add_common_modes (struct drm_connector *connector) { -struct drm_device *dev = connector->dev; -struct drm_display_mode *mode =NULL ; -int i; +int i, ret =0 ; -for (i =0 ; i <ARRAY_SIZE (common_modes); i++) { - mode =drm_cvt_mode (dev, common_modes[i].w, common_modes[i].h, -60 , false, false, false); -if (common_modes[i].w == pwidth && common_modes[i].h == pheight) - mode->type |=DRM_MODE_TYPE_PREFERRED ; -drm_mode_probed_add (connector, mode); - } -return i -1 ; +for (i =0 ; i <ARRAY_SIZE (common_modes); i++) + ret +=qxl_add_mode (connector, + common_modes[i].w, + common_modes[i].h, + false); +return ret; }static void qxl_send_monitors_config (struct qxl_device *qdev)
@@ -935,14 +938,25 @@ static int qdev_crtc_init(struct drm_device *dev, int crtc_id)static int qxl_conn_get_modes (struct drm_connector *connector) { +struct drm_device *dev = connector->dev; +struct qxl_device *qdev = dev->dev_private; +struct qxl_output *output =drm_connector_to_qxl_output (connector);unsigned int pwidth =1024 ;unsigned int pheight =768 ;int ret =0 ; - ret =qxl_add_monitors_config_modes (connector, &pwidth, &pheight); -if (ret <0 ) -return ret; - ret +=qxl_add_common_modes (connector, pwidth, pheight); +if (qdev->client_monitors_config) { +struct qxl_head *head; + head = &qdev->client_monitors_config->heads[output->index]; +if (head->width) + pwidth = head->width; +if (head->height) + pheight = head->height; + } + + ret +=qxl_add_common_modes (connector); + ret +=qxl_add_monitors_config_modes (connector); +drm_set_preferred_mode (connector, pwidth, pheight);return ret; }
Signature · 1 line
2.9.3
Gerd Hoffmann
maintainerPATCH 3/3 drm/qxl: use kernel mode db
In reply to Gerd HoffmannAdd all standard modes from the kernel's video mode data base. Keep a few non-standard modes in the qxl mode list.
--- drivers/gpu/drm/qxl/qxl_display.c | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-)
drivers/gpu/drm/qxl/qxl_display.c +7 -20
@@ -256,34 +256,20 @@ static int qxl_add_monitors_config_modes(struct drm_connector *connector)static struct mode_size {int w;int h; -} common_modes[] = { - {640 ,480 }, +} extra_modes[] = { {720 ,480 }, - {800 ,600 }, - {848 ,480 }, - {1024 ,768 }, {1152 ,768 }, - {1280 ,720 }, - {1280 ,800 }, {1280 ,854 }, - {1280 ,960 }, - {1280 ,1024 }, - {1440 ,900 }, - {1400 ,1050 }, - {1680 ,1050 }, - {1600 ,1200 }, - {1920 ,1080 }, - {1920 ,1200 } }; -static int qxl_add_common_modes (struct drm_connector *connector) +static int qxl_add_extra_modes (struct drm_connector *connector) {int i, ret =0 ; -for (i =0 ; i <ARRAY_SIZE (common_modes); i++) +for (i =0 ; i <ARRAY_SIZE (extra_modes); i++) ret +=qxl_add_mode (connector, - common_modes[i].w, - common_modes[i].h, + extra_modes[i].w, + extra_modes[i].h, false);return ret; }
@@ -954,7 +940,8 @@ static int qxl_conn_get_modes(struct drm_connector *connector) pheight = head->height; } - ret +=qxl_add_common_modes (connector); + ret +=drm_add_modes_noedid (connector,8192 ,8192 ); + ret +=qxl_add_extra_modes (connector); ret +=qxl_add_monitors_config_modes (connector);drm_set_preferred_mode (connector, pwidth, pheight);return ret;
Signature · 6 lines
2.9.3 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Gerd Hoffmann
maintainerPATCH 3/3 drm/qxl: use kernel mode db
In reply to Gerd HoffmannAdd all standard modes from the kernel's video mode data base. Keep a few non-standard modes in the qxl mode list.
--- drivers/gpu/drm/qxl/qxl_display.c | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-)
drivers/gpu/drm/qxl/qxl_display.c +7 -20
@@ -256,34 +256,20 @@ static int qxl_add_monitors_config_modes(struct drm_connector *connector)static struct mode_size {int w;int h; -} common_modes[] = { - {640 ,480 }, +} extra_modes[] = { {720 ,480 }, - {800 ,600 }, - {848 ,480 }, - {1024 ,768 }, {1152 ,768 }, - {1280 ,720 }, - {1280 ,800 }, {1280 ,854 }, - {1280 ,960 }, - {1280 ,1024 }, - {1440 ,900 }, - {1400 ,1050 }, - {1680 ,1050 }, - {1600 ,1200 }, - {1920 ,1080 }, - {1920 ,1200 } }; -static int qxl_add_common_modes (struct drm_connector *connector) +static int qxl_add_extra_modes (struct drm_connector *connector) {int i, ret =0 ; -for (i =0 ; i <ARRAY_SIZE (common_modes); i++) +for (i =0 ; i <ARRAY_SIZE (extra_modes); i++) ret +=qxl_add_mode (connector, - common_modes[i].w, - common_modes[i].h, + extra_modes[i].w, + extra_modes[i].h, false);return ret; }
@@ -954,7 +940,8 @@ static int qxl_conn_get_modes(struct drm_connector *connector) pheight = head->height; } - ret +=qxl_add_common_modes (connector); + ret +=drm_add_modes_noedid (connector,8192 ,8192 ); + ret +=qxl_add_extra_modes (connector); ret +=qxl_add_monitors_config_modes (connector);drm_set_preferred_mode (connector, pwidth, pheight);return ret;
Signature · 1 line
2.9.3