From owner-svn-src-stable@FreeBSD.ORG  Mon Jun 11 21:43:17 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 8FDD8106564A;
	Mon, 11 Jun 2012 21:43:17 +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 7AABB8FC1B;
	Mon, 11 Jun 2012 21:43:17 +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 q5BLhHdH012148;
	Mon, 11 Jun 2012 21:43:17 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5BLhHYL012146;
	Mon, 11 Jun 2012 21:43:17 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201206112143.q5BLhHYL012146@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Mon, 11 Jun 2012 21:43:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r236932 - stable/9/sys/dev/drm2/i915
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Jun 2012 21:43:17 -0000

Author: kib
Date: Mon Jun 11 21:43:17 2012
New Revision: 236932
URL: http://svn.freebsd.org/changeset/base/236932

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

Modified:
  stable/9/sys/dev/drm2/i915/i915_gem_execbuffer.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/drm2/i915/i915_gem_execbuffer.c
==============================================================================
--- stable/9/sys/dev/drm2/i915/i915_gem_execbuffer.c	Mon Jun 11 21:41:45 2012	(r236931)
+++ stable/9/sys/dev/drm2/i915/i915_gem_execbuffer.c	Mon Jun 11 21:43:17 2012	(r236932)
@@ -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);