From patchwork Fri Mar 17 19:46:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9631503 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 7ACA1602D6 for ; Fri, 17 Mar 2017 19:46:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5E99E28522 for ; Fri, 17 Mar 2017 19:46:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 51A372852D; Fri, 17 Mar 2017 19:46:56 +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 E5A8028522 for ; Fri, 17 Mar 2017 19:46:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E1E836E21B; Fri, 17 Mar 2017 19:46:54 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 99C976E21B for ; Fri, 17 Mar 2017 19:46:53 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id n11so4860515wma.0 for ; Fri, 17 Mar 2017 12:46:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=TAhTOCYtP3JYqI6WdtnC912UADMpbqfJ3YYk5BIEXLA=; b=Ou9O5JRb7QB3UGy8Bo75mvFESU0kA+PQ2MvelYkbiQt+64RFJYOy4aSe9Kt4T3phHx bpUXFSyBSMl1MtHvgEJgmyCMA2Q47+zDocHrs9apLliPryg8DD1M77SvN83X6moIqnO9 7Sv5HKp126XW4z2PweESMcIReu9SQVJJZwdJjv31wkP8KxzIb3jpoM6Q6DGiT2qss1dg M5MHL4wg+0XG7yLiwunkBiiut2B4NnwpC187eTYZmD/6s4SRxhkkjmZqphQjkkN23Inm 9C/FD1Jg/jA0bAiatuOjtGoz3cd+v+qF5Wx1Ps6PsFzEqn9EnmV2F6y07AeW3GomDCUS VQgQ== 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; bh=TAhTOCYtP3JYqI6WdtnC912UADMpbqfJ3YYk5BIEXLA=; b=P+fa6PzaY7470AyvfyPFQGb308pAzSNe6+7I+a4/rbhOsuTbLq1YDhHEkuXdCh/CcL 2b/0XUKZi+ZjWYoQ8udRk6ZyLLous+qE8GXh5XtbfMvjEUJzQ9RJ2MLclzPxJ2u2RuGt danuogvfI1OoFMgkI1WAlivUtoMX8jXhiyFJms2Y0FE1MmJvHuIFU16DbccOrCZ+cprr r0etka9IHsBmhACd6zNKq52RSK8T6Fa0IIgzEdnj67J6eeR9n7HIZIsdvh9j9XaJbWav we9IsmEmqz6eoLsrEVIwLC7YJ/5KqPH7ddoiOUt/db+ZSOVMozY8G9JBVuc7/4OYEvt9 KBWQ== X-Gm-Message-State: AFeK/H17/1po90MJIyszQFRzrzpHhFZnqHuKXhmIho3TgAMjM8hFrXXxofZfnQkzu6bpCQ== X-Received: by 10.28.129.212 with SMTP id c203mr4307432wmd.19.1489780012072; Fri, 17 Mar 2017 12:46:52 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id i203sm3745913wmf.12.2017.03.17.12.46.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Mar 2017 12:46:51 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Fri, 17 Mar 2017 19:46:47 +0000 Message-Id: <20170317194648.12468-1-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.11.0 Subject: [Intel-gfx] [PATCH 1/2] drm/i915: i915_gem_object_create_from_data() doesn't require struct_mutex 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 Both object creation and backing storage page allocation do not require struct_mutex, so do not require the caller to take it. Signed-off-by: Chris Wilson Reviewed-by: Matthew Auld --- drivers/gpu/drm/i915/i915_gem.c | 4 +--- drivers/gpu/drm/i915/intel_uc.c | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index fd611b4c1a2c..3492f8d27c32 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -4961,9 +4961,7 @@ i915_gem_object_create_from_data(struct drm_i915_private *dev_priv, if (IS_ERR(obj)) return obj; - ret = i915_gem_object_set_to_cpu_domain(obj, true); - if (ret) - goto fail; + GEM_BUG_ON(obj->base.write_domain != I915_GEM_DOMAIN_CPU); ret = i915_gem_object_pin_pages(obj); if (ret) diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c index 21f6d822194d..86530c92337a 100644 --- a/drivers/gpu/drm/i915/intel_uc.c +++ b/drivers/gpu/drm/i915/intel_uc.c @@ -376,9 +376,7 @@ void intel_uc_prepare_fw(struct drm_i915_private *dev_priv, uc_fw->major_ver_found, uc_fw->minor_ver_found, uc_fw->major_ver_wanted, uc_fw->minor_ver_wanted); - mutex_lock(&dev_priv->drm.struct_mutex); obj = i915_gem_object_create_from_data(dev_priv, fw->data, fw->size); - mutex_unlock(&dev_priv->drm.struct_mutex); if (IS_ERR_OR_NULL(obj)) { err = obj ? PTR_ERR(obj) : -ENOMEM; goto fail;