From patchwork Sat Apr 16 18:20:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 712811 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p3GIKSCk019081 for ; Sat, 16 Apr 2011 18:20:48 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6E5E49E7EF for ; Sat, 16 Apr 2011 11:20:27 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 0596A9E746 for ; Sat, 16 Apr 2011 11:20:07 -0700 (PDT) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 16 Apr 2011 11:20:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.64,224,1301900400"; d="scan'208";a="680006302" Received: from unknown (HELO cantiga.alporthouse.com) ([10.255.12.206]) by fmsmga002.fm.intel.com with ESMTP; 16 Apr 2011 11:20:06 -0700 From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Sat, 16 Apr 2011 19:20:04 +0100 Message-Id: <1302978004-9265-1-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 1.7.4.1 Subject: [Intel-gfx] [PATCH] drm/i915: Check that the plane points to the pipe's framebuffer before enabling X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sat, 16 Apr 2011 18:21:06 +0000 (UTC) Knut Petersen reported a GPU hang when he left x11perf running overnight. The error state quite clearly indicates that plane A was enabled without being fully setup: PGTBL_ER: 0x00000010 Display A: Invalid GTT PTE Plane [0]: CNTR: c1000000 STRIDE: 00000c80 SIZE: 03ff04ff POS: 00000000 ADDR: 00000000 [GTT offset on his system being pinned for the ringbuffer.] This is a simple debugging patch to assert that this cannot be so! References: https://bugs.freedesktop.org/show_bug.cgi?id=36246 Signed-off-by: Chris Wilson Cc: Jesse Barnes --- drivers/gpu/drm/i915/intel_display.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 7734d1e..82c22a3 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -1274,6 +1274,30 @@ static void intel_disable_pipe(struct drm_i915_private *dev_priv, intel_wait_for_pipe_off(dev_priv->dev, pipe); } +/* Check that the DSPADDR points to the right framebufffer for the pipe. */ +static void assert_fb_bound_to_plane(struct drm_i915_private *dev_priv, + enum pipe pipe, enum plane *plane) +{ + struct drm_crtc *crtc; + struct intel_framebuffer *intel_fb = to_intel_framebuffer(fb); + u32 val, base, size; + + crtc = intel_get_crtc_for_pipe(dev, pipe); + if (WARN(crtc->fb == NULL, + "no framebuffer attached to pipe %c\n", + pipe_name(pipe))) + return; + + intel_fb = to_intel_framebuffer(crtc->fb); + base = intel_fb->obj->gtt_offset; + size = intel_fb->obj->base.size; + + val = I915_READ(DSPADDR(plane)); + WARN(val < offset || val >= base + size, + "mismatching framebuffer for plane %c attached to pipe %c\n", + plane_name(plane), pipe_name(pipe)); +} + /** * intel_enable_plane - enable a display plane on a given pipe * @dev_priv: i915 private structure @@ -1290,6 +1314,7 @@ static void intel_enable_plane(struct drm_i915_private *dev_priv, /* If the pipe isn't enabled, we can't pump pixels and may hang */ assert_pipe_enabled(dev_priv, pipe); + assert_fb_bound_to_plane(dev_priv, pipe, plane); reg = DSPCNTR(plane); val = I915_READ(reg);