Skip to content

Commit 5e622dc

Browse files
committed
fixup! drm: apple: add support for overlay planes
1 parent 9af8417 commit 5e622dc

1 file changed

Lines changed: 10 additions & 2 deletions

File tree

drivers/gpu/drm/apple/apple_drv.c

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,12 +141,17 @@ static void apple_plane_atomic_update(struct drm_plane *plane,
141141
/* Handled in atomic_flush */
142142
}
143143

144-
static const struct drm_plane_helper_funcs apple_plane_helper_funcs = {
144+
static const struct drm_plane_helper_funcs apple_primary_plane_helper_funcs = {
145145
.atomic_check = apple_plane_atomic_check,
146146
.atomic_update = apple_plane_atomic_update,
147147
.get_scanout_buffer = drm_fb_dma_get_scanout_buffer,
148148
};
149149

150+
static const struct drm_plane_helper_funcs apple_plane_helper_funcs = {
151+
.atomic_check = apple_plane_atomic_check,
152+
.atomic_update = apple_plane_atomic_update,
153+
};
154+
150155
static void apple_plane_cleanup(struct drm_plane *plane)
151156
{
152157
drm_plane_cleanup(plane);
@@ -221,7 +226,10 @@ static struct drm_plane *apple_plane_init(struct drm_device *dev,
221226
if (ret)
222227
return ERR_PTR(ret);
223228

224-
drm_plane_helper_add(plane, &apple_plane_helper_funcs);
229+
if (type == DRM_PLANE_TYPE_PRIMARY)
230+
drm_plane_helper_add(plane, &apple_primary_plane_helper_funcs);
231+
else
232+
drm_plane_helper_add(plane, &apple_plane_helper_funcs);
225233

226234
return plane;
227235
}

0 commit comments

Comments
 (0)