Commit fe28421d authored by Dmitry Baryshkov's avatar Dmitry Baryshkov

Revert "drm/atomic: Add pixel source to plane state dump"

This reverts commit 8283ac78.

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: default avatarSimon Ser <contact@emersion.fr>
Acked-by: default avatarMaxime Ripard <mripard@kernel.org>
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20231204131455.19023-5-dmitry.baryshkov@linaro.org
parent a513f095
...@@ -722,7 +722,6 @@ static void drm_atomic_plane_print_state(struct drm_printer *p, ...@@ -722,7 +722,6 @@ static void drm_atomic_plane_print_state(struct drm_printer *p,
drm_printf(p, "plane[%u]: %s\n", plane->base.id, plane->name); drm_printf(p, "plane[%u]: %s\n", plane->base.id, plane->name);
drm_printf(p, "\tcrtc=%s\n", state->crtc ? state->crtc->name : "(null)"); drm_printf(p, "\tcrtc=%s\n", state->crtc ? state->crtc->name : "(null)");
drm_printf(p, "\tpixel-source=%s\n", drm_get_pixel_source_name(state->pixel_source));
drm_printf(p, "\tfb=%u\n", state->fb ? state->fb->base.id : 0); drm_printf(p, "\tfb=%u\n", state->fb ? state->fb->base.id : 0);
if (state->fb) if (state->fb)
drm_framebuffer_print_info(p, 2, state->fb); drm_framebuffer_print_info(p, 2, state->fb);
......
...@@ -647,7 +647,6 @@ static const struct drm_prop_enum_list drm_pixel_source_enum_list[] = { ...@@ -647,7 +647,6 @@ static const struct drm_prop_enum_list drm_pixel_source_enum_list[] = {
{ DRM_PLANE_PIXEL_SOURCE_FB, "FB" }, { DRM_PLANE_PIXEL_SOURCE_FB, "FB" },
{ DRM_PLANE_PIXEL_SOURCE_SOLID_FILL, "SOLID_FILL" }, { DRM_PLANE_PIXEL_SOURCE_SOLID_FILL, "SOLID_FILL" },
}; };
DRM_ENUM_NAME_FN(drm_get_pixel_source_name, drm_pixel_source_enum_list);
/** /**
* drm_plane_create_pixel_source_property - create a new pixel source property * drm_plane_create_pixel_source_property - create a new pixel source property
......
...@@ -269,7 +269,6 @@ int drm_plane_check_pixel_format(struct drm_plane *plane, ...@@ -269,7 +269,6 @@ int drm_plane_check_pixel_format(struct drm_plane *plane,
u32 format, u64 modifier); u32 format, u64 modifier);
struct drm_mode_rect * struct drm_mode_rect *
__drm_plane_get_damage_clips(const struct drm_plane_state *state); __drm_plane_get_damage_clips(const struct drm_plane_state *state);
const char *drm_get_pixel_source_name(int val);
/* drm_bridge.c */ /* drm_bridge.c */
void drm_bridge_detach(struct drm_bridge *bridge); void drm_bridge_detach(struct drm_bridge *bridge);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment