Skip to content

Commit 2c67eda

Browse files
author
Damon Ding
committed
drm/rockchip: vvop: adapt to the drm helper functions with full atomic state
Pass the full state to CRTC atomic enable/disable/flush and plane atomic update. Relevant commits: commit 351f950 ("drm/atomic: Pass the full state to CRTC atomic enable/disable") commit f6ebe9f ("drm/atomic: Pass the full state to CRTC atomic begin and flush") commit 977697e ("drm/atomic: Pass the full state to planes atomic disable and update") Change-Id: I3a523d02d80c0248c7065b408985737d5b83a3f8 Signed-off-by: Damon Ding <[email protected]>
1 parent 7531015 commit 2c67eda

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

drivers/gpu/drm/rockchip/rockchip_drm_vvop.c

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
#include <drm/drm_gem.h>
1111
#include <drm/drm_atomic_helper.h>
1212
#include <drm/drm_crtc_helper.h>
13+
#include <drm/drm_edid.h>
14+
#include <drm/drm_fourcc.h>
1315
#include <drm/drm_gem_framebuffer_helper.h>
1416
#include <drm/drm_plane_helper.h>
1517
#include <drm/drm_probe_helper.h>
@@ -70,8 +72,7 @@ static const struct drm_plane_funcs vvop_plane_funcs = {
7072
.atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
7173
};
7274

73-
static void vvop_plane_atomic_update(struct drm_plane *plane,
74-
struct drm_plane_state *old_state)
75+
static void vvop_plane_atomic_update(struct drm_plane *plane, struct drm_atomic_state *state)
7576
{
7677
}
7778

@@ -398,14 +399,12 @@ static const struct drm_crtc_funcs vvop_crtc_funcs = {
398399
.disable_vblank = vvop_disable_vblank,
399400
};
400401

401-
static void vvop_crtc_atomic_enable(struct drm_crtc *crtc,
402-
struct drm_crtc_state *old_state)
402+
static void vvop_crtc_atomic_enable(struct drm_crtc *crtc, struct drm_atomic_state *state)
403403
{
404404
drm_crtc_vblank_on(crtc);
405405
}
406406

407-
static void vvop_crtc_atomic_disable(struct drm_crtc *crtc,
408-
struct drm_crtc_state *old_state)
407+
static void vvop_crtc_atomic_disable(struct drm_crtc *crtc, struct drm_atomic_state *state)
409408
{
410409
unsigned long flags;
411410

@@ -420,8 +419,7 @@ static void vvop_crtc_atomic_disable(struct drm_crtc *crtc,
420419

421420
}
422421

423-
static void vvop_crtc_atomic_flush(struct drm_crtc *crtc,
424-
struct drm_crtc_state *old_crtc_state)
422+
static void vvop_crtc_atomic_flush(struct drm_crtc *crtc, struct drm_atomic_state *state)
425423
{
426424
unsigned long flags;
427425

0 commit comments

Comments
 (0)