Skip to content

Commit 3e77c4d

Browse files
haneensaatseanpaul
authored andcommitted
drm/vkms: Subclass plane state
Subclass plane state struct to enable storing driver's private state. This patch only adds the base drm_plane_state struct and the atomic functions that handle it. Signed-off-by: Haneen Mohammed <[email protected]> Reviewed-by: Sean Paul <[email protected]> Signed-off-by: Sean Paul <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/c35c512c8987a7255aac94a9eb985d2dd3e6c90d.1533171495.git.hamohammed.sa@gmail.com
1 parent 570913e commit 3e77c4d

File tree

2 files changed

+55
-3
lines changed

2 files changed

+55
-3
lines changed

drivers/gpu/drm/vkms/vkms_drv.h

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,14 @@ static const u32 vkms_formats[] = {
2020
DRM_FORMAT_XRGB8888,
2121
};
2222

23+
/**
24+
* vkms_plane_state - Driver specific plane state
25+
* @base: base plane state
26+
*/
27+
struct vkms_plane_state {
28+
struct drm_plane_state base;
29+
};
30+
2331
/**
2432
* vkms_crtc_state - Driver specific CRTC state
2533
* @base: base CRTC state
@@ -63,6 +71,9 @@ struct vkms_gem_object {
6371
#define to_vkms_crtc_state(target)\
6472
container_of(target, struct vkms_crtc_state, base)
6573

74+
#define to_vkms_plane_state(target)\
75+
container_of(target, struct vkms_plane_state, base)
76+
6677
/* CRTC */
6778
int vkms_crtc_init(struct drm_device *dev, struct drm_crtc *crtc,
6879
struct drm_plane *primary, struct drm_plane *cursor);

drivers/gpu/drm/vkms/vkms_plane.c

Lines changed: 44 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,54 @@
1212
#include <drm/drm_atomic_helper.h>
1313
#include <drm/drm_gem_framebuffer_helper.h>
1414

15+
static struct drm_plane_state *
16+
vkms_plane_duplicate_state(struct drm_plane *plane)
17+
{
18+
struct vkms_plane_state *vkms_state;
19+
20+
vkms_state = kzalloc(sizeof(*vkms_state), GFP_KERNEL);
21+
if (!vkms_state)
22+
return NULL;
23+
24+
__drm_atomic_helper_plane_duplicate_state(plane,
25+
&vkms_state->base);
26+
27+
return &vkms_state->base;
28+
}
29+
30+
static void vkms_plane_destroy_state(struct drm_plane *plane,
31+
struct drm_plane_state *old_state)
32+
{
33+
struct vkms_plane_state *vkms_state = to_vkms_plane_state(old_state);
34+
35+
__drm_atomic_helper_plane_destroy_state(old_state);
36+
kfree(vkms_state);
37+
}
38+
39+
static void vkms_plane_reset(struct drm_plane *plane)
40+
{
41+
struct vkms_plane_state *vkms_state;
42+
43+
if (plane->state)
44+
vkms_plane_destroy_state(plane, plane->state);
45+
46+
vkms_state = kzalloc(sizeof(*vkms_state), GFP_KERNEL);
47+
if (!vkms_state) {
48+
DRM_ERROR("Cannot allocate vkms_plane_state\n");
49+
return;
50+
}
51+
52+
plane->state = &vkms_state->base;
53+
plane->state->plane = plane;
54+
}
55+
1556
static const struct drm_plane_funcs vkms_plane_funcs = {
1657
.update_plane = drm_atomic_helper_update_plane,
1758
.disable_plane = drm_atomic_helper_disable_plane,
1859
.destroy = drm_plane_cleanup,
19-
.reset = drm_atomic_helper_plane_reset,
20-
.atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,
21-
.atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
60+
.reset = vkms_plane_reset,
61+
.atomic_duplicate_state = vkms_plane_duplicate_state,
62+
.atomic_destroy_state = vkms_plane_destroy_state,
2263
};
2364

2465
static void vkms_primary_plane_update(struct drm_plane *plane,

0 commit comments

Comments
 (0)