From: Swati Sharma <swati2.sharma@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: jani.nikula@intel.com, daniel.vetter@ffwll.ch,
ankit.k.nautiyal@intel.com
Subject: [v8][PATCH 04/10] drm/i915/display: Add macro to compare gamma hw/sw lut
Date: Mon, 26 Aug 2019 11:56:06 +0530 [thread overview]
Message-ID: <1566800772-18412-5-git-send-email-swati2.sharma@intel.com> (raw)
In-Reply-To: <1566800772-18412-1-git-send-email-swati2.sharma@intel.com>
Add macro to compare hw/sw gamma lut values. First need to
check whether hw/sw gamma mode matches or not. If not
no need to compare lut values, if matches then only compare
lut entries.
Signed-off-by: Swati Sharma <swati2.sharma@intel.com>
---
drivers/gpu/drm/i915/display/intel_display.c | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index ca88c70..63b7ad7 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -12529,6 +12529,7 @@ static bool fastboot_enabled(struct drm_i915_private *dev_priv)
{
struct drm_i915_private *dev_priv = to_i915(current_config->base.crtc->dev);
bool ret = true;
+ u32 bp_gamma = 0;
bool fixup_inherited = fastset &&
(current_config->base.mode.private_flags & I915_MODE_FLAG_INHERITED) &&
!(pipe_config->base.mode.private_flags & I915_MODE_FLAG_INHERITED);
@@ -12680,6 +12681,24 @@ static bool fastboot_enabled(struct drm_i915_private *dev_priv)
} \
} while (0)
+#define PIPE_CONF_CHECK_COLOR_LUT(name1, name2, bit_precision) do { \
+ if (current_config->name1 != pipe_config->name1) { \
+ pipe_config_mismatch(fastset, __stringify(name1), \
+ "(expected %i, found %i, won't compare lut values)\n", \
+ current_config->name1, \
+ pipe_config->name1); \
+ ret = false;\
+ } else { \
+ if (!intel_color_lut_equal(current_config->name2, \
+ pipe_config->name2, pipe_config->name1, \
+ bit_precision)) { \
+ pipe_config_mismatch(fastset, __stringify(name2), \
+ "hw_state doesn't match sw_state\n"); \
+ ret = false; \
+ } \
+ } \
+} while (0)
+
#define PIPE_CONF_QUIRK(quirk) \
((current_config->quirks | pipe_config->quirks) & (quirk))
@@ -12775,6 +12794,11 @@ static bool fastboot_enabled(struct drm_i915_private *dev_priv)
PIPE_CONF_CHECK_X(csc_mode);
PIPE_CONF_CHECK_BOOL(gamma_enable);
PIPE_CONF_CHECK_BOOL(csc_enable);
+
+ bp_gamma = intel_color_get_gamma_bit_precision(pipe_config);
+ if (bp_gamma)
+ PIPE_CONF_CHECK_COLOR_LUT(gamma_mode, base.gamma_lut, bp_gamma);
+
}
PIPE_CONF_CHECK_BOOL(double_wide);
@@ -12837,6 +12861,7 @@ static bool fastboot_enabled(struct drm_i915_private *dev_priv)
#undef PIPE_CONF_CHECK_P
#undef PIPE_CONF_CHECK_FLAGS
#undef PIPE_CONF_CHECK_CLOCK_FUZZY
+#undef PIPE_CONF_CHECK_COLOR_LUT
#undef PIPE_CONF_QUIRK
return ret;
--
1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2019-08-26 6:36 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-26 6:26 [v8][PATCH 00/10] drm/i915: adding state checker for gamma lut value Swati Sharma
2019-08-26 6:26 ` [v8][PATCH 01/10] drm/i915/display: Add func to get gamma bit precision Swati Sharma
2019-08-28 13:22 ` Shankar, Uma
2019-08-26 6:26 ` [v8][PATCH 02/10] drm/i915/display: Add debug log for color parameters Swati Sharma
2019-08-28 14:07 ` Shankar, Uma
2019-08-26 6:26 ` [v8][PATCH 03/10] drm/i915/display: Add func to compare hw/sw gamma lut Swati Sharma
2019-08-28 15:22 ` Shankar, Uma
2019-08-26 6:26 ` Swati Sharma [this message]
2019-08-28 15:35 ` [v8][PATCH 04/10] drm/i915/display: Add macro to compare gamma hw/sw lut Shankar, Uma
2019-08-26 6:26 ` [v8][PATCH 05/10] drm/i915/display: Extract i9xx_read_luts() Swati Sharma
2019-08-28 15:55 ` Shankar, Uma
2019-08-28 20:29 ` Sharma, Swati2
2019-08-29 15:15 ` Shankar, Uma
2019-08-26 6:26 ` [v8][PATCH 06/10] drm/i91/display: Extract i965_read_luts() Swati Sharma
2019-08-28 16:08 ` Shankar, Uma
2019-08-28 16:11 ` Shankar, Uma
2019-08-28 20:48 ` Sharma, Swati2
2019-08-28 21:48 ` Sharma, Swati2
2019-08-26 6:26 ` [v8][PATCH 09/10] drm/i915/display: Extract glk_read_luts() Swati Sharma
2019-08-28 16:30 ` Shankar, Uma
2019-08-26 6:26 ` [v8][PATCH 10/10] FOR_TESTING_ONLY: Print rgb values of hw and sw blobs Swati Sharma
2019-08-26 6:44 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: adding state checker for gamma lut value Patchwork
2019-08-26 6:49 ` ✗ Fi.CI.SPARSE: " Patchwork
2019-08-26 7:08 ` ✓ Fi.CI.BAT: success " Patchwork
2019-08-26 9:13 ` ✓ Fi.CI.IGT: " Patchwork
2019-08-28 13:11 ` [v8][PATCH 00/10] " Shankar, Uma
[not found] ` <1566800772-18412-8-git-send-email-swati2.sharma@intel.com>
2019-08-28 16:16 ` [v8][PATCH 07/10] drm/i915/display: Extract chv_read_luts() Shankar, Uma
[not found] ` <1566800772-18412-9-git-send-email-swati2.sharma@intel.com>
2019-08-28 16:24 ` [v8][PATCH 08/10] drm/i915/display: Extract ilk_read_luts() Shankar, Uma
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1566800772-18412-5-git-send-email-swati2.sharma@intel.com \
--to=swati2.sharma@intel.com \
--cc=ankit.k.nautiyal@intel.com \
--cc=daniel.vetter@ffwll.ch \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox