iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "drm: Add solid fill pixel source"

Browse Source 
This reverts commit 4b64167042.

Although the Solid Fill planes patchset got all reviews and
acknowledgements, it doesn't fulfill requirements for the new uABI. It
has neither corresponding open-source userspace implementation nor the
IGT tests coverage. Reverting this patchset until userspace obligations
are fulfilled.

Acked-by: Simon Ser <contact@emersion.fr>
Acked-by: Maxime Ripard <mripard@kernel.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20231204131455.19023-6-dmitry.baryshkov@linaro.org
This commit is contained in:
Dmitry Baryshkov 2023-12-04 15:13:52 +02:00
parent fe28421d4f
commit 5fb1ad3f57
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/drm_blend.c
View File

@ -204,9 +204,6 @@
* "FB":
* Framebuffer source set by the "FB_ID" property.
*
* "SOLID_FILL":
* Solid fill color source set by the "solid_fill" property.
*
* solid_fill:
* solid_fill is set up with drm_plane_create_solid_fill_property(). It
* contains pixel data that drivers can use to fill a plane.
@ -645,7 +642,6 @@ EXPORT_SYMBOL(drm_plane_create_blend_mode_property);
static const struct drm_prop_enum_list drm_pixel_source_enum_list[] = {
{ DRM_PLANE_PIXEL_SOURCE_NONE, "NONE" },
{ DRM_PLANE_PIXEL_SOURCE_FB, "FB" },
{ DRM_PLANE_PIXEL_SOURCE_SOLID_FILL, "SOLID_FILL" },
};
/**
@ -670,9 +666,6 @@ static const struct drm_prop_enum_list drm_pixel_source_enum_list[] = {
* "FB":
* Framebuffer pixel source
*
* "SOLID_FILL":
* Solid fill color pixel source
*
* Returns:
* Zero on success, negative errno on failure.
*/
@ -682,8 +675,7 @@ int drm_plane_create_pixel_source_property(struct drm_plane *plane,
struct drm_device *dev = plane->dev;
struct drm_property *prop;
static const unsigned int valid_source_mask = BIT(DRM_PLANE_PIXEL_SOURCE_FB) |
BIT(DRM_PLANE_PIXEL_SOURCE_NONE) |
BIT(DRM_PLANE_PIXEL_SOURCE_SOLID_FILL);
BIT(DRM_PLANE_PIXEL_SOURCE_NONE);
int i;
/* FB is supported by default */

1
include/drm/drm_plane.h
View File

@ -43,7 +43,6 @@ enum drm_scaling_filter {
enum drm_plane_pixel_source {
DRM_PLANE_PIXEL_SOURCE_NONE,
DRM_PLANE_PIXEL_SOURCE_FB,
DRM_PLANE_PIXEL_SOURCE_SOLID_FILL,
DRM_PLANE_PIXEL_SOURCE_MAX
};