All of lore.kernel.org
 help / color / mirror / Atom feed
From: Harry Wentland <harry.wentland@amd.com>
To: <dri-devel@lists.freedesktop.org>, <amd-gfx@lists.freedesktop.org>
Cc: <wayland-devel@lists.freedesktop.org>,
	Harry Wentland <harry.wentland@amd.com>
Subject: [RFC PATCH v4 14/42] drm/colorop: Add atomic state print for drm_colorop
Date: Mon, 26 Feb 2024 16:10:28 -0500	[thread overview]
Message-ID: <20240226211100.100108-15-harry.wentland@amd.com> (raw)
In-Reply-To: <20240226211100.100108-1-harry.wentland@amd.com>

Signed-off-by: Harry Wentland <harry.wentland@amd.com>
---
 drivers/gpu/drm/drm_atomic.c | 25 ++++++++++++++++++++++++-
 include/drm/drm_colorop.h    |  5 +++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index b400e32c9d39..3645c36d63b3 100644
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -783,6 +783,19 @@ static int drm_atomic_plane_check(const struct drm_plane_state *old_plane_state,
 	return 0;
 }
 
+
+
+static void drm_atomic_colorop_print_state(struct drm_printer *p,
+		const struct drm_colorop_state *state)
+{
+	struct drm_colorop *colorop = state->colorop;
+
+	drm_printf(p, "colorop[%u]:\n", colorop->base.id);
+	drm_printf(p, "\ttype=%s\n", drm_get_colorop_type_name(colorop->type));
+	drm_printf(p, "\tbypass=%u\n", state->bypass);
+	drm_printf(p, "\tcurve_1d_type=%s\n", drm_get_colorop_curve_1d_type_name(state->curve_1d_type));
+}
+
 static void drm_atomic_plane_print_state(struct drm_printer *p,
 		const struct drm_plane_state *state)
 {
@@ -804,7 +817,8 @@ static void drm_atomic_plane_print_state(struct drm_printer *p,
 	drm_printf(p, "\tcolor-range=%s\n",
 		   drm_get_color_range_name(state->color_range));
 	drm_printf(p, "\tcolor_mgmt_changed=%d\n", state->color_mgmt_changed);
-
+	drm_printf(p, "\tcolor-pipeline=%d\n",
+		   state->color_pipeline ? state->color_pipeline->base.id : 0);
 	if (plane->funcs->atomic_print_state)
 		plane->funcs->atomic_print_state(p, state);
 }
@@ -1840,6 +1854,7 @@ static void __drm_state_dump(struct drm_device *dev, struct drm_printer *p,
 			     bool take_locks)
 {
 	struct drm_mode_config *config = &dev->mode_config;
+	struct drm_colorop *colorop;
 	struct drm_plane *plane;
 	struct drm_crtc *crtc;
 	struct drm_connector *connector;
@@ -1849,6 +1864,14 @@ static void __drm_state_dump(struct drm_device *dev, struct drm_printer *p,
 	if (!drm_drv_uses_atomic_modeset(dev))
 		return;
 
+	list_for_each_entry(colorop, &config->colorop_list, head) {
+		if (take_locks)
+			drm_modeset_lock(&colorop->plane->mutex, NULL);
+		drm_atomic_colorop_print_state(p, colorop->state);
+		if (take_locks)
+			drm_modeset_unlock(&colorop->plane->mutex);
+	}
+
 	list_for_each_entry(plane, &config->plane_list, head) {
 		if (take_locks)
 			drm_modeset_lock(&plane->mutex, NULL);
diff --git a/include/drm/drm_colorop.h b/include/drm/drm_colorop.h
index 8060988b5892..fc9a28d138b8 100644
--- a/include/drm/drm_colorop.h
+++ b/include/drm/drm_colorop.h
@@ -231,6 +231,11 @@ static inline unsigned int drm_colorop_index(const struct drm_colorop *colorop)
 #define drm_for_each_colorop(colorop, dev) \
 	list_for_each_entry(colorop, &(dev)->mode_config.colorop_list, head)
 
+const char *drm_get_color_pipeline_name(struct drm_colorop *colorop);
+
+const char *drm_get_colorop_type_name(enum drm_colorop_type type);
+const char *drm_get_colorop_curve_1d_type_name(enum drm_colorop_curve_1d_type type);
+
 void drm_colorop_set_next_property(struct drm_colorop *colorop, struct drm_colorop *next);
 
 
-- 
2.44.0


  parent reply	other threads:[~2024-02-26 21:12 UTC|newest]

Thread overview: 64+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-26 21:10 [RFC PATCH v4 00/42] Color Pipeline API w/ VKMS Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 01/42] drm: Don't treat 0 as -1 in drm_fixp2int_ceil Harry Wentland
2024-03-14 13:41   ` Melissa Wen
2024-02-26 21:10 ` [RFC PATCH v4 02/42] drm: Add helper for conversion from signed-magnitude Harry Wentland
2024-03-14 13:16   ` Melissa Wen
2024-02-26 21:10 ` [RFC PATCH v4 03/42] drm: Correctly round for fixp2int_round Harry Wentland
2024-03-11 13:11   ` Pekka Paalanen
2024-02-26 21:10 ` [RFC PATCH v4 04/42] drm/vkms: Round fixp2int conversion in lerp_u16 Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 05/42] drm/vkms: Create separate Kconfig file for VKMS Harry Wentland
2024-03-12 18:49   ` Melissa Wen
2024-02-26 21:10 ` [RFC PATCH v4 06/42] drm/vkms: Add kunit tests for VKMS LUT handling Harry Wentland
2024-02-27 12:14   ` Arthur Grillo
2024-02-27 14:09     ` Harry Wentland
2024-03-11 13:45   ` Pekka Paalanen
2024-02-26 21:10 ` [RFC PATCH v4 07/42] drm/vkms: Avoid reading beyond LUT array Harry Wentland
2024-03-12 18:54   ` Melissa Wen
2024-02-26 21:10 ` [RFC PATCH v4 08/42] drm/doc/rfc: Describe why prescriptive color pipeline is needed Harry Wentland
2024-03-11 15:11   ` Pekka Paalanen
2024-02-26 21:10 ` [RFC PATCH v4 09/42] drm/colorop: Introduce new drm_colorop mode object Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 10/42] drm/colorop: Add TYPE property Harry Wentland
2024-03-12 15:02   ` Pekka Paalanen
2024-03-12 15:15     ` Simon Ser
2024-03-12 15:55       ` Pekka Paalanen
2024-02-26 21:10 ` [RFC PATCH v4 11/42] drm/colorop: Add 1D Curve subtype Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 12/42] drm/colorop: Add BYPASS property Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 13/42] drm/colorop: Add NEXT property Harry Wentland
2024-02-26 21:10 ` Harry Wentland [this message]
2024-02-26 21:10 ` [RFC PATCH v4 15/42] drm/plane: Add COLOR PIPELINE property Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 16/42] drm/colorop: Add NEXT to colorop state print Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 17/42] drm/vkms: Add enumerated 1D curve colorop Harry Wentland
2024-03-12 15:27   ` Pekka Paalanen
2024-02-26 21:10 ` [RFC PATCH v4 18/42] drm/vkms: Add kunit tests for linear and sRGB LUTs Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 19/42] drm/colorop: Introduce DRM_CLIENT_CAP_PLANE_COLOR_PIPELINE Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 20/42] drm/colorop: Add 3x4 CTM type Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 21/42] drm/vkms: Pull apply_colorop out of pre_blend_color_transform Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 22/42] drm/vkms: Use s32 for internal color pipeline precision Harry Wentland
2024-03-12 15:50   ` Pekka Paalanen
2024-02-26 21:10 ` [RFC PATCH v4 23/42] drm/vkms: add 3x4 matrix in color pipeline Harry Wentland
2024-03-14 15:23   ` Pekka Paalanen
2024-02-26 21:10 ` [RFC PATCH v4 24/42] drm/tests: Add a few tests around drm_fixed.h Harry Wentland
2024-03-14 15:36   ` Pekka Paalanen
2024-02-26 21:10 ` [RFC PATCH v4 25/42] drm/vkms: Add tests for CTM handling Harry Wentland
2024-03-14 16:02   ` Pekka Paalanen
2024-02-26 21:10 ` [RFC PATCH v4 26/42] drm/colorop: pass plane_color_pipeline client cap to atomic check Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 27/42] drm/colorop: define a new macro for_each_new_colorop_in_state Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 28/42] drm/amd/display: Ignore deprecated props when plane_color_pipeline set Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 29/42] drm/amd/display: Add bypass COLOR PIPELINE Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 30/42] drm/amd/display: Skip color pipeline initialization for cursor plane Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 31/42] drm/amd/display: Add support for sRGB EOTF in DEGAM block Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 32/42] drm/amd/display: Add support for sRGB Inverse EOTF in SHAPER block Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 33/42] drm/amd/display: Add support for sRGB EOTF in BLND block Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 34/42] drm/colorop: Add PQ 125 EOTF and its inverse Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 35/42] drm/amd/display: Enable support for PQ 125 EOTF and Inverse Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 36/42] drm/colorop: add BT2020/BT709 OETF and Inverse OETF Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 37/42] drm/amd/display: Add support for BT.709 and BT.2020 TFs Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 38/42] drm/colorop: Add 1D Curve Custom LUT type Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 39/42] drm/amd/display: add shaper and blend colorops for 1D Curve Custom LUT Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 40/42] drm/amd/display: add 3x4 matrix colorop Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 41/42] drm/colorop: Add mutliplier type Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 42/42] drm/amd/display: add multiplier colorop Harry Wentland
2024-02-27 10:26 ` [RFC PATCH v4 00/42] Color Pipeline API w/ VKMS Joshua Ashton
2024-02-27 14:00   ` Harry Wentland
2024-02-29 10:43 ` Daniel Vetter
2024-02-29 15:31   ` Joshua Ashton

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240226211100.100108-15-harry.wentland@amd.com \
    --to=harry.wentland@amd.com \
    --cc=amd-gfx@lists.freedesktop.org \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=wayland-devel@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.