Skip to content

Commit

Permalink
qxl: use drm helper hotplug support
Browse files Browse the repository at this point in the history
This uses the helper to deal with hotplug so fbdev gets included.

Signed-off-by: Dave Airlie <airlied@redhat.com>
  • Loading branch information
Dave Airlie committed Jul 5, 2013
1 parent d84300b commit 5ff91e4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/gpu/drm/qxl/qxl_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ void qxl_display_read_client_monitors_config(struct qxl_device *qdev)
qxl_io_log(qdev, "failed crc check for client_monitors_config,"
" retrying\n");
}
drm_sysfs_hotplug_event(qdev->ddev);
drm_helper_hpd_irq_event(qdev->ddev);
}

static int qxl_add_monitors_config_modes(struct drm_connector *connector)
Expand Down Expand Up @@ -833,6 +833,8 @@ static int qdev_output_init(struct drm_device *dev, int num_output)
drm_encoder_init(dev, &qxl_output->enc, &qxl_enc_funcs,
DRM_MODE_ENCODER_VIRTUAL);

/* we get HPD via client monitors config */
connector->polled = DRM_CONNECTOR_POLL_HPD;
encoder->possible_crtcs = 1 << num_output;
drm_mode_connector_attach_encoder(&qxl_output->base,
&qxl_output->enc);
Expand Down
3 changes: 3 additions & 0 deletions drivers/gpu/drm/qxl/qxl_kms.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include "qxl_drv.h"
#include "qxl_object.h"

#include <drm/drm_crtc_helper.h>
#include <linux/io-mapping.h>

int qxl_log_level;
Expand Down Expand Up @@ -307,6 +308,8 @@ int qxl_driver_load(struct drm_device *dev, unsigned long flags)
goto out;
}

drm_kms_helper_poll_init(qdev->ddev);

return 0;
out:
kfree(qdev);
Expand Down

0 comments on commit 5ff91e4

Please sign in to comment.