[PATCH v5 1/3] drm: Move drm_color_lut_check implementation internal to intel_color

From: Mark Yacoub
Date: Thu Nov 04 2021 - 16:03:02 EST

Next message: Mark Yacoub: "[PATCH v5 2/3] drm: Add Gamma and Degamma LUT sizes props to drm_crtc to validate."
Previous message: Ondrej Mosnacek: "[PATCH net] selinux: fix SCTP client peeloff socket labeling"
Next in thread: Mark Yacoub: "[PATCH v5 2/3] drm: Add Gamma and Degamma LUT sizes props to drm_crtc to validate."
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

From: Mark Yacoub <markyacoub@xxxxxxxxxx>

[Why]
The tests of LUT_EQUAL_CHANNELS and LUT_NON_DECREASING are currently
unique to i915 driver.
Freeing up the function name for the more generic LUT checks to folllow

Tested on Eldrid ChromeOS (TGL).

v2:
1. Convert the enum to #define.
2. Add INTEL_COLOR_ prefix.

v1:
Stuff the test function from DRM to intel driver.

Signed-off-by: Mark Yacoub <markyacoub@xxxxxxxxxxxx>
---
drivers/gpu/drm/drm_color_mgmt.c | 43 ----------------------
drivers/gpu/drm/i915/display/intel_color.c | 43 +++++++++++++++++++---
drivers/gpu/drm/i915/display/intel_color.h | 16 ++++++++
drivers/gpu/drm/i915/i915_pci.c | 28 ++++++++------
include/drm/drm_color_mgmt.h | 27 --------------
5 files changed, 71 insertions(+), 86 deletions(-)

diff --git a/drivers/gpu/drm/drm_color_mgmt.c b/drivers/gpu/drm/drm_color_mgmt.c
index bb14f488c8f6c..16a07f84948f3 100644
--- a/drivers/gpu/drm/drm_color_mgmt.c
+++ b/drivers/gpu/drm/drm_color_mgmt.c
@@ -583,46 +583,3 @@ int drm_plane_create_color_properties(struct drm_plane *plane,
return 0;
}
EXPORT_SYMBOL(drm_plane_create_color_properties);
-
-/**
- * drm_color_lut_check - check validity of lookup table
- * @lut: property blob containing LUT to check
- * @tests: bitmask of tests to run
- *
- * Helper to check whether a userspace-provided lookup table is valid and
- * satisfies hardware requirements. Drivers pass a bitmask indicating which of
- * the tests in &drm_color_lut_tests should be performed.
- *
- * Returns 0 on success, -EINVAL on failure.
- */
-int drm_color_lut_check(const struct drm_property_blob *lut, u32 tests)
-{
- const struct drm_color_lut *entry;
- int i;
-
- if (!lut || !tests)
- return 0;
-
- entry = lut->data;
- for (i = 0; i < drm_color_lut_size(lut); i++) {
- if (tests & DRM_COLOR_LUT_EQUAL_CHANNELS) {
- if (entry[i].red != entry[i].blue ||
- entry[i].red != entry[i].green) {
- DRM_DEBUG_KMS("All LUT entries must have equal r/g/b\n");
- return -EINVAL;
- }
- }
-
- if (i > 0 && tests & DRM_COLOR_LUT_NON_DECREASING) {
- if (entry[i].red < entry[i - 1].red ||
- entry[i].green < entry[i - 1].green ||
- entry[i].blue < entry[i - 1].blue) {
- DRM_DEBUG_KMS("LUT entries must never decrease.\n");
- return -EINVAL;
- }
- }
- }
-
- return 0;
-}
-EXPORT_SYMBOL(drm_color_lut_check);
diff --git a/drivers/gpu/drm/i915/display/intel_color.c b/drivers/gpu/drm/i915/display/intel_color.c
index dab892d2251ba..1469871d21ff9 100644
--- a/drivers/gpu/drm/i915/display/intel_color.c
+++ b/drivers/gpu/drm/i915/display/intel_color.c
@@ -1279,13 +1279,46 @@ static int check_lut_size(const struct drm_property_blob *lut, int expected)
return 0;
}

+static int test_luts(const struct drm_property_blob *lut, u32 tests)
+{
+ const struct drm_color_lut *entry;
+ int i;
+
+ if (!lut || !tests)
+ return 0;
+
+ entry = lut->data;
+ for (i = 0; i < drm_color_lut_size(lut); i++) {
+ if (tests & INTEL_COLOR_LUT_EQUAL_CHANNELS) {
+ if (entry[i].red != entry[i].blue ||
+ entry[i].red != entry[i].green) {
+ DRM_DEBUG_KMS(
+ "All LUT entries must have equal r/g/b\n");
+ return -EINVAL;
+ }
+ }
+
+ if (i > 0 && tests & INTEL_COLOR_LUT_NON_DECREASING) {
+ if (entry[i].red < entry[i - 1].red ||
+ entry[i].green < entry[i - 1].green ||
+ entry[i].blue < entry[i - 1].blue) {
+ DRM_DEBUG_KMS(
+ "LUT entries must never decrease.\n");
+ return -EINVAL;
+ }
+ }
+ }
+
+ return 0;
+}
+
static int check_luts(const struct intel_crtc_state *crtc_state)
{
struct drm_i915_private *dev_priv = to_i915(crtc_state->uapi.crtc->dev);
const struct drm_property_blob *gamma_lut = crtc_state->hw.gamma_lut;
const struct drm_property_blob *degamma_lut = crtc_state->hw.degamma_lut;
int gamma_length, degamma_length;
- u32 gamma_tests, degamma_tests;
+ u32 gamma_channels_tests, degamma_channels_tests;

/* Always allow legacy gamma LUT with no further checking. */
if (crtc_state_is_legacy_gamma(crtc_state))
@@ -1300,15 +1333,15 @@ static int check_luts(const struct intel_crtc_state *crtc_state)

degamma_length = INTEL_INFO(dev_priv)->color.degamma_lut_size;
gamma_length = INTEL_INFO(dev_priv)->color.gamma_lut_size;
- degamma_tests = INTEL_INFO(dev_priv)->color.degamma_lut_tests;
- gamma_tests = INTEL_INFO(dev_priv)->color.gamma_lut_tests;
+ degamma_channels_tests = INTEL_INFO(dev_priv)->color.degamma_lut_tests;
+ gamma_channels_tests = INTEL_INFO(dev_priv)->color.gamma_lut_tests;

if (check_lut_size(degamma_lut, degamma_length) ||
check_lut_size(gamma_lut, gamma_length))
return -EINVAL;

- if (drm_color_lut_check(degamma_lut, degamma_tests) ||
- drm_color_lut_check(gamma_lut, gamma_tests))
+ if (test_luts(degamma_lut, degamma_channels_tests) ||
+ test_luts(gamma_lut, gamma_channels_tests))
return -EINVAL;

return 0;
diff --git a/drivers/gpu/drm/i915/display/intel_color.h b/drivers/gpu/drm/i915/display/intel_color.h
index 173727aaa24d2..29b3b5edf256f 100644
--- a/drivers/gpu/drm/i915/display/intel_color.h
+++ b/drivers/gpu/drm/i915/display/intel_color.h
@@ -7,6 +7,22 @@
#define __INTEL_COLOR_H__

#include <linux/types.h>
+#include <linux/bits.h>
+
+/**
+ * The test_luts() function takes a bitmask of the values here to
+ * determine which tests to apply to a userspace-provided LUT.
+ *
+ * @INTEL_COLOR_LUT_EQUAL_CHANNELS: Checks whether the entries of a LUT all
+ * have equal values for the red, green, and blue channels. Intended for
+ * hardware that only accepts a single value per LUT entry and assumes that
+ * value applies to all three color components.
+ *
+ * @INTEL_COLOR_LUT_NON_DECREASING: Checks whether the entries of a LUT are
+ * always flat or increasing (never decreasing).
+*/
+#define INTEL_COLOR_LUT_EQUAL_CHANNELS BIT(0)
+#define INTEL_COLOR_LUT_NON_DECREASING BIT(1)

struct intel_crtc_state;
struct intel_crtc;
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 5e8348f506b8d..d75be5b2d8149 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -29,6 +29,7 @@
#include <drm/i915_pciids.h>

#include "display/intel_fbdev.h"
+#include "display/intel_color.h"

#include "i915_drv.h"
#include "i915_perf.h"
@@ -132,23 +133,28 @@

#define I9XX_COLORS \
.color = { .gamma_lut_size = 256 }
-#define I965_COLORS \
- .color = { .gamma_lut_size = 129, \
- .gamma_lut_tests = DRM_COLOR_LUT_NON_DECREASING, \
+#define I965_COLORS \
+ .color = { \
+ .gamma_lut_size = 129, \
+ .gamma_lut_tests = INTEL_COLOR_LUT_NON_DECREASING, \
}
#define ILK_COLORS \
.color = { .gamma_lut_size = 1024 }
#define IVB_COLORS \
.color = { .degamma_lut_size = 1024, .gamma_lut_size = 1024 }
-#define CHV_COLORS \
- .color = { .degamma_lut_size = 65, .gamma_lut_size = 257, \
- .degamma_lut_tests = DRM_COLOR_LUT_NON_DECREASING, \
- .gamma_lut_tests = DRM_COLOR_LUT_NON_DECREASING, \
+#define CHV_COLORS \
+ .color = { \
+ .degamma_lut_size = 65, \
+ .gamma_lut_size = 257, \
+ .degamma_lut_tests = INTEL_COLOR_LUT_NON_DECREASING, \
+ .gamma_lut_tests = INTEL_COLOR_LUT_NON_DECREASING, \
}
-#define GLK_COLORS \
- .color = { .degamma_lut_size = 33, .gamma_lut_size = 1024, \
- .degamma_lut_tests = DRM_COLOR_LUT_NON_DECREASING | \
- DRM_COLOR_LUT_EQUAL_CHANNELS, \
+#define GLK_COLORS \
+ .color = { \
+ .degamma_lut_size = 33, \
+ .gamma_lut_size = 1024, \
+ .degamma_lut_tests = INTEL_COLOR_LUT_NON_DECREASING | \
+ INTEL_COLOR_LUT_EQUAL_CHANNELS, \
}

/* Keep in gen based order, and chronological order within a gen */
diff --git a/include/drm/drm_color_mgmt.h b/include/drm/drm_color_mgmt.h
index 81c298488b0c8..3537f3eeb3872 100644
--- a/include/drm/drm_color_mgmt.h
+++ b/include/drm/drm_color_mgmt.h
@@ -93,31 +93,4 @@ int drm_plane_create_color_properties(struct drm_plane *plane,
enum drm_color_encoding default_encoding,
enum drm_color_range default_range);

-/**
- * enum drm_color_lut_tests - hw-specific LUT tests to perform
- *
- * The drm_color_lut_check() function takes a bitmask of the values here to
- * determine which tests to apply to a userspace-provided LUT.
- */
-enum drm_color_lut_tests {
- /**
- * @DRM_COLOR_LUT_EQUAL_CHANNELS:
- *
- * Checks whether the entries of a LUT all have equal values for the
- * red, green, and blue channels. Intended for hardware that only
- * accepts a single value per LUT entry and assumes that value applies
- * to all three color components.
- */
- DRM_COLOR_LUT_EQUAL_CHANNELS = BIT(0),
-
- /**
- * @DRM_COLOR_LUT_NON_DECREASING:
- *
- * Checks whether the entries of a LUT are always flat or increasing
- * (never decreasing).
- */
- DRM_COLOR_LUT_NON_DECREASING = BIT(1),
-};
-
-int drm_color_lut_check(const struct drm_property_blob *lut, u32 tests);
#endif
--
2.34.0.rc0.344.g81b53c2807-goog

Next message: Mark Yacoub: "[PATCH v5 2/3] drm: Add Gamma and Degamma LUT sizes props to drm_crtc to validate."
Previous message: Ondrej Mosnacek: "[PATCH net] selinux: fix SCTP client peeloff socket labeling"
Next in thread: Mark Yacoub: "[PATCH v5 2/3] drm: Add Gamma and Degamma LUT sizes props to drm_crtc to validate."
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]