From owner-svn-src-all@FreeBSD.ORG  Mon May 28 13:55:50 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 211CE106566B;
	Mon, 28 May 2012 13:55:50 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0D00D8FC0C;
	Mon, 28 May 2012 13:55:50 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4SDtnbT014944;
	Mon, 28 May 2012 13:55:49 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4SDtnl8014942;
	Mon, 28 May 2012 13:55:49 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201205281355.q4SDtnl8014942@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Mon, 28 May 2012 13:55:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r236182 - head/sys/dev/drm2/i915
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 May 2012 13:55:50 -0000

Author: kib
Date: Mon May 28 13:55:49 2012
New Revision: 236182
URL: http://svn.freebsd.org/changeset/base/236182

Log:
  Fix calculation of the execution buffer end in the mapped pages
  when it is spilled into the next page.
  
  MFC after:	1 month

Modified:
  head/sys/dev/drm2/i915/i915_gem_execbuffer.c

Modified: head/sys/dev/drm2/i915/i915_gem_execbuffer.c
==============================================================================
--- head/sys/dev/drm2/i915/i915_gem_execbuffer.c	Mon May 28 13:49:52 2012	(r236181)
+++ head/sys/dev/drm2/i915/i915_gem_execbuffer.c	Mon May 28 13:55:49 2012	(r236182)
@@ -1069,7 +1069,8 @@ i915_gem_fix_mi_batchbuffer_end(struct d
 		po_r -= 4;
 	mkva = pmap_mapdev_attr(trunc_page(po_r), 2 * PAGE_SIZE,
 	    PAT_WRITE_COMBINING);
-	cmd = *(uint32_t *)(mkva + (po_r & PAGE_MASK));
+	po_r &= PAGE_MASK;
+	cmd = *(uint32_t *)(mkva + po_r);
 
 	if (cmd != MI_BATCH_BUFFER_END) {
 		/*
@@ -1083,8 +1084,7 @@ i915_gem_fix_mi_batchbuffer_end(struct d
 			po_w = po_r;
 DRM_DEBUG("batchbuffer does not end by MI_BATCH_BUFFER_END, overwriting last bo cmd !\n");
 		}
-
-		*(uint32_t *)(mkva + (po_w & PAGE_MASK)) = MI_BATCH_BUFFER_END;
+		*(uint32_t *)(mkva + po_w) = MI_BATCH_BUFFER_END;
 	}
 
 	pmap_unmapdev((vm_offset_t)mkva, 2 * PAGE_SIZE);