From: Vidya Srinivas <vidya.srinivas@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: Vidya Srinivas <vidya.srinivas@intel.com>
Subject: [PATCH 1/6] drm/i915: Set scaler mode for NV12
Date: Mon, 28 Aug 2017 16:22:17 +0530 [thread overview]
Message-ID: <1503917542-15009-2-git-send-email-vidya.srinivas@intel.com> (raw)
In-Reply-To: <1503917542-15009-1-git-send-email-vidya.srinivas@intel.com>
From: Chandra Konduru <chandra.konduru@intel.com>
This patch sets appropriate scaler mode for NV12 format.
In this mode, skylake scaler does either chroma-upsampling or
chroma-upsampling and resolution scaling
v2: Review comments from Ville addressed
NV12 case to be checked first for setting
the scaler
v3: Rebased (me)
v4: Rebased (me)
v5: Missed the Tested-by/Reviewed-by in the previous series
Adding the same to commit message in this version.
v6: Rebased (me)
v7: Rebased (me)
Tested-by: Clinton Taylor <clinton.a.taylor@intel.com>
Reviewed-by: Clinton Taylor <clinton.a.taylor@intel.com>
Signed-off-by: Chandra Konduru <chandra.konduru@intel.com>
Signed-off-by: Nabendu Maiti <nabendu.bikash.maiti@intel.com>
Signed-off-by: Vidya Srinivas <vidya.srinivas@intel.com>
---
drivers/gpu/drm/i915/i915_reg.h | 1 +
drivers/gpu/drm/i915/intel_atomic.c | 8 +++++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index e2908ae..ac61135 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -6582,6 +6582,7 @@ enum {
#define PS_SCALER_MODE_MASK (3 << 28)
#define PS_SCALER_MODE_DYN (0 << 28)
#define PS_SCALER_MODE_HQ (1 << 28)
+#define PS_SCALER_MODE_NV12 (2 << 28)
#define PS_PLANE_SEL_MASK (7 << 25)
#define PS_PLANE_SEL(plane) (((plane) + 1) << 25)
#define PS_FILTER_MASK (3 << 23)
diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c
index 36d4e63..808f8e6 100644
--- a/drivers/gpu/drm/i915/intel_atomic.c
+++ b/drivers/gpu/drm/i915/intel_atomic.c
@@ -325,7 +325,13 @@ int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv,
}
/* set scaler mode */
- if (IS_GEMINILAKE(dev_priv) || IS_CANNONLAKE(dev_priv)) {
+ if (plane_state && plane_state->base.fb &&
+ plane_state->base.fb->format->format ==
+ DRM_FORMAT_NV12) {
+ DRM_ERROR("NV12 format setting scaler mode\n");
+ scaler_state->scalers[*scaler_id].mode =
+ PS_SCALER_MODE_NV12;
+ } else if (IS_GEMINILAKE(dev_priv) || IS_CANNONLAKE(dev_priv)) {
scaler_state->scalers[*scaler_id].mode = 0;
} else if (num_scalers_need == 1 && intel_crtc->pipe != PIPE_C) {
/*
--
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:[~2017-08-28 10:44 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-28 10:52 [PATCH 0/6] Adding NV12 support Vidya Srinivas
2017-08-28 10:52 ` Vidya Srinivas [this message]
2017-08-28 10:52 ` [PATCH 2/6] drm/i915: Update format_is_yuv() to include NV12 Vidya Srinivas
2017-08-28 10:52 ` [PATCH 3/6] drm/i915: Upscale scaler max scale for NV12 Vidya Srinivas
2017-08-28 10:52 ` [PATCH 4/6] drm/i915: Add NV12 as supported format for primary plane Vidya Srinivas
2017-09-06 16:36 ` Matt Roper
2017-09-06 19:12 ` Rodrigo Vivi
2017-09-06 20:17 ` Matt Roper
2017-09-06 21:49 ` Kristian Høgsberg
2017-09-06 22:02 ` Matt Roper
2017-09-06 22:53 ` Kristian Høgsberg
2017-08-28 10:52 ` [PATCH 5/6] drm/i915: Add NV12 as supported format for sprite plane Vidya Srinivas
2017-08-28 10:52 ` [PATCH 6/6] drm/i915: Add NV12 support to intel_framebuffer_init Vidya Srinivas
2017-08-28 11:14 ` ✗ Fi.CI.BAT: failure for Adding NV12 support (rev2) Patchwork
2017-08-28 22:17 ` [PATCH 0/6] Adding NV12 support Daniel Vetter
2017-09-19 21:56 ` Kristian Høgsberg
2017-09-26 11:46 ` Daniel Vetter
2017-09-27 3:32 ` Srinivas, Vidya
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=1503917542-15009-2-git-send-email-vidya.srinivas@intel.com \
--to=vidya.srinivas@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/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.