From: Harry Wentland <harry.wentl...@amd.com>
Not all HW will be able to do bypass on all color
operations. Introduce an 32 bits 'flags' for all colorop
init functions and DRM_COLOROP_FLAG_ALLOW_BYPASS for creating
the BYPASS property when it's true.
Signed-off-by: Alex Hung <alex.h...@amd.com>
Signed-off-by: Harry Wentland <harry.wentl...@amd.com>
Reviewed-by: Daniel Stone <dani...@collabora.com>
---
V9:
- Update function names by _plane_ (Chaitanya Kumar Borah)
- Chagne "bool allow_bypass" to "uint32_t flags" for better extensibility
(Simon Ser)
.../amd/display/amdgpu_dm/amdgpu_dm_colorop.c | 22 +++++++---
drivers/gpu/drm/drm_atomic.c | 3 +-
drivers/gpu/drm/drm_colorop.c | 44 +++++++++++--------
drivers/gpu/drm/vkms/vkms_colorop.c | 10 +++--
include/drm/drm_colorop.h | 11 +++--
5 files changed, 55 insertions(+), 35 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.c
b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.c
index ff11cb0603c8..10b3e3906461 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.c
@@ -66,7 +66,9 @@ int amdgpu_dm_initialize_default_pipeline(struct drm_plane
*plane, struct drm_pr
goto cleanup;
}
- ret = drm_plane_colorop_curve_1d_init(dev, ops[i], plane,
amdgpu_dm_supported_degam_tfs);
+ ret = drm_plane_colorop_curve_1d_init(dev, ops[i], plane,
+ amdgpu_dm_supported_degam_tfs,
+ DRM_COLOROP_FLAG_ALLOW_BYPASS);
if (ret)
goto cleanup;
@@ -83,7 +85,7 @@ int amdgpu_dm_initialize_default_pipeline(struct drm_plane
*plane, struct drm_pr
goto cleanup;
}
- ret = drm_plane_colorop_mult_init(dev, ops[i], plane);
+ ret = drm_plane_colorop_mult_init(dev, ops[i], plane,
DRM_COLOROP_FLAG_ALLOW_BYPASS);
if (ret)
goto cleanup;
@@ -99,7 +101,7 @@ int amdgpu_dm_initialize_default_pipeline(struct drm_plane
*plane, struct drm_pr
goto cleanup;
}
- ret = drm_plane_colorop_ctm_3x4_init(dev, ops[i], plane);
+ ret = drm_plane_colorop_ctm_3x4_init(dev, ops[i], plane,
DRM_COLOROP_FLAG_ALLOW_BYPASS);
if (ret)
goto cleanup;
@@ -115,7 +117,9 @@ int amdgpu_dm_initialize_default_pipeline(struct drm_plane
*plane, struct drm_pr
goto cleanup;
}
- ret = drm_plane_colorop_curve_1d_init(dev, ops[i], plane,
amdgpu_dm_supported_shaper_tfs);
+ ret = drm_plane_colorop_curve_1d_init(dev, ops[i], plane,
+ amdgpu_dm_supported_shaper_tfs,
+ DRM_COLOROP_FLAG_ALLOW_BYPASS);
if (ret)
goto cleanup;
@@ -132,7 +136,8 @@ int amdgpu_dm_initialize_default_pipeline(struct drm_plane
*plane, struct drm_pr
}
ret = drm_plane_colorop_curve_1d_lut_init(dev, ops[i], plane,
MAX_COLOR_LUT_ENTRIES,
-
DRM_COLOROP_LUT1D_INTERPOLATION_LINEAR);
+
DRM_COLOROP_LUT1D_INTERPOLATION_LINEAR,
+
DRM_COLOROP_FLAG_ALLOW_BYPASS);
if (ret)
goto cleanup;
@@ -148,7 +153,9 @@ int amdgpu_dm_initialize_default_pipeline(struct drm_plane
*plane, struct drm_pr
goto cleanup;
}
- ret = drm_plane_colorop_curve_1d_init(dev, ops[i], plane,
amdgpu_dm_supported_blnd_tfs);
+ ret = drm_plane_colorop_curve_1d_init(dev, ops[i], plane,
+ amdgpu_dm_supported_blnd_tfs,
+ DRM_COLOROP_FLAG_ALLOW_BYPASS);
if (ret)
goto cleanup;
@@ -165,7 +172,8 @@ int amdgpu_dm_initialize_default_pipeline(struct drm_plane
*plane, struct drm_pr
}
ret = drm_plane_colorop_curve_1d_lut_init(dev, ops[i], plane,
MAX_COLOR_LUT_ENTRIES,
-
DRM_COLOROP_LUT1D_INTERPOLATION_LINEAR);
+
DRM_COLOROP_LUT1D_INTERPOLATION_LINEAR,
+
DRM_COLOROP_FLAG_ALLOW_BYPASS);
if (ret)
goto cleanup;
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index 90df638f25d5..41dd6a90e13b 100644
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -786,7 +786,8 @@ static void drm_atomic_colorop_print_state(struct
drm_printer *p,
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);
+ if (colorop->bypass_property)
+ drm_printf(p, "\tbypass=%u\n", state->bypass);
switch (colorop->type) {
case DRM_COLOROP_1D_CURVE:
diff --git a/drivers/gpu/drm/drm_colorop.c b/drivers/gpu/drm/drm_colorop.c
index 125b3e507d6c..38bbe57db348 100644
--- a/drivers/gpu/drm/drm_colorop.c
+++ b/drivers/gpu/drm/drm_colorop.c
@@ -85,7 +85,7 @@ static const struct drm_prop_enum_list
drm_colorop_lut1d_interpolation_list[] =
/* Init Helpers */
static int drm_plane_colorop_init(struct drm_device *dev, struct drm_colorop
*colorop,
- struct drm_plane *plane, enum drm_colorop_type type)
+ struct drm_plane *plane, enum drm_colorop_type
type, uint32_t flags)
{
struct drm_mode_config *config = &dev->mode_config;
struct drm_property *prop;
@@ -121,16 +121,18 @@ static int drm_plane_colorop_init(struct drm_device *dev,
struct drm_colorop *co
colorop->type_property,
colorop->type);
- /* bypass */
- prop = drm_property_create_bool(dev, DRM_MODE_PROP_ATOMIC,
- "BYPASS");
- if (!prop)
- return -ENOMEM;
-
- colorop->bypass_property = prop;
- drm_object_attach_property(&colorop->base,
- colorop->bypass_property,
- 1);
+ if (flags & DRM_COLOROP_FLAG_ALLOW_BYPASS) {
+ /* bypass */
+ prop = drm_property_create_bool(dev, DRM_MODE_PROP_ATOMIC,
+ "BYPASS");
+ if (!prop)
+ return -ENOMEM;
+
+ colorop->bypass_property = prop;
+ drm_object_attach_property(&colorop->base,
+ colorop->bypass_property,
+ 1);
+ }
/* next */
prop = drm_property_create_object(dev, DRM_MODE_PROP_IMMUTABLE |
DRM_MODE_PROP_ATOMIC,
@@ -195,10 +197,11 @@ EXPORT_SYMBOL(drm_colorop_pipeline_destroy);
* @supported_tfs: A bitfield of supported drm_plane_colorop_curve_1d_init
enum values,
* created using BIT(curve_type) and combined with the OR '|'
* operator.
+ * @flags: bitmask of misc, see DRM_COLOROP_FLAGS_* defines.
* @return zero on success, -E value on failure
*/
int drm_plane_colorop_curve_1d_init(struct drm_device *dev, struct drm_colorop
*colorop,
- struct drm_plane *plane, u64 supported_tfs)
+ struct drm_plane *plane, u64 supported_tfs,
uint32_t flags)
{
struct drm_prop_enum_list enum_list[DRM_COLOROP_1D_CURVE_COUNT];
int i, len;
@@ -219,7 +222,7 @@ int drm_plane_colorop_curve_1d_init(struct drm_device *dev,
struct drm_colorop *
return -EINVAL;
}
- ret = drm_plane_colorop_init(dev, colorop, plane, DRM_COLOROP_1D_CURVE);
+ ret = drm_plane_colorop_init(dev, colorop, plane, DRM_COLOROP_1D_CURVE,
flags);
if (ret)
return ret;
@@ -279,16 +282,18 @@ static int drm_colorop_create_data_prop(struct drm_device
*dev, struct drm_color
* @plane: The associated drm_plane
* @lut_size: LUT size supported by driver
* @lut1d_interpolation: 1D LUT interpolation type
+ * @flags: bitmask of misc, see DRM_COLOROP_FLAGS_* defines.
* @return zero on success, -E value on failure
*/
int drm_plane_colorop_curve_1d_lut_init(struct drm_device *dev, struct
drm_colorop *colorop,
struct drm_plane *plane, uint32_t
lut_size,
- enum
drm_colorop_lut1d_interpolation_type lut1d_interpolation)
+ enum
drm_colorop_lut1d_interpolation_type lut1d_interpolation,
+ uint32_t flags)
{
struct drm_property *prop;
int ret;
- ret = drm_plane_colorop_init(dev, colorop, plane, DRM_COLOROP_1D_LUT);
+ ret = drm_plane_colorop_init(dev, colorop, plane, DRM_COLOROP_1D_LUT,
flags);
if (ret)
return ret;
@@ -326,11 +331,11 @@ int drm_plane_colorop_curve_1d_lut_init(struct drm_device
*dev, struct drm_color
EXPORT_SYMBOL(drm_plane_colorop_curve_1d_lut_init);
int drm_plane_colorop_ctm_3x4_init(struct drm_device *dev, struct drm_colorop
*colorop,
- struct drm_plane *plane)
+ struct drm_plane *plane, uint32_t flags)
{
int ret;
- ret = drm_plane_colorop_init(dev, colorop, plane, DRM_COLOROP_CTM_3X4);
+ ret = drm_plane_colorop_init(dev, colorop, plane, DRM_COLOROP_CTM_3X4,
flags);
if (ret)
return ret;
@@ -350,15 +355,16 @@ EXPORT_SYMBOL(drm_plane_colorop_ctm_3x4_init);
* @dev: DRM device
* @colorop: The drm_colorop object to initialize
* @plane: The associated drm_plane
+ * @flags: bitmask of misc, see DRM_COLOROP_FLAGS_* defines.
* @return zero on success, -E value on failure
*/
int drm_plane_colorop_mult_init(struct drm_device *dev, struct drm_colorop
*colorop,
- struct drm_plane *plane)
+ struct drm_plane *plane, uint32_t flags)
{
struct drm_property *prop;
int ret;
- ret = drm_plane_colorop_init(dev, colorop, plane,
DRM_COLOROP_MULTIPLIER);
+ ret = drm_plane_colorop_init(dev, colorop, plane,
DRM_COLOROP_MULTIPLIER, flags);
if (ret)
return ret;
diff --git a/drivers/gpu/drm/vkms/vkms_colorop.c
b/drivers/gpu/drm/vkms/vkms_colorop.c
index 70be35804ea9..f61834d2ea30 100644
--- a/drivers/gpu/drm/vkms/vkms_colorop.c
+++ b/drivers/gpu/drm/vkms/vkms_colorop.c
@@ -31,7 +31,8 @@ static int vkms_initialize_color_pipeline(struct drm_plane
*plane, struct drm_pr
goto cleanup;
}
- ret = drm_plane_colorop_curve_1d_init(dev, ops[i], plane,
supported_tfs);
+ ret = drm_plane_colorop_curve_1d_init(dev, ops[i], plane, supported_tfs,
+ DRM_COLOROP_FLAG_ALLOW_BYPASS);
if (ret)
goto cleanup;
@@ -48,7 +49,7 @@ static int vkms_initialize_color_pipeline(struct drm_plane
*plane, struct drm_pr
goto cleanup;
}
- ret = drm_plane_colorop_ctm_3x4_init(dev, ops[i], plane);
+ ret = drm_plane_colorop_ctm_3x4_init(dev, ops[i], plane,
DRM_COLOROP_FLAG_ALLOW_BYPASS);
if (ret)
goto cleanup;
@@ -64,7 +65,7 @@ static int vkms_initialize_color_pipeline(struct drm_plane
*plane, struct drm_pr
goto cleanup;
}
- ret = drm_plane_colorop_ctm_3x4_init(dev, ops[i], plane);
+ ret = drm_plane_colorop_ctm_3x4_init(dev, ops[i], plane,
DRM_COLOROP_FLAG_ALLOW_BYPASS);
if (ret)
goto cleanup;
@@ -80,7 +81,8 @@ static int vkms_initialize_color_pipeline(struct drm_plane
*plane, struct drm_pr
goto cleanup;
}
- ret = drm_plane_colorop_curve_1d_init(dev, ops[i], plane,
supported_tfs);
+ ret = drm_plane_colorop_curve_1d_init(dev, ops[i], plane, supported_tfs,
+ DRM_COLOROP_FLAG_ALLOW_BYPASS);
if (ret)
goto cleanup;
diff --git a/include/drm/drm_colorop.h b/include/drm/drm_colorop.h
index 00dbde7e1a92..e79472739d11 100644
--- a/include/drm/drm_colorop.h
+++ b/include/drm/drm_colorop.h
@@ -31,6 +31,8 @@
#include <drm/drm_mode.h>
#include <drm/drm_property.h>
+/* DRM colorop flags */
+#define DRM_COLOROP_FLAG_ALLOW_BYPASS (1<<0) /* Allow bypass on the
drm_colorop */
/**
* enum drm_colorop_curve_1d_type - type of 1D curve
@@ -354,14 +356,15 @@ static inline struct drm_colorop *drm_colorop_find(struct
drm_device *dev,
void drm_colorop_pipeline_destroy(struct drm_plane *plane);
int drm_plane_colorop_curve_1d_init(struct drm_device *dev, struct drm_colorop
*colorop,
- struct drm_plane *plane, u64 supported_tfs);
+ struct drm_plane *plane, u64 supported_tfs,
uint32_t flags);
int drm_plane_colorop_curve_1d_lut_init(struct drm_device *dev, struct
drm_colorop *colorop,
struct drm_plane *plane, uint32_t
lut_size,
- enum
drm_colorop_lut1d_interpolation_type lut1d_interpolation);
+ enum
drm_colorop_lut1d_interpolation_type lut1d_interpolation,
+ uint32_t flags);
int drm_plane_colorop_ctm_3x4_init(struct drm_device *dev, struct drm_colorop
*colorop,
- struct drm_plane *plane);
+ struct drm_plane *plane, uint32_t flags);
int drm_plane_colorop_mult_init(struct drm_device *dev, struct drm_colorop
*colorop,
- struct drm_plane *plane);
+ struct drm_plane *plane, uint32_t flags);
struct drm_colorop_state *
drm_atomic_helper_colorop_duplicate_state(struct drm_colorop *colorop);
--
2.43.0
