Skip to content

Commit

Permalink
drm: qxl: use vblank hooks in struct drm_crtc_funcs
Browse files Browse the repository at this point in the history
The vblank hooks in struct drm_driver are deprecated and only meant for
legacy drivers.  For modern drivers with DRIVER_MODESET flag, the hooks
in struct drm_crtc_funcs should be used instead.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Cc: Dave Airlie <airlied@redhat.com>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/1486458995-31018-16-git-send-email-shawnguo@kernel.org
  • Loading branch information
Shawn Guo authored and Sean Paul committed Feb 21, 2017
1 parent a5073a5 commit 54d82e0
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 18 deletions.
16 changes: 16 additions & 0 deletions drivers/gpu/drm/qxl/qxl_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -548,13 +548,29 @@ static int qxl_crtc_cursor_move(struct drm_crtc *crtc,
return 0;
}

static u32 qxl_noop_get_vblank_counter(struct drm_crtc *crtc)
{
return 0;
}

static int qxl_noop_enable_vblank(struct drm_crtc *crtc)
{
return 0;
}

static void qxl_noop_disable_vblank(struct drm_crtc *crtc)
{
}

static const struct drm_crtc_funcs qxl_crtc_funcs = {
.cursor_set2 = qxl_crtc_cursor_set2,
.cursor_move = qxl_crtc_cursor_move,
.set_config = drm_crtc_helper_set_config,
.destroy = qxl_crtc_destroy,
.page_flip = qxl_crtc_page_flip,
.get_vblank_counter = qxl_noop_get_vblank_counter,
.enable_vblank = qxl_noop_enable_vblank,
.disable_vblank = qxl_noop_disable_vblank,
};

void qxl_user_framebuffer_destroy(struct drm_framebuffer *fb)
Expand Down
18 changes: 0 additions & 18 deletions drivers/gpu/drm/qxl/qxl_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -247,21 +247,6 @@ static int qxl_pm_restore(struct device *dev)
return qxl_drm_resume(drm_dev, false);
}

static u32 qxl_noop_get_vblank_counter(struct drm_device *dev,
unsigned int pipe)
{
return 0;
}

static int qxl_noop_enable_vblank(struct drm_device *dev, unsigned int pipe)
{
return 0;
}

static void qxl_noop_disable_vblank(struct drm_device *dev, unsigned int pipe)
{
}

static const struct dev_pm_ops qxl_pm_ops = {
.suspend = qxl_pm_suspend,
.resume = qxl_pm_resume,
Expand All @@ -281,9 +266,6 @@ static struct pci_driver qxl_pci_driver = {
static struct drm_driver qxl_driver = {
.driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME |
DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED,
.get_vblank_counter = qxl_noop_get_vblank_counter,
.enable_vblank = qxl_noop_enable_vblank,
.disable_vblank = qxl_noop_disable_vblank,

.set_busid = drm_pci_set_busid,

Expand Down

0 comments on commit 54d82e0

Please sign in to comment.