From owner-svn-src-stable-10@freebsd.org Wed Jan 13 21:56:50 2016 Return-Path: Delivered-To: svn-src-stable-10@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 38FA1A81EB4; Wed, 13 Jan 2016 21:56:50 +0000 (UTC) (envelope-from dumbbell@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 089AD1F86; Wed, 13 Jan 2016 21:56:49 +0000 (UTC) (envelope-from dumbbell@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0DLunVH020855; Wed, 13 Jan 2016 21:56:49 GMT (envelope-from dumbbell@FreeBSD.org) Received: (from dumbbell@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0DLunQs020854; Wed, 13 Jan 2016 21:56:49 GMT (envelope-from dumbbell@FreeBSD.org) Message-Id: <201601132156.u0DLunQs020854@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dumbbell set sender to dumbbell@FreeBSD.org using -f From: =?UTF-8?Q?Jean-S=c3=a9bastien_P=c3=a9dron?= Date: Wed, 13 Jan 2016 21:56:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r293857 - stable/10/sys/dev/drm2/i915 X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jan 2016 21:56:50 -0000 Author: dumbbell Date: Wed Jan 13 21:56:48 2016 New Revision: 293857 URL: https://svnweb.freebsd.org/changeset/base/293857 Log: drm/i915: Remove "Attempting to unbind pinned buffer" message This error message is removed in later versions of Linux and currently, it spams users. PR: 200712 MFC of: r289109 Modified: stable/10/sys/dev/drm2/i915/i915_gem.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/drm2/i915/i915_gem.c ============================================================================== --- stable/10/sys/dev/drm2/i915/i915_gem.c Wed Jan 13 21:50:08 2016 (r293856) +++ stable/10/sys/dev/drm2/i915/i915_gem.c Wed Jan 13 21:56:48 2016 (r293857) @@ -2771,10 +2771,8 @@ i915_gem_object_unbind(struct drm_i915_g ret = 0; if (obj->gtt_space == NULL) return (0); - if (obj->pin_count != 0) { - DRM_ERROR("Attempting to unbind pinned buffer\n"); + if (obj->pin_count != 0) return (-EINVAL); - } ret = i915_gem_object_finish_gpu(obj); if (ret == -ERESTARTSYS || ret == -EINTR)