Skip to content

Commit

Permalink
drm/qxl: add support for > 1 output
Browse files Browse the repository at this point in the history 
This adds support for a default of 4 heads, with a command line
parameter to change the default number.

It also overhauls the modesetting code to handle this case properly,
and send the correct things to the hardware at the right time.

Signed-off-by: Dave Airlie <airlied@redhat.com>
  • Loading branch information
Dave Airlie committed Jul 5, 2013
1 parent 5b8788c commit 07f8d9b
Show file tree
Hide file tree
Showing 5 changed files with 85 additions and 58 deletions.
8 changes: 4 additions & 4 deletions drivers/gpu/drm/qxl/qxl_cmd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -375,17 +375,17 @@ void qxl_io_destroy_primary(struct qxl_device *qdev)
wait_for_io_cmd(qdev, 0, QXL_IO_DESTROY_PRIMARY_ASYNC);
}

void qxl_io_create_primary(struct qxl_device *qdev, unsigned width,
unsigned height, unsigned offset, struct qxl_bo *bo)
void qxl_io_create_primary(struct qxl_device *qdev,
unsigned offset, struct qxl_bo *bo)
{
struct qxl_surface_create *create;

QXL_INFO(qdev, "%s: qdev %p, ram_header %p\n", __func__, qdev,
qdev->ram_header);
create = &qdev->ram_header->create_surface;
create->format = bo->surf.format;
create->width = width;
create->height = height;
create->width = bo->surf.width;
create->height = bo->surf.height;
create->stride = bo->surf.stride;
create->mem = qxl_bo_physical_address(qdev, bo, offset);

Expand Down
121 changes: 72 additions & 49 deletions drivers/gpu/drm/qxl/qxl_display.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@
#include "qxl_object.h"
#include "drm_crtc_helper.h"

static bool qxl_head_enabled(struct qxl_head *head)
{
return head->width && head->height;
}

void qxl_alloc_client_monitors_config(struct qxl_device *qdev, unsigned count)
{
if (qdev->client_monitors_config &&
Expand Down Expand Up @@ -57,7 +62,6 @@ static int qxl_display_copy_rom_client_monitors_config(struct qxl_device *qdev)
int num_monitors;
uint32_t crc;

BUG_ON(!qdev->monitors_config);
num_monitors = qdev->rom->client_monitors_config.count;
crc = crc32(0, (const uint8_t *)&qdev->rom->client_monitors_config,
sizeof(qdev->rom->client_monitors_config));
Expand All @@ -83,18 +87,15 @@ static int qxl_display_copy_rom_client_monitors_config(struct qxl_device *qdev)
&qdev->rom->client_monitors_config.heads[i];
struct qxl_head *client_head =
&qdev->client_monitors_config->heads[i];
struct qxl_head *head = &qdev->monitors_config->heads[i];
client_head->x = head->x = c_rect->left;
client_head->y = head->y = c_rect->top;
client_head->width = head->width =
c_rect->right - c_rect->left;
client_head->height = head->height =
c_rect->bottom - c_rect->top;
client_head->surface_id = head->surface_id = 0;
client_head->id = head->id = i;
client_head->flags = head->flags = 0;
DRM_DEBUG_KMS("read %dx%d+%d+%d\n", head->width, head->height,
head->x, head->y);
client_head->x = c_rect->left;
client_head->y = c_rect->top;
client_head->width = c_rect->right - c_rect->left;
client_head->height = c_rect->bottom - c_rect->top;
client_head->surface_id = 0;
client_head->id = i;
client_head->flags = 0;
DRM_DEBUG_KMS("read %dx%d+%d+%d\n", client_head->width, client_head->height,
client_head->x, client_head->y);
}
return 0;
}
Expand All @@ -118,9 +119,9 @@ static int qxl_add_monitors_config_modes(struct drm_connector *connector)
struct drm_display_mode *mode = NULL;
struct qxl_head *head;

if (!qdev->monitors_config)
if (!qdev->client_monitors_config)
return 0;
head = &qdev->monitors_config->heads[h];
head = &qdev->client_monitors_config->heads[h];

mode = drm_cvt_mode(dev, head->width, head->height, 60, false, false,
false);
Expand Down Expand Up @@ -447,7 +448,7 @@ qxl_send_monitors_config(struct qxl_device *qdev)
for (i = 0 ; i < qdev->monitors_config->count ; ++i) {
struct qxl_head *head = &qdev->monitors_config->heads[i];

if (head->y > 8192 || head->y < head->x ||
if (head->y > 8192 || head->x > 8192 ||
head->width > 8192 || head->height > 8192) {
DRM_ERROR("head %d wrong: %dx%d+%d+%d\n",
i, head->width, head->height,
Expand All @@ -458,16 +459,19 @@ qxl_send_monitors_config(struct qxl_device *qdev)
qxl_io_monitors_config(qdev);
}

static void qxl_monitors_config_set_single(struct qxl_device *qdev,
unsigned x, unsigned y,
unsigned width, unsigned height)
static void qxl_monitors_config_set(struct qxl_device *qdev,
int index,
unsigned x, unsigned y,
unsigned width, unsigned height,
unsigned surf_id)
{
DRM_DEBUG("%dx%d+%d+%d\n", width, height, x, y);
qdev->monitors_config->count = 1;
qdev->monitors_config->heads[0].x = x;
qdev->monitors_config->heads[0].y = y;
qdev->monitors_config->heads[0].width = width;
qdev->monitors_config->heads[0].height = height;
DRM_DEBUG_KMS("%d:%dx%d+%d+%d\n", index, width, height, x, y);
qdev->monitors_config->heads[index].x = x;
qdev->monitors_config->heads[index].y = y;
qdev->monitors_config->heads[index].width = width;
qdev->monitors_config->heads[index].height = height;
qdev->monitors_config->heads[index].surface_id = surf_id;

}

static int qxl_crtc_mode_set(struct drm_crtc *crtc,
Expand All @@ -481,10 +485,11 @@ static int qxl_crtc_mode_set(struct drm_crtc *crtc,
struct qxl_mode *m = (void *)mode->private;
struct qxl_framebuffer *qfb;
struct qxl_bo *bo, *old_bo = NULL;
struct qxl_crtc *qcrtc = to_qxl_crtc(crtc);
uint32_t width, height, base_offset;
bool recreate_primary = false;
int ret;

int surf_id;
if (!crtc->fb) {
DRM_DEBUG_KMS("No FB bound\n");
return 0;
Expand All @@ -508,7 +513,8 @@ static int qxl_crtc_mode_set(struct drm_crtc *crtc,
adjusted_mode->hdisplay,
adjusted_mode->vdisplay);

recreate_primary = true;
if (qcrtc->index == 0)
recreate_primary = true;

width = mode->hdisplay;
height = mode->vdisplay;
Expand All @@ -529,8 +535,11 @@ static int qxl_crtc_mode_set(struct drm_crtc *crtc,
"recreate primary: %dx%d (was %dx%d,%d,%d)\n",
width, height, bo->surf.width,
bo->surf.height, bo->surf.stride, bo->surf.format);
qxl_io_create_primary(qdev, width, height, base_offset, bo);
qxl_io_create_primary(qdev, base_offset, bo);
bo->is_primary = true;
surf_id = 0;
} else {
surf_id = bo->surface_id;
}

if (old_bo && old_bo != bo) {
Expand All @@ -540,11 +549,9 @@ static int qxl_crtc_mode_set(struct drm_crtc *crtc,
qxl_bo_unreserve(old_bo);
}

if (qdev->monitors_config->count == 0) {
qxl_monitors_config_set_single(qdev, x, y,
mode->hdisplay,
mode->vdisplay);
}
qxl_monitors_config_set(qdev, qcrtc->index, x, y,
mode->hdisplay,
mode->vdisplay, surf_id);
return 0;
}

Expand All @@ -560,15 +567,36 @@ static void qxl_crtc_commit(struct drm_crtc *crtc)
DRM_DEBUG("\n");
}

static void qxl_crtc_disable(struct drm_crtc *crtc)
{
struct qxl_crtc *qcrtc = to_qxl_crtc(crtc);
struct drm_device *dev = crtc->dev;
struct qxl_device *qdev = dev->dev_private;
if (crtc->fb) {
struct qxl_framebuffer *qfb = to_qxl_framebuffer(crtc->fb);
struct qxl_bo *bo = gem_to_qxl_bo(qfb->obj);
int ret;
ret = qxl_bo_reserve(bo, false);
qxl_bo_unpin(bo);
qxl_bo_unreserve(bo);
crtc->fb = NULL;
}

qxl_monitors_config_set(qdev, qcrtc->index, 0, 0, 0, 0, 0);

qxl_send_monitors_config(qdev);
}

static const struct drm_crtc_helper_funcs qxl_crtc_helper_funcs = {
.dpms = qxl_crtc_dpms,
.disable = qxl_crtc_disable,
.mode_fixup = qxl_crtc_mode_fixup,
.mode_set = qxl_crtc_mode_set,
.prepare = qxl_crtc_prepare,
.commit = qxl_crtc_commit,
};

static int qdev_crtc_init(struct drm_device *dev, int num_crtc)
static int qdev_crtc_init(struct drm_device *dev, int crtc_id)
{
struct qxl_crtc *qxl_crtc;

Expand All @@ -577,7 +605,7 @@ static int qdev_crtc_init(struct drm_device *dev, int num_crtc)
return -ENOMEM;

drm_crtc_init(dev, &qxl_crtc->base, &qxl_crtc_funcs);

qxl_crtc->index = crtc_id;
drm_mode_crtc_set_gamma_size(&qxl_crtc->base, 256);
drm_crtc_helper_add(&qxl_crtc->base, &qxl_crtc_helper_funcs);
return 0;
Expand Down Expand Up @@ -605,18 +633,13 @@ static void qxl_write_monitors_config_for_encoder(struct qxl_device *qdev,
struct drm_encoder *encoder)
{
int i;
struct qxl_output *output = drm_encoder_to_qxl_output(encoder);
struct qxl_head *head;
struct drm_display_mode *mode;

BUG_ON(!encoder);
/* TODO: ugly, do better */
for (i = 0 ; (encoder->possible_crtcs != (1 << i)) && i < 32; ++i)
;
if (encoder->possible_crtcs != (1 << i)) {
DRM_ERROR("encoder has wrong possible_crtcs: %x\n",
encoder->possible_crtcs);
return;
}
i = output->index;
if (!qdev->monitors_config ||
qdev->monitors_config->max_allowed <= i) {
DRM_ERROR(
Expand All @@ -634,7 +657,6 @@ static void qxl_write_monitors_config_for_encoder(struct qxl_device *qdev,
DRM_DEBUG("missing for multiple monitors: no head holes\n");
head = &qdev->monitors_config->heads[i];
head->id = i;
head->surface_id = 0;
if (encoder->crtc->enabled) {
mode = &encoder->crtc->mode;
head->width = mode->hdisplay;
Expand All @@ -649,8 +671,8 @@ static void qxl_write_monitors_config_for_encoder(struct qxl_device *qdev,
head->x = 0;
head->y = 0;
}
DRM_DEBUG("setting head %d to +%d+%d %dx%d\n",
i, head->x, head->y, head->width, head->height);
DRM_DEBUG_KMS("setting head %d to +%d+%d %dx%d out of %d\n",
i, head->x, head->y, head->width, head->height, qdev->monitors_config->count);
head->flags = 0;
/* TODO - somewhere else to call this for multiple monitors
* (config_commit?) */
Expand Down Expand Up @@ -745,8 +767,9 @@ static enum drm_connector_status qxl_conn_detect(

/* The first monitor is always connected */
connected = (output->index == 0) ||
(qdev->monitors_config &&
qdev->monitors_config->count > output->index);
(qdev->client_monitors_config &&
qdev->client_monitors_config->count > output->index &&
qxl_head_enabled(&qdev->client_monitors_config->heads[output->index]));

DRM_DEBUG("\n");
return connected ? connector_status_connected
Expand Down Expand Up @@ -854,7 +877,7 @@ int qxl_modeset_init(struct qxl_device *qdev)
int i;
int ret;
struct drm_gem_object *gobj;
int max_allowed = QXL_NUM_OUTPUTS;
int max_allowed = qxl_num_crtc;
int monitors_config_size = sizeof(struct qxl_monitors_config) +
max_allowed * sizeof(struct qxl_head);

Expand Down Expand Up @@ -884,7 +907,7 @@ int qxl_modeset_init(struct qxl_device *qdev)
qdev->ddev->mode_config.max_height = 8192;

qdev->ddev->mode_config.fb_base = qdev->vram_base;
for (i = 0 ; i < QXL_NUM_OUTPUTS; ++i) {
for (i = 0 ; i < qxl_num_crtc; ++i) {
qdev_crtc_init(qdev->ddev, i);
qdev_output_init(qdev->ddev, i);
}
Expand Down
4 changes: 4 additions & 0 deletions drivers/gpu/drm/qxl/qxl_drv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,14 @@ static DEFINE_PCI_DEVICE_TABLE(pciidlist) = {
MODULE_DEVICE_TABLE(pci, pciidlist);

static int qxl_modeset = -1;
int qxl_num_crtc = 4;

MODULE_PARM_DESC(modeset, "Disable/Enable modesetting");
module_param_named(modeset, qxl_modeset, int, 0400);

MODULE_PARM_DESC(num_heads, "Number of virtual crtcs to expose (default 4)");
module_param_named(num_heads, qxl_num_crtc, int, 0400);

static struct drm_driver qxl_driver;
static struct pci_driver qxl_pci_driver;

Expand Down
8 changes: 4 additions & 4 deletions drivers/gpu/drm/qxl/qxl_drv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,10 @@
#define DRIVER_MINOR 1
#define DRIVER_PATCHLEVEL 0

#define QXL_NUM_OUTPUTS 1

#define QXL_DEBUGFS_MAX_COMPONENTS 32

extern int qxl_log_level;
extern int qxl_num_crtc;

enum {
QXL_INFO_LEVEL = 1,
Expand Down Expand Up @@ -139,6 +138,7 @@ struct qxl_reloc_list {

struct qxl_crtc {
struct drm_crtc base;
int index;
int cur_x;
int cur_y;
};
Expand All @@ -156,7 +156,7 @@ struct qxl_framebuffer {

#define to_qxl_crtc(x) container_of(x, struct qxl_crtc, base)
#define drm_connector_to_qxl_output(x) container_of(x, struct qxl_output, base)
#define drm_encoder_to_qxl_output(x) container_of(x, struct qxl_output, base)
#define drm_encoder_to_qxl_output(x) container_of(x, struct qxl_output, enc)
#define to_qxl_framebuffer(x) container_of(x, struct qxl_framebuffer, base)

struct qxl_mman {
Expand Down Expand Up @@ -435,7 +435,7 @@ void qxl_update_screen(struct qxl_device *qxl);
/* qxl io operations (qxl_cmd.c) */

void qxl_io_create_primary(struct qxl_device *qdev,
unsigned width, unsigned height, unsigned offset,
unsigned offset,
struct qxl_bo *bo);
void qxl_io_destroy_primary(struct qxl_device *qdev);
void qxl_io_memslot_add(struct qxl_device *qdev, uint8_t id);
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/qxl/qxl_fb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ int qxl_fbdev_init(struct qxl_device *qdev)
qfbdev->helper.funcs = &qxl_fb_helper_funcs;

ret = drm_fb_helper_init(qdev->ddev, &qfbdev->helper,
1 /* num_crtc - QXL supports just 1 */,
qxl_num_crtc /* num_crtc - QXL supports just 1 */,
QXLFB_CONN_LIMIT);
if (ret) {
kfree(qfbdev);
Expand Down

0 comments on commit 07f8d9b

Please sign in to comment.