From: Nischal Varide <nischal.varide@intel.com>
To: intel-gfx@lists.freedesktop.org, nischal.varide@intel.com,
uma.shankar@intel.com, anshuman.gupta@intel.com,
jani.nikula@intel.com
Subject: [Intel-gfx] [PATCH v2 1/1] drm/i915/xelpd: Enabling dithering after the CC1
Date: Wed, 2 Jun 2021 11:47:39 +0530 [thread overview]
Message-ID: <20210602061739.29134-2-nischal.varide@intel.com> (raw)
In-Reply-To: <20210602061739.29134-1-nischal.varide@intel.com>
If the panel is 12bpc then Dithering is not enabled in the Legacy
dithering block , instead its Enabled after the C1 CC1 pipe post
color space conversion.For a 6bpc pannel Dithering is enabled in
Legacy block.
Signed-off-by: Nischal Varide <nischal.varide@intel.com>
---
drivers/gpu/drm/i915/display/intel_color.c | 7 +++++++
drivers/gpu/drm/i915/display/intel_display.c | 7 ++++++-
drivers/gpu/drm/i915/i915_reg.h | 1 +
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/display/intel_color.c b/drivers/gpu/drm/i915/display/intel_color.c
index dab892d2251b..e11b3dbf0b95 100644
--- a/drivers/gpu/drm/i915/display/intel_color.c
+++ b/drivers/gpu/drm/i915/display/intel_color.c
@@ -1574,6 +1574,7 @@ static int glk_color_check(struct intel_crtc_state *crtc_state)
static u32 icl_gamma_mode(const struct intel_crtc_state *crtc_state)
{
u32 gamma_mode = 0;
+ struct drm_i915_private *i915 = to_i915(crtc_state->uapi.crtc->dev);
if (crtc_state->hw.degamma_lut)
gamma_mode |= PRE_CSC_GAMMA_ENABLE;
@@ -1588,6 +1589,12 @@ static u32 icl_gamma_mode(const struct intel_crtc_state *crtc_state)
else
gamma_mode |= GAMMA_MODE_MODE_12BIT_MULTI_SEGMENTED;
+ if (DISPLAY_VER(i915) >= 13) {
+ if (!crtc_state->dither_force_disable &&
+ (crtc_state->pipe_bpp == 36))
+ gamma_mode |= POST_CC1_GAMMA_ENABLE;
+ }
+
return gamma_mode;
}
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index caf0414e0b50..fd3186a5e6ff 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -5762,7 +5762,12 @@ static void bdw_set_pipemisc(const struct intel_crtc_state *crtc_state)
break;
}
- if (crtc_state->dither)
+ /*
+ * If 12bpc panel then, Enables dithering after the CC1 pipe
+ * post color space conversion and not here
+ */
+
+ if (crtc_state->dither && (crtc_state->pipe_bpp != 36))
val |= PIPEMISC_DITHER_ENABLE | PIPEMISC_DITHER_TYPE_SP;
if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 ||
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 24307c49085f..fa800a77ea49 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -7743,6 +7743,7 @@ enum {
#define GAMMA_MODE(pipe) _MMIO_PIPE(pipe, _GAMMA_MODE_A, _GAMMA_MODE_B)
#define PRE_CSC_GAMMA_ENABLE (1 << 31)
#define POST_CSC_GAMMA_ENABLE (1 << 30)
+#define POST_CC1_GAMMA_ENABLE (1 << 26)
#define GAMMA_MODE_MODE_MASK (3 << 0)
#define GAMMA_MODE_MODE_8BIT (0 << 0)
#define GAMMA_MODE_MODE_10BIT (1 << 0)
--
2.29.2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2021-06-02 13:10 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-26 18:17 [Intel-gfx] [PATCH 0/2] drm/i915/xelpd: Enabling dithering after the CC1 Bhanuprakash Modem
2021-05-26 13:05 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2021-05-26 13:07 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2021-05-26 13:34 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-05-26 18:17 ` [Intel-gfx] [PATCH 1/2] " Bhanuprakash Modem
2021-05-26 14:04 ` Jani Nikula
2021-05-26 15:58 ` Modem, Bhanuprakash
2021-05-26 16:11 ` Jani Nikula
2021-06-01 12:13 ` Varide, Nischal
2021-06-02 12:47 ` Varide, Nischal
2021-06-02 6:17 ` [Intel-gfx] [PATCH v2 0/1] " Nischal Varide
2021-06-02 6:17 ` Nischal Varide [this message]
2021-06-04 9:47 ` [Intel-gfx] [PATCH v2 1/1] drm/i915/xelpd: " Modem, Bhanuprakash
2021-06-08 23:53 ` [Intel-gfx] [PATCH v3 0/1] " Nischal Varide
2021-06-08 23:53 ` [Intel-gfx] [PATCH v3 1/1] drm/i915/xelpd: " Nischal Varide
2021-05-26 18:17 ` [Intel-gfx] [PATCH 2/2] drm/i915/display/debug: Expose Dither status via debugfs Bhanuprakash Modem
2021-05-26 14:26 ` Jani Nikula
2021-05-26 14:37 ` Ville Syrjälä
2021-06-21 7:53 ` Modem, Bhanuprakash
2021-05-26 15:54 ` Modem, Bhanuprakash
2021-05-26 20:40 ` [Intel-gfx] ✗ Fi.CI.IGT: failure for drm/i915/xelpd: Enabling dithering after the CC1 Patchwork
2021-06-08 23:44 ` [Intel-gfx] [PATCH v3 0/1] " Nischal Varide
2021-06-08 23:44 ` [Intel-gfx] [PATCH v3 1/1] drm/i915/xelpd: " Nischal Varide
2021-06-09 9:31 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915/xelpd: Enabling dithering after the CC1 (rev3) Patchwork
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=20210602061739.29134-2-nischal.varide@intel.com \
--to=nischal.varide@intel.com \
--cc=anshuman.gupta@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
--cc=uma.shankar@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.