Message ID | 20180219202846.10628-1-ville.syrjala@linux.intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Mon, Feb 19, 2018 at 10:28:46PM +0200, Ville Syrjala wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > 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: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > drivers/gpu/drm/drm_atomic.c | 4 ++++ > drivers/gpu/drm/drm_color_mgmt.c | 30 ++++++++++++++++++++++++++++++ > drivers/gpu/drm/drm_crtc_internal.h | 2 ++ > 3 files changed, 36 insertions(+) > > diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c > index 452a0b0bafbc..9552052ed31a 100644 > --- a/drivers/gpu/drm/drm_atomic.c > +++ b/drivers/gpu/drm/drm_atomic.c > @@ -952,6 +952,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); > diff --git a/drivers/gpu/drm/drm_color_mgmt.c b/drivers/gpu/drm/drm_color_mgmt.c > index 7b0f1c2d9190..a11a838741c2 100644 > --- a/drivers/gpu/drm/drm_color_mgmt.c > +++ b/drivers/gpu/drm/drm_color_mgmt.c > @@ -367,6 +367,36 @@ static const char * const color_range_name[] = { > }; > > /** > + * 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 > * @supported_encodings: bitfield indicating supported color encodings > diff --git a/drivers/gpu/drm/drm_crtc_internal.h b/drivers/gpu/drm/drm_crtc_internal.h > index af00f42ba269..8ca2ffef6231 100644 > --- a/drivers/gpu/drm/drm_crtc_internal.h > +++ b/drivers/gpu/drm/drm_crtc_internal.h > @@ -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, > -- > 2.13.6 >
On 2018-02-19 03:28 PM, Ville Syrjala wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > 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: Ville Syrjälä <ville.syrjala@linux.intel.com> Latest patches for 1-3 are Acked-by: Harry Wentland <harry.wentland@amd.com> Harry > --- > drivers/gpu/drm/drm_atomic.c | 4 ++++ > drivers/gpu/drm/drm_color_mgmt.c | 30 ++++++++++++++++++++++++++++++ > drivers/gpu/drm/drm_crtc_internal.h | 2 ++ > 3 files changed, 36 insertions(+) > > diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c > index 452a0b0bafbc..9552052ed31a 100644 > --- a/drivers/gpu/drm/drm_atomic.c > +++ b/drivers/gpu/drm/drm_atomic.c > @@ -952,6 +952,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); > diff --git a/drivers/gpu/drm/drm_color_mgmt.c b/drivers/gpu/drm/drm_color_mgmt.c > index 7b0f1c2d9190..a11a838741c2 100644 > --- a/drivers/gpu/drm/drm_color_mgmt.c > +++ b/drivers/gpu/drm/drm_color_mgmt.c > @@ -367,6 +367,36 @@ static const char * const color_range_name[] = { > }; > > /** > + * 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 > * @supported_encodings: bitfield indicating supported color encodings > diff --git a/drivers/gpu/drm/drm_crtc_internal.h b/drivers/gpu/drm/drm_crtc_internal.h > index af00f42ba269..8ca2ffef6231 100644 > --- a/drivers/gpu/drm/drm_crtc_internal.h > +++ b/drivers/gpu/drm/drm_crtc_internal.h > @@ -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, >
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 452a0b0bafbc..9552052ed31a 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -952,6 +952,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); diff --git a/drivers/gpu/drm/drm_color_mgmt.c b/drivers/gpu/drm/drm_color_mgmt.c index 7b0f1c2d9190..a11a838741c2 100644 --- a/drivers/gpu/drm/drm_color_mgmt.c +++ b/drivers/gpu/drm/drm_color_mgmt.c @@ -367,6 +367,36 @@ static const char * const color_range_name[] = { }; /** + * 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 * @supported_encodings: bitfield indicating supported color encodings diff --git a/drivers/gpu/drm/drm_crtc_internal.h b/drivers/gpu/drm/drm_crtc_internal.h index af00f42ba269..8ca2ffef6231 100644 --- a/drivers/gpu/drm/drm_crtc_internal.h +++ b/drivers/gpu/drm/drm_crtc_internal.h @@ -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,