From patchwork Fri Jan 15 18:15:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 364901 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 03930C4332B for ; Fri, 15 Jan 2021 18:19:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C1ADC222B3 for ; Fri, 15 Jan 2021 18:19:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730742AbhAOSTS (ORCPT ); Fri, 15 Jan 2021 13:19:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57190 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387536AbhAOSRb (ORCPT ); Fri, 15 Jan 2021 13:17:31 -0500 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 91FC6C0617A0 for ; Fri, 15 Jan 2021 10:16:20 -0800 (PST) Received: by mail-wr1-x42e.google.com with SMTP id q18so10227081wrn.1 for ; Fri, 15 Jan 2021 10:16:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=klcbd1e9WNIfeT7Kw/V+fGmeHX8/YIMOVJeu6cqS6p8=; b=Jeva4W7b5GmkLma0e0Xq2LyelIdviMQ5Xtdc74BWOdiUZov1iTUGSs4RdBxLNmQI6C xZ9R5zA0dodI3/TxwKcWEepE4zEOvD40upf9vjbHymNQhp+QdNYGPJzgJIKkQbocLbc8 cE32+iJI5yVLlTDqLJI9VzVuWhPNvOuhdmUMumzV9EXyb2S83X1nTD0CtHsod8AmpZYQ L6y8sevlrSKQa0OomUujlM4Vl0UDvZ7LIStc5x9v9qb62+xiBlnUDNgiirVMuLMGkv1d OTqR4QgreqpMCp2pOorq5hOFyE5Pklwlns+yu4dxl3V7HNxbLo/QgIRVxAW56aXa1zOs G0qA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=klcbd1e9WNIfeT7Kw/V+fGmeHX8/YIMOVJeu6cqS6p8=; b=dqTEIF6ieZVxtBnLtZQSaDl0VvmVbeqvTOduO+oOINyUR1TAzqfSIp6qUZ5CpanHrn y0zy4VvPcyXF0r5ghxe10ehv3eLIwe59Pwnb+yfK9ZpdPnvhMBHbTL2uq55emD+YJYy9 /Eu2m0fdhlsojsPIae6MH9Py8zgCYo0/CpPdOla8bLlMisBIeZgcPZMUVFRakQTyd0Ec FsmYUCTqV8e6W743EfhVqzqptcmh423pUD7mx+WOqHjCz12fNrJWy5sBhSEGzxu27cv1 dJMe35vHCf3rfQ8yC09AIYMuiL3kYeM34Q3hb9uh2IL9fPhwU5M7g/nLoVLMlIX51Z6m nCLw== X-Gm-Message-State: AOAM53264d9xW+IduDoj+DVC9slME0KIi1td8FW1qb3iduZFUFATCI0C xwWVnigEFZtFx4gSQNS7UhLQgQ== X-Google-Smtp-Source: ABdhPJySoMYDbbVCZgUWIxIqiX91GdBD0424m3xS2BiLVfk/hmUs+W5i3x0nPZ2KmzwAXV+nPvMwOw== X-Received: by 2002:a05:6000:2cf:: with SMTP id o15mr14224637wry.184.1610734579303; Fri, 15 Jan 2021 10:16:19 -0800 (PST) Received: from dell.default ([91.110.221.158]) by smtp.gmail.com with ESMTPSA id b133sm14405979wme.33.2021.01.15.10.16.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Jan 2021 10:16:18 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Cc: linux-kernel@vger.kernel.org, VMware Graphics , Roland Scheidegger , Zack Rusin , David Airlie , Daniel Vetter , Sumit Semwal , =?utf-8?q?Christian_K=C3=B6ni?= =?utf-8?q?g?= , Dave Airlie , Rob Clark , dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org Subject: [PATCH 09/29] drm/vmwgfx/ttm_object: Demote half-assed headers and fix-up another Date: Fri, 15 Jan 2021 18:15:41 +0000 Message-Id: <20210115181601.3432599-10-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210115181601.3432599-1-lee.jones@linaro.org> References: <20210115181601.3432599-1-lee.jones@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/vmwgfx/ttm_object.c:60: error: Cannot parse struct or union! drivers/gpu/drm/vmwgfx/ttm_object.c:97: warning: Function parameter or member 'mem_glob' not described in 'ttm_object_device' drivers/gpu/drm/vmwgfx/ttm_object.c:97: warning: Function parameter or member 'ops' not described in 'ttm_object_device' drivers/gpu/drm/vmwgfx/ttm_object.c:97: warning: Function parameter or member 'dmabuf_release' not described in 'ttm_object_device' drivers/gpu/drm/vmwgfx/ttm_object.c:97: warning: Function parameter or member 'dma_buf_size' not described in 'ttm_object_device' drivers/gpu/drm/vmwgfx/ttm_object.c:97: warning: Function parameter or member 'idr' not described in 'ttm_object_device' drivers/gpu/drm/vmwgfx/ttm_object.c:128: warning: Function parameter or member 'rcu_head' not described in 'ttm_ref_object' drivers/gpu/drm/vmwgfx/ttm_object.c:128: warning: Function parameter or member 'tfile' not described in 'ttm_ref_object' drivers/gpu/drm/vmwgfx/ttm_object.c:582: warning: Function parameter or member 'dmabuf' not described in 'get_dma_buf_unless_doomed' drivers/gpu/drm/vmwgfx/ttm_object.c:582: warning: Excess function parameter 'dma_buf' description in 'get_dma_buf_unless_doomed' Cc: VMware Graphics Cc: Roland Scheidegger Cc: Zack Rusin Cc: David Airlie Cc: Daniel Vetter Cc: Sumit Semwal Cc: "Christian König" Cc: Dave Airlie Cc: Rob Clark Cc: dri-devel@lists.freedesktop.org Cc: linux-media@vger.kernel.org Cc: linaro-mm-sig@lists.linaro.org Signed-off-by: Lee Jones --- drivers/gpu/drm/vmwgfx/ttm_object.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/vmwgfx/ttm_object.c b/drivers/gpu/drm/vmwgfx/ttm_object.c index 0fe869d0fad12..b3fdc630497cb 100644 --- a/drivers/gpu/drm/vmwgfx/ttm_object.c +++ b/drivers/gpu/drm/vmwgfx/ttm_object.c @@ -73,7 +73,7 @@ struct ttm_object_file { struct kref refcount; }; -/** +/* * struct ttm_object_device * * @object_lock: lock that protects the object_hash hash table. @@ -96,7 +96,7 @@ struct ttm_object_device { struct idr idr; }; -/** +/* * struct ttm_ref_object * * @hash: Hash entry for the per-file object reference hash. @@ -568,7 +568,7 @@ void ttm_object_device_release(struct ttm_object_device **p_tdev) /** * get_dma_buf_unless_doomed - get a dma_buf reference if possible. * - * @dma_buf: Non-refcounted pointer to a struct dma-buf. + * @dmabuf: Non-refcounted pointer to a struct dma-buf. * * Obtain a file reference from a lookup structure that doesn't refcount * the file, but synchronizes with its release method to make sure it has From patchwork Fri Jan 15 18:16:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 364902 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.9 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CB3E4C433DB for ; Fri, 15 Jan 2021 18:18:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9519A23A59 for ; Fri, 15 Jan 2021 18:18:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388574AbhAOSRo (ORCPT ); Fri, 15 Jan 2021 13:17:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57170 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728537AbhAOSRn (ORCPT ); Fri, 15 Jan 2021 13:17:43 -0500 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 98DF0C0617BF for ; Fri, 15 Jan 2021 10:16:47 -0800 (PST) Received: by mail-wr1-x432.google.com with SMTP id 6so2912779wri.3 for ; Fri, 15 Jan 2021 10:16:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8ouoNyIGf3M12ncW8jNmga8ZhB/umTlAexno2+hm9vw=; b=PN4ofpG3AFQIY2HDhtrxDHd3v0+xd4onwEz7G2/zC+rhfE4HirmzmL3jcXLpUYXBOi 1hKzvGAxrSr6Dv8cDtBOLdA7LW3HUMbsDnWopgDjwrGvgzeyJHyJwJWkktXJjDTKYn5x 6sdobPOvJJIR/TrcLU+En4Nb4Sqr3ym2MpFPjZERoM0EqXn73uEydbCIdma4dh+mEVpS 9T/msFV3PGGbNj49yLhdVehCCKoHHScJgdSAS89oR4U37UhK/tfSoY4zcAxgsB3IEg6M gagHknlc1GH0nljzwa8FvQWUO/kBx3xMgu49tE3RqzKT+TqiG4u92puwvRgzcDEP2/vs 8tag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8ouoNyIGf3M12ncW8jNmga8ZhB/umTlAexno2+hm9vw=; b=ijoFAQtc33C5jm6CiE+iPFNhyMc1qpMCquNIgtxpfBu8XB6DGIDYe+5HiwgqMvLps8 dU0AM3pqPdOkTZkRjKJpoQ6SPM9yq5753ScKqevJ4FAjmpLiNHneR+cv4gNSfBslIDPn 8EScNTffgxKrWTQLuH6SF1s8+ZeHBSiDCTuZZZ+pZs1QWcB0zjYS9wav8RsGIcVb+OEm Ce9qbH7bezKRGmbd/BqngnQ1/BLugpdKdE0uL6UV1lY/JfX2pNMlYCr9SB2EI0z6cKNL DH6ikx2V/lmZl8rsuLz2lANl6QnR4VBDsOmng/XCgBZWaz2k9iU8EkC9HDzqFzByqDOJ xsPQ== X-Gm-Message-State: AOAM532H0PsGgnmAmjjEKOwSOA7MdwRxL4yxT+z6iHBxwnLkaeeAXrKX bvgv7Dzx3qra0Wr9X+Y2QXou/Q== X-Google-Smtp-Source: ABdhPJypPfWiZJEwtJ8E9isJbQjNIe0ev/rxFYQX2OcbRtBc5hQl2j1aWEaiYzfS5p/hRAPbYrpcgA== X-Received: by 2002:adf:ef49:: with SMTP id c9mr10087109wrp.172.1610734606342; Fri, 15 Jan 2021 10:16:46 -0800 (PST) Received: from dell.default ([91.110.221.158]) by smtp.gmail.com with ESMTPSA id b133sm14405979wme.33.2021.01.15.10.16.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Jan 2021 10:16:45 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Cc: linux-kernel@vger.kernel.org, VMware Graphics , Roland Scheidegger , Zack Rusin , David Airlie , Daniel Vetter , Sumit Semwal , =?utf-8?q?Christian_K=C3=B6ni?= =?utf-8?q?g?= , Dave Airlie , Rob Clark , dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org Subject: [PATCH 29/29] drm/vmwgfx/ttm_object: Reorder header to immediately precede its struct Date: Fri, 15 Jan 2021 18:16:01 +0000 Message-Id: <20210115181601.3432599-30-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210115181601.3432599-1-lee.jones@linaro.org> References: <20210115181601.3432599-1-lee.jones@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Also add missing description for 'refcount' Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/vmwgfx/ttm_object.c:60: error: Cannot parse struct or union! Cc: VMware Graphics Cc: Roland Scheidegger Cc: Zack Rusin Cc: David Airlie Cc: Daniel Vetter Cc: Sumit Semwal Cc: "Christian König" Cc: Dave Airlie Cc: Rob Clark Cc: dri-devel@lists.freedesktop.org Cc: linux-media@vger.kernel.org Cc: linaro-mm-sig@lists.linaro.org Signed-off-by: Lee Jones --- drivers/gpu/drm/vmwgfx/ttm_object.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/vmwgfx/ttm_object.c b/drivers/gpu/drm/vmwgfx/ttm_object.c index b3fdc630497cb..112394dd0ab6a 100644 --- a/drivers/gpu/drm/vmwgfx/ttm_object.c +++ b/drivers/gpu/drm/vmwgfx/ttm_object.c @@ -42,6 +42,14 @@ */ +#define pr_fmt(fmt) "[TTM] " fmt + +#include +#include +#include +#include +#include "ttm_object.h" + /** * struct ttm_object_file * @@ -55,16 +63,9 @@ * * @ref_hash: Hash tables of ref objects, one per ttm_ref_type, * for fast lookup of ref objects given a base object. + * + * @refcount: reference/usage count */ - -#define pr_fmt(fmt) "[TTM] " fmt - -#include -#include -#include -#include -#include "ttm_object.h" - struct ttm_object_file { struct ttm_object_device *tdev; spinlock_t lock;