Unverified Commit a03f0285 authored by Maíra Canal's avatar Maíra Canal Committed by Maíra Canal
Browse files

drm/vkms: allow full alpha blending on all planes 



Before commit bc0d7fde ("drm: vkms: Supports to the case where
primary plane doesn't match the CRTC"), the composition was executed on
top of the primary plane. Therefore, the primary plane was not able to
support the alpha channel. After commit bc0d7fde, this is possible,
as the composition is now executed on top of the CRTC.

So, allow all planes to support the alpha channel, making full alpha
blending possible in vkms.

Signed-off-by: default avatarMaíra Canal <mcanal@igalia.com>
Reviewed-by: default avatarMelissa Wen <mwen@igalia.com>
Reviewed-by: default avatarArthur Grillo <arthurgrillo@riseup.net>
Signed-off-by: default avatarMaíra Canal <mairacanal@riseup.net>
Link: https://patchwork.freedesktop.org/patch/msgid/20230420232228.273340-1-mcanal@igalia.com
parent 94545f27

drivers/gpu/drm/vkms/vkms_plane.c

+3 −31
Original line number Original line Diff line number Diff line
@@ -12,12 +12,6 @@ 
#include "vkms_formats.h"

#include "vkms_formats.h"





static const u32 vkms_formats[] = {

static const u32 vkms_formats[] = {

	DRM_FORMAT_XRGB8888,

	DRM_FORMAT_XRGB16161616,

	DRM_FORMAT_RGB565

};



static const u32 vkms_plane_formats[] = {

	DRM_FORMAT_ARGB8888,

	DRM_FORMAT_ARGB8888,

	DRM_FORMAT_XRGB8888,

	DRM_FORMAT_XRGB8888,

	DRM_FORMAT_XRGB16161616,

	DRM_FORMAT_XRGB16161616,
@@ -185,7 +179,7 @@ static void vkms_cleanup_fb(struct drm_plane *plane, 
	drm_gem_fb_vunmap(fb, shadow_plane_state->map);

	drm_gem_fb_vunmap(fb, shadow_plane_state->map);

}

}





static const struct drm_plane_helper_funcs vkms_primary_helper_funcs = {

static const struct drm_plane_helper_funcs vkms_plane_helper_funcs = {

	.atomic_update		= vkms_plane_atomic_update,

	.atomic_update		= vkms_plane_atomic_update,

	.atomic_check		= vkms_plane_atomic_check,

	.atomic_check		= vkms_plane_atomic_check,

	.prepare_fb		= vkms_prepare_fb,

	.prepare_fb		= vkms_prepare_fb,
@@ -196,38 +190,16 @@ struct vkms_plane *vkms_plane_init(struct vkms_device *vkmsdev, 
				   enum drm_plane_type type, int index)

				   enum drm_plane_type type, int index)

{

{

	struct drm_device *dev = &vkmsdev->drm;

	struct drm_device *dev = &vkmsdev->drm;

	const struct drm_plane_helper_funcs *funcs;

	struct vkms_plane *plane;

	struct vkms_plane *plane;

	const u32 *formats;

	int nformats;



	switch (type) {

	case DRM_PLANE_TYPE_PRIMARY:

		formats = vkms_formats;

		nformats = ARRAY_SIZE(vkms_formats);

		funcs = &vkms_primary_helper_funcs;

		break;

	case DRM_PLANE_TYPE_CURSOR:

	case DRM_PLANE_TYPE_OVERLAY:

		formats = vkms_plane_formats;

		nformats = ARRAY_SIZE(vkms_plane_formats);

		funcs = &vkms_primary_helper_funcs;

		break;

	default:

		formats = vkms_formats;

		nformats = ARRAY_SIZE(vkms_formats);

		funcs = &vkms_primary_helper_funcs;

		break;

	}





	plane = drmm_universal_plane_alloc(dev, struct vkms_plane, base, 1 << index,

	plane = drmm_universal_plane_alloc(dev, struct vkms_plane, base, 1 << index,

					   &vkms_plane_funcs,

					   &vkms_plane_funcs,

					   formats, nformats,

					   vkms_formats, ARRAY_SIZE(vkms_formats),

					   NULL, type, NULL);

					   NULL, type, NULL);

	if (IS_ERR(plane))

	if (IS_ERR(plane))

		return plane;

		return plane;





	drm_plane_helper_add(&plane->base, funcs);

	drm_plane_helper_add(&plane->base, &vkms_plane_helper_funcs);





	return plane;

	return plane;

}
 
}