From patchwork Mon May 11 18:19:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodrigo Vivi X-Patchwork-Id: 6381011 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7CC92BEEE5 for ; Mon, 11 May 2015 18:20:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 879AC20A34 for ; Mon, 11 May 2015 18:20:08 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 6EB1720A2C for ; Mon, 11 May 2015 18:20:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B2B476E4B3; Mon, 11 May 2015 11:20:06 -0700 (PDT) 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 8E0626E4A0 for ; Mon, 11 May 2015 11:20:05 -0700 (PDT) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga102.fm.intel.com with ESMTP; 11 May 2015 11:20:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,409,1427785200"; d="scan'208";a="693209138" Received: from unknown (HELO rdvivi-talin.jf.intel.com) ([10.7.196.74]) by orsmga001.jf.intel.com with ESMTP; 11 May 2015 11:20:04 -0700 From: Rodrigo Vivi To: intel-gfx@lists.freedesktop.org Date: Mon, 11 May 2015 11:19:59 -0700 Message-Id: <1431368400-1942-8-git-send-email-rodrigo.vivi@intel.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1431368400-1942-1-git-send-email-rodrigo.vivi@intel.com> References: <1431368400-1942-1-git-send-email-rodrigo.vivi@intel.com> Cc: Daniel Vetter , Rodrigo Vivi Subject: [Intel-gfx] [PATCH 7/8] drm/i915/skl: Disallow tiling changes during page flip 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=-4.2 required=5.0 tests=BAYES_00, 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 It would require watermark reprogramming which we do not want to do. Signed-off-by: Tvrtko Ursulin Cc: Daniel Vetter Cc: Sonika Jindal Cc: Damien Lespiau Cc: Chris Wilson Tested-By: Intel Graphics QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com) Signed-off-by: Rodrigo Vivi --- drivers/gpu/drm/i915/intel_display.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 489a134..a2b7259 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -10896,6 +10896,15 @@ void intel_check_page_flip(struct drm_device *dev, int pipe) spin_unlock(&dev->event_lock); } +static bool intel_is_y_tiled(uint64_t fb_modifier) +{ + if (fb_modifier == I915_FORMAT_MOD_Y_TILED || + fb_modifier == I915_FORMAT_MOD_Yf_TILED) + return true; + + return false; +} + static int intel_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb, struct drm_pending_vblank_event *event, @@ -11025,6 +11034,14 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, + intel_crtc->dspaddr_offset; if (mmio_flip) { + /* Temporarily embedding knowledge of disallowed tiling mode + * transition which would require watermark reprogramming. + */ + if (intel_is_y_tiled(old_fb->modifier[0]) != + intel_is_y_tiled(fb->modifier[0])) { + ret = -EINVAL; + goto cleanup_unpin; + } ret = intel_queue_mmio_flip(dev, crtc, fb, obj, ring, page_flip_flags); if (ret)