diff options
| author | Hans de Goede | 2018-09-29 14:18:22 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2018-09-29 14:31:33 +0200 |
| commit | 33f48cc1f11c29e2337c280d6e61688465c64976 (patch) | |
| tree | a89d4dcbc1545e1180ae2399ccbd54bb9831d513 /drivers/staging/vboxvideo | |
| parent | staging: vboxvideo: Fix DPMS support after atomic conversion (diff) | |
| download | kernel-qcow2-linux-33f48cc1f11c29e2337c280d6e61688465c64976.tar.gz kernel-qcow2-linux-33f48cc1f11c29e2337c280d6e61688465c64976.tar.xz kernel-qcow2-linux-33f48cc1f11c29e2337c280d6e61688465c64976.zip | |
staging: vboxvideo: Replace crtc_helper enable/disable functions
Replace vbox_crtc_commit and vbox_crtc_disable with
vbox_crtc_atomic_[en|dis]able which are the preferred callbacks for
these for atomic drivers.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vboxvideo')
| -rw-r--r-- | drivers/staging/vboxvideo/vbox_mode.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/staging/vboxvideo/vbox_mode.c b/drivers/staging/vboxvideo/vbox_mode.c index 49ff9c4a6302..72fc6614179a 100644 --- a/drivers/staging/vboxvideo/vbox_mode.c +++ b/drivers/staging/vboxvideo/vbox_mode.c @@ -229,11 +229,13 @@ static void vbox_crtc_set_base_and_mode(struct drm_crtc *crtc, mutex_unlock(&vbox->hw_mutex); } -static void vbox_crtc_disable(struct drm_crtc *crtc) +static void vbox_crtc_atomic_enable(struct drm_crtc *crtc, + struct drm_crtc_state *old_crtc_state) { } -static void vbox_crtc_commit(struct drm_crtc *crtc) +static void vbox_crtc_atomic_disable(struct drm_crtc *crtc, + struct drm_crtc_state *old_crtc_state) { } @@ -254,8 +256,8 @@ static void vbox_crtc_atomic_flush(struct drm_crtc *crtc, } static const struct drm_crtc_helper_funcs vbox_crtc_helper_funcs = { - .disable = vbox_crtc_disable, - .commit = vbox_crtc_commit, + .atomic_enable = vbox_crtc_atomic_enable, + .atomic_disable = vbox_crtc_atomic_disable, .atomic_flush = vbox_crtc_atomic_flush, }; |