public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
To: Intel-gfx@lists.freedesktop.org
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
	Daniel Vetter <daniel.vetter@intel.com>
Subject: [PATCH 06/13] drm/i915: Set up fb format modifier for initial plane config
Date: Tue, 10 Feb 2015 17:16:09 +0000	[thread overview]
Message-ID: <1423588576-11339-7-git-send-email-tvrtko.ursulin@linux.intel.com> (raw)
In-Reply-To: <1423588576-11339-1-git-send-email-tvrtko.ursulin@linux.intel.com>

From: Daniel Vetter <daniel.vetter@ffwll.ch>

No functional changes yet since intel_framebuffer_init would have
fixed this up for us. But this is prep work to be able to handle new
tiling layouts in the initial plane config code.

Follow-up patches will start to make use of this and switch over to fb
modifiers where needed.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
 drivers/gpu/drm/i915/intel_display.c | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 4886ff8..f2622e3 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2390,6 +2390,8 @@ intel_alloc_plane_obj(struct intel_crtc *crtc,
 	mode_cmd.width = fb->width;
 	mode_cmd.height = fb->height;
 	mode_cmd.pitches[0] = fb->pitches[0];
+	mode_cmd.modifier[0] = fb->modifier[0];
+	mode_cmd.flags = DRM_MODE_FB_MODIFIERS;
 
 	mutex_lock(&dev->struct_mutex);
 
@@ -6625,9 +6627,12 @@ i9xx_get_initial_plane_config(struct intel_crtc *crtc,
 
 	fb = &intel_fb->base;
 
-	if (INTEL_INFO(dev)->gen >= 4)
-		if (val & DISPPLANE_TILED)
+	if (INTEL_INFO(dev)->gen >= 4) {
+		if (val & DISPPLANE_TILED) {
 			plane_config->tiling = I915_TILING_X;
+			fb->modifier[0] = I915_FORMAT_MOD_X_TILED;
+		}
+	}
 
 	pixel_format = val & DISPPLANE_PIXFORMAT_MASK;
 	fourcc = i9xx_format_to_fourcc(pixel_format);
@@ -7659,8 +7664,10 @@ skylake_get_initial_plane_config(struct intel_crtc *crtc,
 	if (!(val & PLANE_CTL_ENABLE))
 		goto error;
 
-	if (val & PLANE_CTL_TILED_MASK)
+	if (val & PLANE_CTL_TILED_MASK) {
 		plane_config->tiling = I915_TILING_X;
+		fb->modifier[0] = I915_FORMAT_MOD_X_TILED;
+	}
 
 	pixel_format = val & PLANE_CTL_FORMAT_MASK;
 	fourcc = skl_format_to_fourcc(pixel_format,
@@ -7758,9 +7765,12 @@ ironlake_get_initial_plane_config(struct intel_crtc *crtc,
 
 	fb = &intel_fb->base;
 
-	if (INTEL_INFO(dev)->gen >= 4)
-		if (val & DISPPLANE_TILED)
+	if (INTEL_INFO(dev)->gen >= 4) {
+		if (val & DISPPLANE_TILED) {
 			plane_config->tiling = I915_TILING_X;
+			fb->modifier[0] = I915_FORMAT_MOD_X_TILED;
+		}
+	}
 
 	pixel_format = val & DISPPLANE_PIXFORMAT_MASK;
 	fourcc = i9xx_format_to_fourcc(pixel_format);
-- 
2.2.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2015-02-10 17:16 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-09 18:03 [PATCH 0/5] i915 fb modifier support, respun Daniel Vetter
2015-02-09 18:03 ` [PATCH 1/5] drm/i915: Add tiled framebuffer modifiers Daniel Vetter
2015-02-10 11:05   ` Tvrtko Ursulin
2015-02-10 11:28   ` [PATCH] " Daniel Vetter
2015-02-10 16:16     ` shuang.he
2015-02-10 11:50   ` [PATCH] drm/i915: Add fb format modifier support Daniel Vetter
2015-02-09 18:03 ` [PATCH 2/5] " Daniel Vetter
2015-02-10 11:09   ` Tvrtko Ursulin
2015-02-10 11:28   ` [PATCH] " Daniel Vetter
2015-02-09 18:03 ` [PATCH 3/5] drm/i915: Use fb format modifiers in skylake_update_primary_plane Daniel Vetter
2015-02-10 16:25   ` Damien Lespiau
2015-02-09 18:03 ` [PATCH 4/5] drm/i915: Announce support for framebuffer modifiers Daniel Vetter
2015-02-09 18:03 ` [PATCH 5/5] drm: Also check unused fields for addfb2 Daniel Vetter
2015-02-10 10:56   ` [PATCH 1/2] drm/i915: Set up fb format modifier for initial plane config Daniel Vetter
2015-02-10 10:56     ` [PATCH 2/2] drm/i915: Switch +intel_fb_align_height to fb format modifiers Daniel Vetter
2015-02-10 11:01   ` [PATCH 5/5] drm: Also check unused fields for addfb2 Chris Wilson
2015-02-10 11:36     ` Daniel Vetter
2015-02-10 11:51       ` Chris Wilson
2015-02-10 17:16 ` [PATCH v2 00/13] i915 fb modifier support, respun Tvrtko Ursulin
2015-02-10 17:16   ` [PATCH 01/13] RFC: drm: add support for tiled/compressed/etc modifier in addfb2 Tvrtko Ursulin
2015-02-10 17:16   ` [PATCH 02/13] drm/i915: Add tiled framebuffer modifiers Tvrtko Ursulin
2015-02-10 17:16   ` [PATCH 03/13] drm/i915: Add fb format modifier support Tvrtko Ursulin
2015-02-10 17:16   ` [PATCH 04/13] drm/i915: Show frame buffer modifier in debug info Tvrtko Ursulin
2015-02-11  7:34     ` Daniel Vetter
2015-02-10 17:16   ` [PATCH 05/13] drm: Also check unused fields for addfb2 Tvrtko Ursulin
2015-02-10 17:16   ` Tvrtko Ursulin [this message]
2015-02-10 17:16   ` [PATCH 07/13] drm/i915: Switch +intel_fb_align_height to fb format modifiers Tvrtko Ursulin
2015-02-10 17:16   ` [PATCH 08/13] drm/i915: Use fb format modifiers in skylake_update_primary_plane Tvrtko Ursulin
2015-02-10 17:16   ` [PATCH 09/13] drm/i915/skl: CS flips are not supported with execlists Tvrtko Ursulin
2015-02-11  7:40     ` Daniel Vetter
2015-02-11  9:58       ` Tvrtko Ursulin
2015-02-10 17:16   ` [PATCH 10/13] drm/i915/skl: Use fb modifiers for sprites Tvrtko Ursulin
2015-02-11  7:47     ` Daniel Vetter
2015-02-10 17:16   ` [PATCH 11/13] drm/i915: Use fb modifiers in intel_check_cursor_plane Tvrtko Ursulin
2015-02-11  7:53     ` Daniel Vetter
2015-02-10 17:16   ` [PATCH 12/13] drm/i915: Use fb modifiers in intel_pin_and_fence_fb_obj Tvrtko Ursulin
2015-02-10 17:16   ` [PATCH 13/13] drm/i915: Announce support for framebuffer modifiers Tvrtko Ursulin
2015-02-11  2:46     ` shuang.he
2015-02-11  7:56       ` Daniel Vetter
2015-02-11  7:58     ` Daniel Vetter
2015-02-11  9:57       ` Tvrtko Ursulin
2015-02-11 10:25         ` Daniel Vetter

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=1423588576-11339-7-git-send-email-tvrtko.ursulin@linux.intel.com \
    --to=tvrtko.ursulin@linux.intel.com \
    --cc=Intel-gfx@lists.freedesktop.org \
    --cc=daniel.vetter@ffwll.ch \
    --cc=daniel.vetter@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