From patchwork Fri Nov 9 12:10:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 1726511 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id D6F4C3FCAE for ; Mon, 12 Nov 2012 08:03:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C7F049EFA6 for ; Mon, 12 Nov 2012 00:03:38 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pb0-f49.google.com (mail-pb0-f49.google.com [209.85.160.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 0FD649E7F0 for ; Fri, 9 Nov 2012 04:11:16 -0800 (PST) Received: by mail-pb0-f49.google.com with SMTP id xa7so2598364pbc.36 for ; Fri, 09 Nov 2012 04:11:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=bhCaQc59UUsVdc3JotnWx8vPLsfrIcnHToNxNd3l8e0=; b=ta0tyjTwWppbduJrNwmtdU199pBLOfKyMHHnxZPzNQuBt2W7vvg6vR6h1D8cENbmpU NLbh008d+/rrUD04ZtE4LEJS+blDRQluGQHwxiqYW5SZ6sZeBm20scl0AQvT4/tOYSdN seRinL5u4VCKi3Oqwywx5HFsFiRJudL6aHmNvdWYDyOAXHP4lrjqghDgdhI+CQBmTl0F YO7GB6k6hve1V+CMiba3XeBzkTpJT47+k8/5jNCqa9f37m/24I6EcHNe8TcGCChVd38E p/YbaAUD6GeswLM4ws+BDAlmWTpdgrl3w/MvwY2KmgcIYzztC1m+jViPKT/vitDNnm0M K3zA== Received: by 10.68.137.136 with SMTP id qi8mr26262846pbb.148.1352463076922; Fri, 09 Nov 2012 04:11:16 -0800 (PST) Received: from localhost.localdomain (p1120-ipbf2201hodogaya.kanagawa.ocn.ne.jp. [123.220.186.120]) by mx.google.com with ESMTPS id mn5sm17666238pbc.12.2012.11.09.04.11.15 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 09 Nov 2012 04:11:16 -0800 (PST) From: Akinobu Mita To: linux-kernel@vger.kernel.org, akpm@linux-foundation.org Subject: [PATCH] drm/ttm: remove unneeded preempt_disable/enable Date: Fri, 9 Nov 2012 21:10:43 +0900 Message-Id: <1352463043-9408-3-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1352463043-9408-1-git-send-email-akinobu.mita@gmail.com> References: <1352463043-9408-1-git-send-email-akinobu.mita@gmail.com> X-Mailman-Approved-At: Mon, 12 Nov 2012 00:00:29 -0800 Cc: Akinobu Mita , dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org It is unnecessary to disable preemption explicitly while calling copy_highpage(). Because copy_highpage() will do it again through kmap_atomic/kunmap_atomic. Signed-off-by: Akinobu Mita Cc: dri-devel@lists.freedesktop.org Cc: David Airlie Reviewed-by: Thomas Hellstrom --- drivers/gpu/drm/ttm/ttm_tt.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c index bf82601..7d759a4 100644 --- a/drivers/gpu/drm/ttm/ttm_tt.c +++ b/drivers/gpu/drm/ttm/ttm_tt.c @@ -308,9 +308,7 @@ int ttm_tt_swapin(struct ttm_tt *ttm) if (unlikely(to_page == NULL)) goto out_err; - preempt_disable(); copy_highpage(to_page, from_page); - preempt_enable(); page_cache_release(from_page); } @@ -358,9 +356,7 @@ int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistent_swap_storage) ret = PTR_ERR(to_page); goto out_err; } - preempt_disable(); copy_highpage(to_page, from_page); - preempt_enable(); set_page_dirty(to_page); mark_page_accessed(to_page); page_cache_release(to_page);