From patchwork Thu Feb 2 15:13:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9552235 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DCCD160236 for ; Thu, 2 Feb 2017 15:13:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DC67C2818E for ; Thu, 2 Feb 2017 15:13:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D144328422; Thu, 2 Feb 2017 15:13:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 962422818E for ; Thu, 2 Feb 2017 15:13:21 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 86D466EA32; Thu, 2 Feb 2017 15:13:20 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id C01A56EA31 for ; Thu, 2 Feb 2017 15:13:18 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id v77so4677157wmv.0 for ; Thu, 02 Feb 2017 07:13:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=cvSX0d7DUUc3jEDIE8QRxI9oWcEObY3uPtFNBoWLNtM=; b=AZydzW6vqxeeYyWVJ8r8jpyM/ThzMfYbp4xbvr8ipYQh8PwUgIpd/+UufhVZMvCVVZ c6xH1gu8FdxGTTyfXTfikfAuGKpMDlFA66hOWGDN/q6FoF8Zzo1pg2VslJvSM1F9zMpb pQNjGesnM+dRldELn4VGhCylkj/bNMqasboQj+nUdqhNDN+V+3PHKWGjW/gM+J2sl8sG ZGYBjs7kXRSThb/niwoOuV95UfPA2uJG6p+XTC6xBJpeEXP2AoPW2981Frw49cHbIjYN pURp7Yh2v1McYDZVLm5PUCI8PtoryQHGCGo7VubX3Jy8ASOVdCQjDlAU9olAey2MFP9Q g/ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=cvSX0d7DUUc3jEDIE8QRxI9oWcEObY3uPtFNBoWLNtM=; b=NjhjPH36PSlOxR780xahJV27yv7ZMH/oCyumOz7JO4T62hhdWG1R5HXKwEoDTcHhnL tYsk1IBSeM5yZpRCY9Ds/WM41sXZRp0E/6CgmdfmoqgVuv+q20oWawLQTLRYOoKPljps foOPAjfFZYTJj3bswqm+qHB26oeSwBNQb/E+/MWivi/kpnEKob7DjflNuRMvaxms8mNg v9XtJqSCZ5hdgoQITOIwuwNCSziXfsF3r4lYyYgfMjtuHUdkPvFV+FAU+UwZSNjqI4MV 5VgEFeQrBpmA92HFW1duyRV9s1y8cQVeT4D9E/b4+0y410F7sk7LVV6dgskg4uFhQLSI BQag== X-Gm-Message-State: AIkVDXJoQ+S7SW1+gRtUut5CZSAyGbTz2sc/QggUjVhQoGqo5BktifArSeuOo8yEVzXAXw== X-Received: by 10.28.99.69 with SMTP id x66mr27278618wmb.91.1486048397365; Thu, 02 Feb 2017 07:13:17 -0800 (PST) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id o81sm3624020wmb.14.2017.02.02.07.13.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Feb 2017 07:13:15 -0800 (PST) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Thu, 2 Feb 2017 15:13:00 +0000 Message-Id: <20170202151312.31406-2-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170202151312.31406-1-chris@chris-wilson.co.uk> References: <20170202151312.31406-1-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [PATCH 02/14] drm/i915: Use a local to shorten req->i915->gpu_error.wait_queue X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Use a local variable to avoid having to type out the full name of the gpu_error wait_queue. Signed-off-by: Chris Wilson Reviewed-by: Joonas Lahtinen --- drivers/gpu/drm/i915/i915_gem_request.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem_request.c b/drivers/gpu/drm/i915/i915_gem_request.c index d1ab4e3a8139..fc1e340aa1e1 100644 --- a/drivers/gpu/drm/i915/i915_gem_request.c +++ b/drivers/gpu/drm/i915/i915_gem_request.c @@ -1056,6 +1056,7 @@ long i915_wait_request(struct drm_i915_gem_request *req, { const int state = flags & I915_WAIT_INTERRUPTIBLE ? TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE; + wait_queue_head_t *errq = &req->i915->gpu_error.wait_queue; DEFINE_WAIT(reset); struct intel_wait wait; @@ -1091,7 +1092,7 @@ long i915_wait_request(struct drm_i915_gem_request *req, set_current_state(state); if (flags & I915_WAIT_LOCKED) - add_wait_queue(&req->i915->gpu_error.wait_queue, &reset); + add_wait_queue(errq, &reset); intel_wait_init(&wait, req->global_seqno); if (intel_engine_add_wait(req->engine, &wait)) @@ -1142,8 +1143,7 @@ long i915_wait_request(struct drm_i915_gem_request *req, i915_reset_in_progress(&req->i915->gpu_error)) { __set_current_state(TASK_RUNNING); i915_reset(req->i915); - reset_wait_queue(&req->i915->gpu_error.wait_queue, - &reset); + reset_wait_queue(errq, &reset); continue; } @@ -1154,7 +1154,7 @@ long i915_wait_request(struct drm_i915_gem_request *req, intel_engine_remove_wait(req->engine, &wait); if (flags & I915_WAIT_LOCKED) - remove_wait_queue(&req->i915->gpu_error.wait_queue, &reset); + remove_wait_queue(errq, &reset); __set_current_state(TASK_RUNNING); complete: