From patchwork Fri Jan 30 17:36:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 5752111 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8AC009F302 for ; Fri, 30 Jan 2015 17:37:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 544572025B for ; Fri, 30 Jan 2015 17:37:27 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 529642026F for ; Fri, 30 Jan 2015 17:37:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C6A5B6E853; Fri, 30 Jan 2015 09:37:25 -0800 (PST) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 341C46E1AC for ; Fri, 30 Jan 2015 09:37:24 -0800 (PST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga102.fm.intel.com with ESMTP; 30 Jan 2015 09:37:23 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.09,492,1418112000"; d="scan'208";a="678676750" Received: from tursulin-linux.isw.intel.com ([10.102.226.48]) by orsmga002.jf.intel.com with ESMTP; 30 Jan 2015 09:37:22 -0800 From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Fri, 30 Jan 2015 17:36:55 +0000 Message-Id: <1422639418-28845-4-git-send-email-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.2.2 In-Reply-To: <1422639418-28845-1-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1422639418-28845-1-git-send-email-tvrtko.ursulin@linux.intel.com> Subject: [Intel-gfx] [RFC 3/6] drm/i915: Set up fb modifier on initial takeover X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-3.2 required=5.0 tests=BAYES_00,HK_RANDOM_FROM, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Tvrtko Ursulin Initialize the simulated ioctl with the new modifier token so it can be passed on in line with the new API usage. Signed-off-by: Tvrtko Ursulin --- drivers/gpu/drm/i915/intel_display.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 3d220a6..4425e86 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -2382,8 +2382,11 @@ intel_alloc_plane_obj(struct intel_crtc *crtc, return false; obj->tiling_mode = plane_config->tiling; - if (obj->tiling_mode == I915_TILING_X) + if (obj->tiling_mode == I915_TILING_X) { obj->stride = crtc->base.primary->fb->pitches[0]; + mode_cmd.flags = DRM_MODE_FB_MODIFIERS; + mode_cmd.modifier[0] = I915_FORMAT_MOD_X_TILED; + } mode_cmd.pixel_format = crtc->base.primary->fb->pixel_format; mode_cmd.width = crtc->base.primary->fb->width;