From owner-svn-src-head@freebsd.org Wed Aug 26 22:19:55 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5E0E69C3DC4; Wed, 26 Aug 2015 22:19:55 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4ED15C0F; Wed, 26 Aug 2015 22:19:55 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7QMJtud084525; Wed, 26 Aug 2015 22:19:55 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7QMJsB9084521; Wed, 26 Aug 2015 22:19:54 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201508262219.t7QMJsB9084521@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Wed, 26 Aug 2015 22:19:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r287177 - head/sys/dev/drm2/i915 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Aug 2015 22:19:55 -0000 Author: bapt Date: Wed Aug 26 22:19:53 2015 New Revision: 287177 URL: https://svnweb.freebsd.org/changeset/base/287177 Log: Merge i915_emit_box_p and i915_emit_box as done in linux 3.8 Reviewed by: dumbbell Differential Revision: https://reviews.freebsd.org/D3495 Modified: head/sys/dev/drm2/i915/i915_dma.c head/sys/dev/drm2/i915/i915_drv.h head/sys/dev/drm2/i915/i915_gem_execbuffer.c Modified: head/sys/dev/drm2/i915/i915_dma.c ============================================================================== --- head/sys/dev/drm2/i915/i915_dma.c Wed Aug 26 22:09:12 2015 (r287176) +++ head/sys/dev/drm2/i915/i915_dma.c Wed Aug 26 22:19:53 2015 (r287177) @@ -410,21 +410,8 @@ static int i915_emit_cmds(struct drm_dev return 0; } -int i915_emit_box(struct drm_device * dev, - struct drm_clip_rect *boxes, - int i, int DR1, int DR4) -{ - struct drm_clip_rect box; - - if (DRM_COPY_FROM_USER_UNCHECKED(&box, &boxes[i], sizeof(box))) { - return -EFAULT; - } - - return (i915_emit_box_p(dev, &box, DR1, DR4)); -} - int -i915_emit_box_p(struct drm_device *dev, +i915_emit_box(struct drm_device *dev, struct drm_clip_rect *box, int DR1, int DR4) { @@ -506,8 +493,8 @@ static int i915_dispatch_cmdbuffer(struc for (i = 0; i < count; i++) { if (i < nbox) { - ret = i915_emit_box_p(dev, &cmd->cliprects[i], - cmd->DR1, cmd->DR4); + ret = i915_emit_box(dev, &cliprects[i], + cmd->DR1, cmd->DR4); if (ret) return ret; } @@ -542,8 +529,8 @@ static int i915_dispatch_batchbuffer(str count = nbox ? nbox : 1; for (i = 0; i < count; i++) { if (i < nbox) { - int ret = i915_emit_box_p(dev, &cliprects[i], - batch->DR1, batch->DR4); + ret = i915_emit_box(dev, &cliprects[i], + batch->DR1, batch->DR4); if (ret) return ret; } Modified: head/sys/dev/drm2/i915/i915_drv.h ============================================================================== --- head/sys/dev/drm2/i915/i915_drv.h Wed Aug 26 22:09:12 2015 (r287176) +++ head/sys/dev/drm2/i915/i915_drv.h Wed Aug 26 22:19:53 2015 (r287177) @@ -1120,11 +1120,8 @@ extern int i915_driver_device_is_agp(str extern long i915_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg); extern int i915_emit_box(struct drm_device *dev, - struct drm_clip_rect __user *boxes, - int i, int DR1, int DR4); -int i915_emit_box_p(struct drm_device *dev, struct drm_clip_rect *box, - int DR1, int DR4); - + struct drm_clip_rect *box, + int DR1, int DR4); unsigned long i915_chipset_val(struct drm_i915_private *dev_priv); unsigned long i915_mch_val(struct drm_i915_private *dev_priv); void i915_update_gfx_val(struct drm_i915_private *dev_priv); Modified: head/sys/dev/drm2/i915/i915_gem_execbuffer.c ============================================================================== --- head/sys/dev/drm2/i915/i915_gem_execbuffer.c Wed Aug 26 22:09:12 2015 (r287176) +++ head/sys/dev/drm2/i915/i915_gem_execbuffer.c Wed Aug 26 22:19:53 2015 (r287177) @@ -1372,7 +1372,7 @@ i915_gem_do_execbuffer(struct drm_device if (cliprects) { for (i = 0; i < args->num_cliprects; i++) { - ret = i915_emit_box_p(dev, &cliprects[i], + ret = i915_emit_box(dev, &cliprects[i], args->DR1, args->DR4); if (ret) goto err;