Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56dbbaff authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/atomic: Include color encoding/range in plane state dump 



Include color_enconding and color_range in the plane state dump.

v2: Add kerneldoc (danvet)

Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Daniel Stone <daniel@fooishbar.org>
Cc: Russell King - ARM Linux <linux@armlinux.org.uk>
Cc: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: Hans Verkuil <hverkuil@xs4all.nl>
Cc: Uma Shankar <uma.shankar@intel.com>
Cc: Shashank Sharma <shashank.sharma@intel.com>
Cc: Jyri Sarha <jsarha@ti.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180219202846.10628-1-ville.syrjala@linux.intel.com


Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
parent 80f690e9

drivers/gpu/drm/drm_atomic.c

+4 −0
Original line number Diff line number Diff line
@@ -954,6 +954,10 @@ static void drm_atomic_plane_print_state(struct drm_printer *p, 
	drm_printf(p, "\tcrtc-pos=" DRM_RECT_FMT "\n", DRM_RECT_ARG(&dest));

	drm_printf(p, "\tsrc-pos=" DRM_RECT_FP_FMT "\n", DRM_RECT_FP_ARG(&src));

	drm_printf(p, "\trotation=%x\n", state->rotation);

	drm_printf(p, "\tcolor-encoding=%s\n",

		   drm_get_color_encoding_name(state->color_encoding));

	drm_printf(p, "\tcolor-range=%s\n",

		   drm_get_color_range_name(state->color_range));



	if (plane->funcs->atomic_print_state)

		plane->funcs->atomic_print_state(p, state);

drivers/gpu/drm/drm_color_mgmt.c

+30 −0
Original line number Diff line number Diff line
@@ -365,6 +365,36 @@ static const char * const color_range_name[] = { 
	[DRM_COLOR_YCBCR_LIMITED_RANGE] = "YCbCr limited range",

};



/**

 * drm_get_color_encoding_name - return a string for color encoding

 * @encoding: color encoding to compute name of

 *

 * In contrast to the other drm_get_*_name functions this one here returns a

 * const pointer and hence is threadsafe.

 */

const char *drm_get_color_encoding_name(enum drm_color_encoding encoding)

{

	if (WARN_ON(encoding >= ARRAY_SIZE(color_encoding_name)))

		return "unknown";



	return color_encoding_name[encoding];

}



/**

 * drm_get_color_range_name - return a string for color range

 * @range: color range to compute name of

 *

 * In contrast to the other drm_get_*_name functions this one here returns a

 * const pointer and hence is threadsafe.

 */

const char *drm_get_color_range_name(enum drm_color_range range)

{

	if (WARN_ON(range >= ARRAY_SIZE(color_range_name)))

		return "unknown";



	return color_range_name[range];

}



/**

 * drm_plane_create_color_properties - color encoding related plane properties

 * @plane: plane object

drivers/gpu/drm/drm_crtc_internal.h

+2 −0
Original line number Diff line number Diff line
@@ -71,6 +71,8 @@ int drm_mode_destroy_dumb_ioctl(struct drm_device *dev, 
				void *data, struct drm_file *file_priv);



/* drm_color_mgmt.c */

const char *drm_get_color_encoding_name(enum drm_color_encoding encoding);

const char *drm_get_color_range_name(enum drm_color_range range);



/* IOCTLs */

int drm_mode_gamma_get_ioctl(struct drm_device *dev,