From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CB339C433FE for ; Wed, 30 Mar 2022 20:48:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351109AbiC3Uts (ORCPT ); Wed, 30 Mar 2022 16:49:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54208 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351131AbiC3Utq (ORCPT ); Wed, 30 Mar 2022 16:49:46 -0400 Received: from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com [IPv6:2607:f8b0:4864:20::102e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD59746B2B; Wed, 30 Mar 2022 13:48:00 -0700 (PDT) Received: by mail-pj1-x102e.google.com with SMTP id jx9so21906944pjb.5; Wed, 30 Mar 2022 13:48:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SGa5BVmzMUOjfF5fklYjMnwty8EXXy2NltxcnqNLnSI=; b=DSd0Nzz9hIrhZxIZfNCcmrP6ngFJEnXjmtoQvedf5AXNAco5uLpIdKfMnlFhduseHm ghdLVjUhcyu+e1ldHlAqMbqU+D/xstz3gB16jtbSryEdaXLNy44Aud1Uyr8hUDLIvxKJ bKZ+rbXZt2JSjOCWFu1wfmmUopJu7uW8SicjmuK+3Z1G3CAxIwxGJiUp+EHDrmZxC8LZ BFc7YfLczqNkUfPtfqyMxkf7GqmUzMt+rUYEp7+0jJ6gmOUEQuo2Ra8qRrc8eKo5Nida ll7sQlqQ0Hz8mi6RrtbNn8Xdw69ESHzWNJCkWHvxeS7upUM1aD9ca9AjgLm/ZnIPlnJm ydXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SGa5BVmzMUOjfF5fklYjMnwty8EXXy2NltxcnqNLnSI=; b=xUpdeIbIGeRsuw4K0oM3hZ22M6BypWE3tqdiGKxw0BV7XAiGy9erOUmvjzIiEJ9WS9 RgoI1j7ICvKW4mFYCKkkIBbSUZPnRDbZ0NhAeDkBCY2Q6ZKW74Nc5x1O4WKNlmVXnxhp c8WqBQOuvlyStHuw+u73nqZxl0xR3IT+jG10t8wA3nxAOs+3QqfVkrCAve2ouFbHGfC2 Gm4hf6Z/g9esa6kary3ShsQ6rYHSFIFJFugkWAr/gNx1mOFrp96ykODC15COnz8lJKvd SQevc46y60xMnG3g4RdYNUGbmmFy1XhOnfBRBWvovrKSOwmp5X8XZFkeeiOpUhV3aCK7 lUoA== X-Gm-Message-State: AOAM531cnQfr1sAlC56EO08oXjfGh+jt4lxjm8O1tjEvCMlBdIt7qrQe X0H/rFiTuCm0KuKXN1M6oDU= X-Google-Smtp-Source: ABdhPJz4skMp1REpP6c7Chg16yU1uOCWTgymMz/5cLiay5QYtR+SyDD1L5Qm4FsQDK0GEkCXZL4plw== X-Received: by 2002:a17:902:d4c1:b0:153:d493:3f1 with SMTP id o1-20020a170902d4c100b00153d49303f1mr1601609plg.102.1648673280201; Wed, 30 Mar 2022 13:48:00 -0700 (PDT) Received: from localhost ([2a00:79e1:abd:4a00:2703:3c72:eb1a:cffd]) by smtp.gmail.com with ESMTPSA id y9-20020a056a00180900b004faa45a2230sm25216397pfa.210.2022.03.30.13.47.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Mar 2022 13:47:59 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Dmitry Baryshkov , Dmitry Osipenko , Rob Clark , Rob Clark , Sean Paul , Abhinav Kumar , David Airlie , Daniel Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v2 03/10] drm/msm/gem: Convert some missed GEM_WARN_ON()s Date: Wed, 30 Mar 2022 13:47:48 -0700 Message-Id: <20220330204804.660819-4-robdclark@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220330204804.660819-1-robdclark@gmail.com> References: <20220330204804.660819-1-robdclark@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Rob Clark Signed-off-by: Rob Clark --- drivers/gpu/drm/msm/msm_gem_vma.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_gem_vma.c b/drivers/gpu/drm/msm/msm_gem_vma.c index f914ddbaea89..64906594fc65 100644 --- a/drivers/gpu/drm/msm/msm_gem_vma.c +++ b/drivers/gpu/drm/msm/msm_gem_vma.c @@ -44,7 +44,7 @@ void msm_gem_purge_vma(struct msm_gem_address_space *aspace, unsigned size = vma->node.size << PAGE_SHIFT; /* Print a message if we try to purge a vma in use */ - if (WARN_ON(vma->inuse > 0)) + if (GEM_WARN_ON(vma->inuse > 0)) return; /* Don't do anything if the memory isn't mapped */ @@ -61,7 +61,7 @@ void msm_gem_purge_vma(struct msm_gem_address_space *aspace, void msm_gem_unmap_vma(struct msm_gem_address_space *aspace, struct msm_gem_vma *vma) { - if (!WARN_ON(!vma->iova)) + if (!GEM_WARN_ON(!vma->iova)) vma->inuse--; } @@ -73,7 +73,7 @@ msm_gem_map_vma(struct msm_gem_address_space *aspace, unsigned size = npages << PAGE_SHIFT; int ret = 0; - if (WARN_ON(!vma->iova)) + if (GEM_WARN_ON(!vma->iova)) return -EINVAL; /* Increase the usage counter */ @@ -100,7 +100,7 @@ msm_gem_map_vma(struct msm_gem_address_space *aspace, void msm_gem_close_vma(struct msm_gem_address_space *aspace, struct msm_gem_vma *vma) { - if (WARN_ON(vma->inuse > 0 || vma->mapped)) + if (GEM_WARN_ON(vma->inuse > 0 || vma->mapped)) return; spin_lock(&aspace->lock); @@ -120,7 +120,7 @@ int msm_gem_init_vma(struct msm_gem_address_space *aspace, { int ret; - if (WARN_ON(vma->iova)) + if (GEM_WARN_ON(vma->iova)) return -EBUSY; spin_lock(&aspace->lock); -- 2.35.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5033FC433F5 for ; Wed, 30 Mar 2022 20:48:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4A95D10E93E; Wed, 30 Mar 2022 20:48:02 +0000 (UTC) Received: from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com [IPv6:2607:f8b0:4864:20::1034]) by gabe.freedesktop.org (Postfix) with ESMTPS id 43E9510E928; Wed, 30 Mar 2022 20:48:01 +0000 (UTC) Received: by mail-pj1-x1034.google.com with SMTP id y16so9142468pju.4; Wed, 30 Mar 2022 13:48:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SGa5BVmzMUOjfF5fklYjMnwty8EXXy2NltxcnqNLnSI=; b=DSd0Nzz9hIrhZxIZfNCcmrP6ngFJEnXjmtoQvedf5AXNAco5uLpIdKfMnlFhduseHm ghdLVjUhcyu+e1ldHlAqMbqU+D/xstz3gB16jtbSryEdaXLNy44Aud1Uyr8hUDLIvxKJ bKZ+rbXZt2JSjOCWFu1wfmmUopJu7uW8SicjmuK+3Z1G3CAxIwxGJiUp+EHDrmZxC8LZ BFc7YfLczqNkUfPtfqyMxkf7GqmUzMt+rUYEp7+0jJ6gmOUEQuo2Ra8qRrc8eKo5Nida ll7sQlqQ0Hz8mi6RrtbNn8Xdw69ESHzWNJCkWHvxeS7upUM1aD9ca9AjgLm/ZnIPlnJm ydXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SGa5BVmzMUOjfF5fklYjMnwty8EXXy2NltxcnqNLnSI=; b=lfvHWyI9/JEaeqhuxQuqJPeY/0wgW3i4h2R6yA3HGaCBT8K3WXe15F23GaciNY63Zo qxAYh8zqQAcxT22vijCAmQoGd0h7JloqgXUJT5nu9nRyFlYZ3mgQT/+LrspPdnl+TfSI Myhl39wMlq2wgZk5jd4xczG4pndPDm6ZBDq+dfLIxRRJCbS+qdjxR0v8DKSGTnJlovIs 21TKImLNP4Eb8l8n9MZZrP68KaPwnb+wwe+6ePkQC96gtUScxwW8ZP6DivczWcKwKnKX EA7km8KPCoLh+KXgBqDtst5UZ6QAHtXom3Gj7d/d6s2R3Bp1x+yi0+LSdRrdFOKNFQaN +PGg== X-Gm-Message-State: AOAM531c0xvWAZ3cOHxgmzpas59W+LQfCYXDdJjgn2EpfJMllBtBiXnO LVXtognVOq9m8aJogpc7bxNmyoZ4KwM= X-Google-Smtp-Source: ABdhPJz4skMp1REpP6c7Chg16yU1uOCWTgymMz/5cLiay5QYtR+SyDD1L5Qm4FsQDK0GEkCXZL4plw== X-Received: by 2002:a17:902:d4c1:b0:153:d493:3f1 with SMTP id o1-20020a170902d4c100b00153d49303f1mr1601609plg.102.1648673280201; Wed, 30 Mar 2022 13:48:00 -0700 (PDT) Received: from localhost ([2a00:79e1:abd:4a00:2703:3c72:eb1a:cffd]) by smtp.gmail.com with ESMTPSA id y9-20020a056a00180900b004faa45a2230sm25216397pfa.210.2022.03.30.13.47.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Mar 2022 13:47:59 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Subject: [PATCH v2 03/10] drm/msm/gem: Convert some missed GEM_WARN_ON()s Date: Wed, 30 Mar 2022 13:47:48 -0700 Message-Id: <20220330204804.660819-4-robdclark@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220330204804.660819-1-robdclark@gmail.com> References: <20220330204804.660819-1-robdclark@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rob Clark , David Airlie , linux-arm-msm@vger.kernel.org, Abhinav Kumar , open list , Sean Paul , Dmitry Osipenko , Dmitry Baryshkov , freedreno@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Rob Clark Signed-off-by: Rob Clark --- drivers/gpu/drm/msm/msm_gem_vma.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_gem_vma.c b/drivers/gpu/drm/msm/msm_gem_vma.c index f914ddbaea89..64906594fc65 100644 --- a/drivers/gpu/drm/msm/msm_gem_vma.c +++ b/drivers/gpu/drm/msm/msm_gem_vma.c @@ -44,7 +44,7 @@ void msm_gem_purge_vma(struct msm_gem_address_space *aspace, unsigned size = vma->node.size << PAGE_SHIFT; /* Print a message if we try to purge a vma in use */ - if (WARN_ON(vma->inuse > 0)) + if (GEM_WARN_ON(vma->inuse > 0)) return; /* Don't do anything if the memory isn't mapped */ @@ -61,7 +61,7 @@ void msm_gem_purge_vma(struct msm_gem_address_space *aspace, void msm_gem_unmap_vma(struct msm_gem_address_space *aspace, struct msm_gem_vma *vma) { - if (!WARN_ON(!vma->iova)) + if (!GEM_WARN_ON(!vma->iova)) vma->inuse--; } @@ -73,7 +73,7 @@ msm_gem_map_vma(struct msm_gem_address_space *aspace, unsigned size = npages << PAGE_SHIFT; int ret = 0; - if (WARN_ON(!vma->iova)) + if (GEM_WARN_ON(!vma->iova)) return -EINVAL; /* Increase the usage counter */ @@ -100,7 +100,7 @@ msm_gem_map_vma(struct msm_gem_address_space *aspace, void msm_gem_close_vma(struct msm_gem_address_space *aspace, struct msm_gem_vma *vma) { - if (WARN_ON(vma->inuse > 0 || vma->mapped)) + if (GEM_WARN_ON(vma->inuse > 0 || vma->mapped)) return; spin_lock(&aspace->lock); @@ -120,7 +120,7 @@ int msm_gem_init_vma(struct msm_gem_address_space *aspace, { int ret; - if (WARN_ON(vma->iova)) + if (GEM_WARN_ON(vma->iova)) return -EBUSY; spin_lock(&aspace->lock); -- 2.35.1