Not all HW will be able to do bypass on all color
operations. Introduce an 'allow_bypass' boolean for
all colorop init functions and only create the BYPASS
property when it's true.
Signed-off-by: Harry Wentland <harry.wentland@xxxxxxx>
---
.../amd/display/amdgpu_dm/amdgpu_dm_colorop.c | 22 +++++---
drivers/gpu/drm/drm_atomic.c | 3 +-
drivers/gpu/drm/drm_colorop.c | 51 ++++++++++++-------
drivers/gpu/drm/vkms/vkms_colorop.c | 8 +--
include/drm/drm_colorop.h | 10 ++--
5 files changed, 60 insertions(+), 34 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 f0f7ef6b52a9..22bddb45043a 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_colorop_curve_1d_init(dev, ops[i], plane, amdgpu_dm_supported_degam_tfs);
+ ret = drm_colorop_curve_1d_init(dev, ops[i], plane,
+ amdgpu_dm_supported_degam_tfs,
+ true);
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_colorop_mult_init(dev, ops[i], plane);
+ ret = drm_colorop_mult_init(dev, ops[i], plane, true);
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_colorop_ctm_3x4_init(dev, ops[i], plane);
+ ret = drm_colorop_ctm_3x4_init(dev, ops[i], plane, true);
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_colorop_curve_1d_init(dev, ops[i], plane, amdgpu_dm_supported_shaper_tfs);
+ ret = drm_colorop_curve_1d_init(dev, ops[i], plane,
+ amdgpu_dm_supported_shaper_tfs,
+ true);
if (ret)
goto cleanup;
@@ -132,7 +136,8 @@ int amdgpu_dm_initialize_default_pipeline(struct drm_plane *plane, struct drm_pr
}
ret = drm_colorop_curve_1d_lut_init(dev, ops[i], plane, MAX_COLOR_LUT_ENTRIES,
- DRM_COLOROP_LUT1D_INTERPOLATION_LINEAR);
+ DRM_COLOROP_LUT1D_INTERPOLATION_LINEAR,
+ true);
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_colorop_curve_1d_init(dev, ops[i], plane, amdgpu_dm_supported_blnd_tfs);
+ ret = drm_colorop_curve_1d_init(dev, ops[i], plane,
+ amdgpu_dm_supported_blnd_tfs,
+ true);
if (ret)
goto cleanup;
@@ -165,7 +172,8 @@ int amdgpu_dm_initialize_default_pipeline(struct drm_plane *plane, struct drm_pr
}
ret = drm_colorop_curve_1d_lut_init(dev, ops[i], plane, MAX_COLOR_LUT_ENTRIES,
- DRM_COLOROP_LUT1D_INTERPOLATION_LINEAR);
+ DRM_COLOROP_LUT1D_INTERPOLATION_LINEAR,
+ true);
if (ret)
goto cleanup;
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index e492a06c3a6b..29f8a8f402f2 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 3ad3e22d37c2..df0266734639 100644
--- a/drivers/gpu/drm/drm_colorop.c
+++ b/drivers/gpu/drm/drm_colorop.c
@@ -84,7 +84,8 @@ static const struct drm_prop_enum_list drm_colorop_lut1d_interpolation_list[] =
/* Init Helpers */
static int drm_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,
+ bool allow_bypass)
{
struct drm_mode_config *config = &dev->mode_config;
struct drm_property *prop;
@@ -120,16 +121,18 @@ static int drm_colorop_init(struct drm_device *dev, struct drm_colorop *colorop,
colorop->type_property,
colorop->type);
- /* bypass */
- prop = drm_property_create_bool(dev, DRM_MODE_PROP_ATOMIC,
- "BYPASS");
- if (!prop)
- return -ENOMEM;
+ if (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);
+ 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,
@@ -153,10 +156,13 @@ static int drm_colorop_init(struct drm_device *dev, struct drm_colorop *colorop,
* @supported_tfs: A bitfield of supported drm_colorop_curve_1d_init enum values,
* created using BIT(curve_type) and combined with the OR '|'
* operator.
+ * @allow_bypass: true if BYPASS property should be created, false if bypass of
+ * this colorop is not possible
* @return zero on success, -E value on failure
*/
int drm_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,
+ bool allow_bypass)
{
struct drm_prop_enum_list enum_list[DRM_COLOROP_1D_CURVE_COUNT];
int i, len;
@@ -177,7 +183,8 @@ int drm_colorop_curve_1d_init(struct drm_device *dev, struct drm_colorop *coloro
return -EINVAL;
}
- ret = drm_colorop_init(dev, colorop, plane, DRM_COLOROP_1D_CURVE);
+ ret = drm_colorop_init(dev, colorop, plane, DRM_COLOROP_1D_CURVE,
+ allow_bypass);
if (ret)
return ret;
@@ -237,16 +244,20 @@ 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
+ * @allow_bypass: true if BYPASS property should be created, false if bypass of
+ * this colorop is not possible
* @return zero on success, -E value on failure
*/
int drm_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,
+ bool allow_bypass)
{
struct drm_property *prop;
int ret;
- ret = drm_colorop_init(dev, colorop, plane, DRM_COLOROP_1D_LUT);
+ ret = drm_colorop_init(dev, colorop, plane, DRM_COLOROP_1D_LUT,
+ allow_bypass);
if (ret)
return ret;
@@ -284,11 +295,12 @@ int drm_colorop_curve_1d_lut_init(struct drm_device *dev, struct drm_colorop *co
EXPORT_SYMBOL(drm_colorop_curve_1d_lut_init);
int drm_colorop_ctm_3x4_init(struct drm_device *dev, struct drm_colorop *colorop,
- struct drm_plane *plane)
+ struct drm_plane *plane, bool allow_bypass)
{
int ret;
- ret = drm_colorop_init(dev, colorop, plane, DRM_COLOROP_CTM_3X4);
+ ret = drm_colorop_init(dev, colorop, plane, DRM_COLOROP_CTM_3X4,
+ allow_bypass);
if (ret)
return ret;
@@ -308,15 +320,18 @@ EXPORT_SYMBOL(drm_colorop_ctm_3x4_init);
* @dev: DRM device
* @colorop: The drm_colorop object to initialize
* @plane: The associated drm_plane
+ * @allow_bypass: true if BYPASS property should be created, false if bypass of
+ * this colorop is not possible
* @return zero on success, -E value on failure
*/
int drm_colorop_mult_init(struct drm_device *dev, struct drm_colorop *colorop,
- struct drm_plane *plane)
+ struct drm_plane *plane, bool allow_bypass)
{
struct drm_property *prop;
int ret;
- ret = drm_colorop_init(dev, colorop, plane, DRM_COLOROP_MULTIPLIER);
+ ret = drm_colorop_init(dev, colorop, plane, DRM_COLOROP_MULTIPLIER,
+ allow_bypass);
if (ret)
return ret;
diff --git a/drivers/gpu/drm/vkms/vkms_colorop.c b/drivers/gpu/drm/vkms/vkms_colorop.c
index f0c264820a81..519521e9b908 100644
--- a/drivers/gpu/drm/vkms/vkms_colorop.c
+++ b/drivers/gpu/drm/vkms/vkms_colorop.c
@@ -31,7 +31,7 @@ static int vkms_initialize_color_pipeline(struct drm_plane *plane, struct drm_pr
goto cleanup;
}
- ret = drm_colorop_curve_1d_init(dev, ops[i], plane, supported_tfs);
+ ret = drm_colorop_curve_1d_init(dev, ops[i], plane, supported_tfs, true);
if (ret)
goto cleanup;
@@ -48,7 +48,7 @@ static int vkms_initialize_color_pipeline(struct drm_plane *plane, struct drm_pr
goto cleanup;
}
- ret = drm_colorop_ctm_3x4_init(dev, ops[i], plane);
+ ret = drm_colorop_ctm_3x4_init(dev, ops[i], plane, true);
if (ret)
goto cleanup;
@@ -64,7 +64,7 @@ static int vkms_initialize_color_pipeline(struct drm_plane *plane, struct drm_pr
goto cleanup;
}
- ret = drm_colorop_ctm_3x4_init(dev, ops[i], plane);
+ ret = drm_colorop_ctm_3x4_init(dev, ops[i], plane, true);
if (ret)
goto cleanup;
@@ -80,7 +80,7 @@ static int vkms_initialize_color_pipeline(struct drm_plane *plane, struct drm_pr
goto cleanup;
}
- ret = drm_colorop_curve_1d_init(dev, ops[i], plane, supported_tfs);
+ ret = drm_colorop_curve_1d_init(dev, ops[i], plane, supported_tfs, true);
if (ret)
goto cleanup;
diff --git a/include/drm/drm_colorop.h b/include/drm/drm_colorop.h
index d3a00296973d..b8c1c4da3444 100644
--- a/include/drm/drm_colorop.h
+++ b/include/drm/drm_colorop.h
@@ -333,14 +333,16 @@ static inline struct drm_colorop *drm_colorop_find(struct drm_device *dev,
}
int drm_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,
+ bool allow_bypass);
int drm_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,
+ bool allow_bypass);
int drm_colorop_ctm_3x4_init(struct drm_device *dev, struct drm_colorop *colorop,
- struct drm_plane *plane);
+ struct drm_plane *plane, bool allow_bypass);
int drm_colorop_mult_init(struct drm_device *dev, struct drm_colorop *colorop,
- struct drm_plane *plane);
+ struct drm_plane *plane, bool allow_bypass);
struct drm_colorop_state *
drm_atomic_helper_colorop_duplicate_state(struct drm_colorop *colorop);
--
2.46.2
