summaryrefslogtreecommitdiff
path: root/include/drm
diff options
context:
space:
mode:
authorDmitry Baryshkov <dmitry.baryshkov@linaro.org>2023-12-04 15:13:53 +0200
committerDmitry Baryshkov <dmitry.baryshkov@linaro.org>2023-12-04 21:33:09 +0200
commite5fba1ada1c1d676438138d815acd8f427a1eaf0 (patch)
treebc8644a897bb2b060bab8fc054126b3f8ecc0d43 /include/drm
parent5fb1ad3f5725c5c4d1a0c24ba4f82f239dc6878d (diff)
Revert "drm: Introduce solid fill DRM plane property"
This reverts commit 85863a4e16e77079ee14865905ddc3ef9483a640. 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-7-dmitry.baryshkov@linaro.org
Diffstat (limited to 'include/drm')
-rw-r--r--include/drm/drm_blend.h1
-rw-r--r--include/drm/drm_plane.h36
2 files changed, 0 insertions, 37 deletions
diff --git a/include/drm/drm_blend.h b/include/drm/drm_blend.h
index e7158fbee389..122bbfbaae33 100644
--- a/include/drm/drm_blend.h
+++ b/include/drm/drm_blend.h
@@ -60,5 +60,4 @@ int drm_plane_create_blend_mode_property(struct drm_plane *plane,
unsigned int supported_modes);
int drm_plane_create_pixel_source_property(struct drm_plane *plane,
unsigned long extra_sources);
-int drm_plane_create_solid_fill_property(struct drm_plane *plane);
#endif
diff --git a/include/drm/drm_plane.h b/include/drm/drm_plane.h
index 5bac644d4cc3..bc0176ba25be 100644
--- a/include/drm/drm_plane.h
+++ b/include/drm/drm_plane.h
@@ -47,18 +47,6 @@ enum drm_plane_pixel_source {
};
/**
- * struct solid_fill_property - RGB values for solid fill plane
- *
- * TODO: Add solid fill source and corresponding pixel source
- * that supports RGBA color
- */
-struct drm_solid_fill {
- uint32_t r;
- uint32_t g;
- uint32_t b;
-};
-
-/**
* struct drm_plane_state - mutable plane state
*
* Please note that the destination coordinates @crtc_x, @crtc_y, @crtc_h and
@@ -147,23 +135,6 @@ struct drm_plane_state {
enum drm_plane_pixel_source pixel_source;
/**
- * @solid_fill_blob:
- *
- * Blob containing relevant information for a solid fill plane
- * including RGB color values. See
- * drm_plane_create_solid_fill_property() for more details.
- */
- struct drm_property_blob *solid_fill_blob;
-
- /**
- * @solid_fill:
- *
- * Pixel data for solid fill planes. See
- * drm_plane_create_solid_fill_property() for more details.
- */
- struct drm_solid_fill solid_fill;
-
- /**
* @alpha:
* Opacity of the plane with 0 as completely transparent and 0xffff as
* completely opaque. See drm_plane_create_alpha_property() for more
@@ -764,13 +735,6 @@ struct drm_plane {
struct drm_property *pixel_source_property;
/**
- * @solid_fill_property:
- * Optional solid_fill property for this plane. See
- * drm_plane_create_solid_fill_property().
- */
- struct drm_property *solid_fill_property;
-
- /**
* @alpha_property:
* Optional alpha property for this plane. See
* drm_plane_create_alpha_property().