Skip to content

Commit

Permalink
drm: qxl: Atomic phase 3: Use atomic handlers for planes
Browse files Browse the repository at this point in the history
Now that the state objects are wired up, we can move to the final atomic
handlers.

Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/20170227204328.18761-12-krisman@collabora.co.uk
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
  • Loading branch information
Gabriel Krisman Bertazi authored and Gerd Hoffmann committed Feb 28, 2017
1 parent 10a0bd8 commit 472e6d4
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions drivers/gpu/drm/qxl/qxl_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -763,8 +763,8 @@ static const struct drm_plane_helper_funcs qxl_cursor_helper_funcs = {
};

static const struct drm_plane_funcs qxl_cursor_plane_funcs = {
.update_plane = drm_plane_helper_update,
.disable_plane = drm_plane_helper_disable,
.update_plane = drm_atomic_helper_update_plane,
.disable_plane = drm_atomic_helper_disable_plane,
.destroy = drm_primary_helper_destroy,
.reset = drm_atomic_helper_plane_reset,
.atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,
Expand All @@ -785,8 +785,8 @@ static const struct drm_plane_helper_funcs primary_helper_funcs = {
};

static const struct drm_plane_funcs qxl_primary_plane_funcs = {
.update_plane = drm_plane_helper_update,
.disable_plane = drm_primary_helper_disable,
.update_plane = drm_atomic_helper_update_plane,
.disable_plane = drm_atomic_helper_disable_plane,
.destroy = drm_primary_helper_destroy,
.reset = drm_atomic_helper_plane_reset,
.atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,
Expand Down Expand Up @@ -1161,6 +1161,8 @@ qxl_user_framebuffer_create(struct drm_device *dev,

static const struct drm_mode_config_funcs qxl_mode_funcs = {
.fb_create = qxl_user_framebuffer_create,
.atomic_check = drm_atomic_helper_check,
.atomic_commit = drm_atomic_helper_commit,
};

int qxl_create_monitors_object(struct qxl_device *qdev)
Expand Down

0 comments on commit 472e6d4

Please sign in to comment.