From patchwork Fri Apr 16 14:36:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 12207937 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.7 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=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 5BFF5C43461 for ; Fri, 16 Apr 2021 14:37:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 42F246113D for ; Fri, 16 Apr 2021 14:37:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243191AbhDPOiF (ORCPT ); Fri, 16 Apr 2021 10:38:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235875AbhDPOiE (ORCPT ); Fri, 16 Apr 2021 10:38:04 -0400 Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 873FDC061574 for ; Fri, 16 Apr 2021 07:37:39 -0700 (PDT) Received: by mail-ej1-x630.google.com with SMTP id r12so42509830ejr.5 for ; Fri, 16 Apr 2021 07:37:39 -0700 (PDT) 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=7/qJg/GxIoIQOOm1SNOLLnFRtxZCMtYZ46XvrqG7mv4=; b=itln6XERME/4Yh80Mask5Ou5IFhw9E4rP1eKimMutmDEThu7t2bC6wxjUfv9+3am+0 Ivc5a9UFk2rAyPPvLw/G7NrQrAZyq3TKud34Vt5mGrX7IL5JSu1VmtugH/FcOCGKRI4G iCIXzZERumpfQBAlqmR1xjkxjwAPJZmF1Hj8S5yoTM51VsLTNEUuKolsvlWpOtJbSslP 6D9/3lqjJ8B8JU1NrLhmJAEImB/HJXPjthAGwlNpzU5kOvTKjK4ziF25bgwEF/cv/vW7 Irer8JRZejsZ1eZ5PXkstUyuQ6PaPg5YsLo+ioQ3cNpsH5qGoyk5YfmpxpOqiqzd5ZoL RdUg== 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=7/qJg/GxIoIQOOm1SNOLLnFRtxZCMtYZ46XvrqG7mv4=; b=ljX2+RXZ5i6Cgv83d5IrXJLr6lcX5i/MbPTJOsQs3GymQLS2ScAdR/EZjZuWF2PA/5 Rf6YV59xwElaGI3kR349EOjg5C9g6JhsHunRU95Od2i1UMuESRs5CrsM/z08vQEku6zp yFg9rOdbxuFJbCWw8OTlPRxmN3qAnCeGgXklAa7r/4+K5E1JoIa4H6/qowM4SODm7tMP ZAni+zBlZZVPbBa/rWKLvggeqJ+Bs9qZo7JzJY6nT8AxD00JT+rq7bB2zw5B9tIIddRH eqacwknKCPgNEViiWLKBTBBwOgY7c8GSiaAXlAO/8JNBoy9MBMs5xnU3vVMN0VtBJT5Q drBw== X-Gm-Message-State: AOAM530F7JhbvvJwvbrYaA5q+IwDF9r5DIy+PBlhapOkVRi9OBbpYFB+ XXr5HLf+1ZUnbHGnFg4TAVVVmA== X-Google-Smtp-Source: ABdhPJwyyQ78HhFxwVGsHOCCHcrMEtltPH9DKl5AUPQtj9p3tU6DB6ttsT61SqDtIpq8Q2r9Ym/3hA== X-Received: by 2002:a17:906:c218:: with SMTP id d24mr8346753ejz.363.1618583858315; Fri, 16 Apr 2021 07:37:38 -0700 (PDT) Received: from dell.default ([91.110.221.215]) by smtp.gmail.com with ESMTPSA id j10sm1326523ejk.93.2021.04.16.07.37.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Apr 2021 07:37:37 -0700 (PDT) From: Lee Jones To: lee.jones@linaro.org Cc: linux-kernel@vger.kernel.org, Ben Skeggs , David Airlie , Daniel Vetter , Sumit Semwal , =?utf-8?q?Christian_K=C3=B6nig?= , Jeremy Kolb , dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org Subject: [PATCH 07/40] drm/nouveau/nouveau_bo: Remove unused variables 'dev' Date: Fri, 16 Apr 2021 15:36:52 +0100 Message-Id: <20210416143725.2769053-8-lee.jones@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210416143725.2769053-1-lee.jones@linaro.org> References: <20210416143725.2769053-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/nouveau/nouveau_bo.c: In function ‘nouveau_ttm_tt_populate’: drivers/gpu/drm/nouveau/nouveau_bo.c:1228:17: warning: variable ‘dev’ set but not used [-Wunused-but-set-variable] drivers/gpu/drm/nouveau/nouveau_bo.c: In function ‘nouveau_ttm_tt_unpopulate’: drivers/gpu/drm/nouveau/nouveau_bo.c:1252:17: warning: variable ‘dev’ set but not used [-Wunused-but-set-variable] Cc: Ben Skeggs Cc: David Airlie Cc: Daniel Vetter Cc: Sumit Semwal Cc: "Christian König" Cc: Jeremy Kolb Cc: dri-devel@lists.freedesktop.org Cc: nouveau@lists.freedesktop.org Cc: linux-media@vger.kernel.org Cc: linaro-mm-sig@lists.linaro.org Signed-off-by: Lee Jones Reviewed-by: Karol Herbst --- drivers/gpu/drm/nouveau/nouveau_bo.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index 3e09df0472ce4..37b3d2c10f5c5 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -1255,7 +1255,6 @@ nouveau_ttm_tt_populate(struct ttm_device *bdev, { struct ttm_tt *ttm_dma = (void *)ttm; struct nouveau_drm *drm; - struct device *dev; bool slave = !!(ttm->page_flags & TTM_PAGE_FLAG_SG); if (ttm_tt_is_populated(ttm)) @@ -1268,7 +1267,6 @@ nouveau_ttm_tt_populate(struct ttm_device *bdev, } drm = nouveau_bdev(bdev); - dev = drm->dev->dev; return ttm_pool_alloc(&drm->ttm.bdev.pool, ttm, ctx); } @@ -1278,14 +1276,12 @@ nouveau_ttm_tt_unpopulate(struct ttm_device *bdev, struct ttm_tt *ttm) { struct nouveau_drm *drm; - struct device *dev; bool slave = !!(ttm->page_flags & TTM_PAGE_FLAG_SG); if (slave) return; drm = nouveau_bdev(bdev); - dev = drm->dev->dev; return ttm_pool_free(&drm->ttm.bdev.pool, ttm); } From patchwork Fri Apr 16 14:37:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 12207939 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.7 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=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 ADE65C43470 for ; Fri, 16 Apr 2021 14:38:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 71E1861184 for ; Fri, 16 Apr 2021 14:38:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244581AbhDPOi0 (ORCPT ); Fri, 16 Apr 2021 10:38:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45238 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244306AbhDPOiR (ORCPT ); Fri, 16 Apr 2021 10:38:17 -0400 Received: from mail-ej1-x636.google.com (mail-ej1-x636.google.com [IPv6:2a00:1450:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 77762C06138F for ; Fri, 16 Apr 2021 07:37:51 -0700 (PDT) Received: by mail-ej1-x636.google.com with SMTP id r12so42510709ejr.5 for ; Fri, 16 Apr 2021 07:37:51 -0700 (PDT) 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=eXZ/aruuf/HDb1osSRlOCbptqW9LQNCh62l+8IzDShM=; b=nala5xvwW4MR5oUqd1Vd1iKc4vIyEJwpnl6RWKmmRlI6Autue0yAgs03YV3Gh8pRy4 kQ4hQeBHdwy4OObwHv3Zc8vILSSbr7ywqZx40DdqQvNjkhibnACpJEeb081cQ7YBdTED QGWpeKx4AfyrhZBX0iCxe4a2kz6ZcrqZ8f/DWwUX9dvKHxa2apbWfWverpRtZpWGBZFv x5I5vVcbL3vY7l871W6ewNDm7yrxYYb3nJccs+QLYmiCHlER6RjIE+YWnO9pfXmZ5WKh c+3gNXB/0gw9wlMUuziI9QCqfgF776+08XI5QLAy5fkkeTpXCRf7kIU5dBUP4WWuWde5 1jPg== 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=eXZ/aruuf/HDb1osSRlOCbptqW9LQNCh62l+8IzDShM=; b=qtTWxV3X51flXMXSv1cLSVCP7duxCmXL2I2nxwRVfVGU3CPT4MWQ62V9KW2CFCGFBM k8OMYoK3ORcGelWOpgVjcIFbwjQ3thlnbksjlBmPpEekVz7nqu2ke3F80JtETG/svmkR VaX7nzdVuSexTRfLOgHfus3Pd7tRPj23UY0RP1/s8HNlj18kTi+4j0e/IKgN63fqUfDi pT3FHZdhRnXqxm7EtIX3NlKBxu2ad7coTOm6d0gahP+m5BijFGjtfh+O8rwBBdaxikXr qKv5q9ahsIi/oxA+4NP0RdgWSTmejQDzczLFMJokmb0hQCWrHNRzfFtS1RdbUEt+Wg0O +4Yw== X-Gm-Message-State: AOAM533WFMPYzN0F91eMTVeh3mtc08Sf7YutM8LJOJeE+vV5JMAnptRw kpFMhHLY8EUx3wRgQEeYdtEZhA== X-Google-Smtp-Source: ABdhPJzMVYjB71yZ+la0ZUZ6dNZ79mUg8xL53xjArp5VNzBK2OTsFLdVpHquWHqf/cMoj1h10DZv2w== X-Received: by 2002:a17:906:90d4:: with SMTP id v20mr8564697ejw.275.1618583870141; Fri, 16 Apr 2021 07:37:50 -0700 (PDT) Received: from dell.default ([91.110.221.215]) by smtp.gmail.com with ESMTPSA id j10sm1326523ejk.93.2021.04.16.07.37.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Apr 2021 07:37:49 -0700 (PDT) From: Lee Jones To: lee.jones@linaro.org Cc: linux-kernel@vger.kernel.org, Tomi Valkeinen , David Airlie , Daniel Vetter , Sumit Semwal , =?utf-8?q?Christian_K=C3=B6nig?= , Rob Clark , dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org Subject: [PATCH 19/40] drm/omapdrm/omap_gem: Properly document omap_gem_dumb_map_offset() Date: Fri, 16 Apr 2021 15:37:04 +0100 Message-Id: <20210416143725.2769053-20-lee.jones@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210416143725.2769053-1-lee.jones@linaro.org> References: <20210416143725.2769053-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/omapdrm/omap_gem.c:619: warning: expecting prototype for omap_gem_dumb_map(). Prototype was for omap_gem_dumb_map_offset() instead Cc: Tomi Valkeinen Cc: David Airlie Cc: Daniel Vetter Cc: Sumit Semwal Cc: "Christian König" 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 Reviewed-by: Tomi Valkeinen --- drivers/gpu/drm/omapdrm/omap_gem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c index 38af6195d9593..27c71cded5d0a 100644 --- a/drivers/gpu/drm/omapdrm/omap_gem.c +++ b/drivers/gpu/drm/omapdrm/omap_gem.c @@ -605,7 +605,7 @@ int omap_gem_dumb_create(struct drm_file *file, struct drm_device *dev, } /** - * omap_gem_dumb_map - buffer mapping for dumb interface + * omap_gem_dumb_map_offset - buffer mapping for dumb interface * @file: our drm client file * @dev: drm device * @handle: GEM handle to the object (from dumb_create) From patchwork Fri Apr 16 14:37:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 12207941 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.7 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=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 08E85C433B4 for ; Fri, 16 Apr 2021 14:38:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E011B613B7 for ; Fri, 16 Apr 2021 14:38:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244594AbhDPOi3 (ORCPT ); Fri, 16 Apr 2021 10:38:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45260 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244425AbhDPOiV (ORCPT ); Fri, 16 Apr 2021 10:38:21 -0400 Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 92715C061763 for ; Fri, 16 Apr 2021 07:37:55 -0700 (PDT) Received: by mail-ed1-x535.google.com with SMTP id j12so7533373edy.3 for ; Fri, 16 Apr 2021 07:37:55 -0700 (PDT) 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=H6lJM5vDlPCigZaMaZ137qXfyZxXCNgpbaNiX62r2Ss=; b=flSVCO6bULmEgKESUIhxGFuVTNcmVsqnwVrbn6m72srwUAYXKxBZS5Q/oDRhGv11DB v2a+c3zWguVvSFBphtnT73j9vAYOvHTNhi79odq04gfZLHYc8P+C4KTSZfBLdj8PyqNi BysQPAg5pgN8mANchtugw5z6tOHIVzKAx7bDEr8rmeH8ZQ8wjCv2lHbOIbX9jNKGxnLM ha5i5bwbGCMi3MrzIg5/rf/uHde9U+WFKoCGDBgH6kOx9yXAPH+LqQIFyTVIgV/dHEsc SyIsLANSeD5YaFr6F/3jY5GkhhiKLkX0scp2o5vzC6FMlIjMpnzTMnNQ3SCT8WDCRs+9 AjbQ== 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=H6lJM5vDlPCigZaMaZ137qXfyZxXCNgpbaNiX62r2Ss=; b=Btwu3FtDJPi/PRpOXUBoyfMSsazLcairsaS+ExKq3EzSrqJBKrkrrz8igLsR5xirZn uFfjD7yV7028nHjw0aBpV665aRN8IfUm5q3qnXPFNTQCdq5K6/bOVZwOk1ndgMV6ZLyr rJ1wS0wafbEloaSP84444TsL674ImK9eCspG72jaBECfN5DsvZHTy9v56sixgnIfwV21 //BsEK3IEjdiAuaVMpsCkms5zb++FKrOWbNx4WlROwttZZDutyRI4aRI+wnGGJ+umyHZ kV9x+GsbZNk0lFucBShhwQX0AX0x/ns2B4hPZXEuSdztDOqVrzi2UrvSGRhDTAVUGOY6 eHnw== X-Gm-Message-State: AOAM53203aPa71VTtEfAXX4zArrriyXZCtnc2fvuEaoWCyTdtF3Xa5+k 0ViulSBdmjbRrzDTwpxeRWEWcg== X-Google-Smtp-Source: ABdhPJyb4be2bRHCUASGhOYcF9QNbDlJuZvsy9N/XCm+mUih0S3RcBA88c3OyeoKleXaK17tAQDyYw== X-Received: by 2002:a50:9b12:: with SMTP id o18mr10607699edi.376.1618583874356; Fri, 16 Apr 2021 07:37:54 -0700 (PDT) Received: from dell.default ([91.110.221.215]) by smtp.gmail.com with ESMTPSA id j10sm1326523ejk.93.2021.04.16.07.37.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Apr 2021 07:37:53 -0700 (PDT) From: Lee Jones To: lee.jones@linaro.org Cc: linux-kernel@vger.kernel.org, Christian Koenig , Huang Rui , David Airlie , Daniel Vetter , Sumit Semwal , dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org Subject: [PATCH 23/40] drm/ttm/ttm_bo: Fix incorrectly documented function 'ttm_bo_cleanup_refs' Date: Fri, 16 Apr 2021 15:37:08 +0100 Message-Id: <20210416143725.2769053-24-lee.jones@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210416143725.2769053-1-lee.jones@linaro.org> References: <20210416143725.2769053-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/ttm/ttm_bo.c:293: warning: expecting prototype for function ttm_bo_cleanup_refs(). Prototype was for ttm_bo_cleanup_refs() instead Cc: Christian Koenig Cc: Huang Rui Cc: David Airlie Cc: Daniel Vetter Cc: Sumit Semwal Cc: dri-devel@lists.freedesktop.org Cc: linux-media@vger.kernel.org Cc: linaro-mm-sig@lists.linaro.org Signed-off-by: Lee Jones Reviewed-by: Christian König --- drivers/gpu/drm/ttm/ttm_bo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index cfd0b92923973..defec9487e1de 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -274,7 +274,7 @@ static void ttm_bo_flush_all_fences(struct ttm_buffer_object *bo) } /** - * function ttm_bo_cleanup_refs + * ttm_bo_cleanup_refs * If bo idle, remove from lru lists, and unref. * If not idle, block if possible. * From patchwork Fri Apr 16 14:37:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 12207943 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.7 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=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 0AFE1C43460 for ; Fri, 16 Apr 2021 14:38:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E324761166 for ; Fri, 16 Apr 2021 14:38:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244660AbhDPOig (ORCPT ); Fri, 16 Apr 2021 10:38:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45268 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244497AbhDPOiW (ORCPT ); Fri, 16 Apr 2021 10:38:22 -0400 Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 907D8C06138E for ; Fri, 16 Apr 2021 07:37:56 -0700 (PDT) Received: by mail-ed1-x529.google.com with SMTP id m3so32537109edv.5 for ; Fri, 16 Apr 2021 07:37:56 -0700 (PDT) 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=9TISBbCiRhBu677uKtWLY+O2n+9ENYFzE4E3l/7xu74=; b=WPFZRx2AOSEV7kKeL23SmikYGo6CGMuOXLlBxUeoNSKckHHvsWnzqy+JPsd3EzEUJn yy9JVK9GGo6jFgOv+QsgJukksMc8hJ3wnsoXPudyULwoeH0FV5yh6A2XrJYWmCi/AFh+ GPCfWPJELgYoscWMFR7mdIppujI3OPj/XfbHtjhYZbPTtc8nlRgMEemRcijC76Q3GgDE LI+lqrTQ/RJHwQrsDFje7aHIH2nGuJL0YhAuhKQqDzB/EqhBqtBX5+SJ5gW+lD9WGey2 RRyvf8tj+kggo9Y0DuIuB1LuDNaN4AF/yQKght+XeqMA/2ZhfsR88UWku5OG0QzaTfTt q0wQ== 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=9TISBbCiRhBu677uKtWLY+O2n+9ENYFzE4E3l/7xu74=; b=TVHZWMMFVZTidfG278alTj/PCj4O0Sc/Ypbe0NhvAOuYSmCPIM7XOQM+5srv6xHlrU aIJIadZPCrsWBI0vchIDc1YJFV0G+jhdeS/Ok/DfErwvlcGDxf3b2khlFcBAB/SzL3rF epkRDk1l1TChXTdAo1IiWY7829/eRCtKTdGhbri7bACP1zClEab2jdjNwSPq38WB6rAs ZQ0gOAgh5k9KYwTX8UoPW3517/qhJP0bJUKvDxpATQ/Z011DDJWvfVNxZ9WpYBqR8pzx JAPFBLDpHqD4RhEaRAVqRq9BbWkqRyZA5fDcsmUCY3/XDYIdPkTyZ5rsq4fH4Oeq9hFi Jtpg== X-Gm-Message-State: AOAM532rWJilpGpsDOvUHKfDuQC3S6njpiNeAeFr61VY7Mb8LQlLL7pa bKTbp5nxxpVz7czV5qBWwfxgkQ== X-Google-Smtp-Source: ABdhPJwaBHWHa3mmVDMl+qoKDnlJQf+hamKu6uJRFFXIt3+UT2zjv3ODxR5KwRlyUDvLklFhP3fIkw== X-Received: by 2002:aa7:d587:: with SMTP id r7mr9354550edq.388.1618583875381; Fri, 16 Apr 2021 07:37:55 -0700 (PDT) Received: from dell.default ([91.110.221.215]) by smtp.gmail.com with ESMTPSA id j10sm1326523ejk.93.2021.04.16.07.37.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Apr 2021 07:37:54 -0700 (PDT) From: Lee Jones To: lee.jones@linaro.org Cc: linux-kernel@vger.kernel.org, David Airlie , Daniel Vetter , Sumit Semwal , =?utf-8?q?Christian_K=C3=B6nig?= , dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org Subject: [PATCH 24/40] drm/scheduler/sched_entity: Fix some function name disparity Date: Fri, 16 Apr 2021 15:37:09 +0100 Message-Id: <20210416143725.2769053-25-lee.jones@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210416143725.2769053-1-lee.jones@linaro.org> References: <20210416143725.2769053-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/scheduler/sched_entity.c:204: warning: expecting prototype for drm_sched_entity_kill_jobs(). Prototype was for drm_sched_entity_kill_jobs_cb() instead drivers/gpu/drm/scheduler/sched_entity.c:262: warning: expecting prototype for drm_sched_entity_cleanup(). Prototype was for drm_sched_entity_fini() instead drivers/gpu/drm/scheduler/sched_entity.c:305: warning: expecting prototype for drm_sched_entity_fini(). Prototype was for drm_sched_entity_destroy() instead Cc: David Airlie Cc: Daniel Vetter Cc: Sumit Semwal Cc: "Christian König" 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/scheduler/sched_entity.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/scheduler/sched_entity.c b/drivers/gpu/drm/scheduler/sched_entity.c index f0790e9471d1a..0249c74501888 100644 --- a/drivers/gpu/drm/scheduler/sched_entity.c +++ b/drivers/gpu/drm/scheduler/sched_entity.c @@ -192,7 +192,7 @@ long drm_sched_entity_flush(struct drm_sched_entity *entity, long timeout) EXPORT_SYMBOL(drm_sched_entity_flush); /** - * drm_sched_entity_kill_jobs - helper for drm_sched_entity_kill_jobs + * drm_sched_entity_kill_jobs_cb - helper for drm_sched_entity_kill_jobs * * @f: signaled fence * @cb: our callback structure @@ -250,7 +250,7 @@ static void drm_sched_entity_kill_jobs(struct drm_sched_entity *entity) } /** - * drm_sched_entity_cleanup - Destroy a context entity + * drm_sched_entity_fini - Destroy a context entity * * @entity: scheduler entity * @@ -295,7 +295,7 @@ void drm_sched_entity_fini(struct drm_sched_entity *entity) EXPORT_SYMBOL(drm_sched_entity_fini); /** - * drm_sched_entity_fini - Destroy a context entity + * drm_sched_entity_destroy - Destroy a context entity * * @entity: scheduler entity * From patchwork Fri Apr 16 14:37:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 12207945 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.7 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=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 A27CCC43461 for ; Fri, 16 Apr 2021 14:38:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8A05361166 for ; Fri, 16 Apr 2021 14:38:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244534AbhDPOim (ORCPT ); Fri, 16 Apr 2021 10:38:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45228 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244522AbhDPOiY (ORCPT ); Fri, 16 Apr 2021 10:38:24 -0400 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA4B6C06134C for ; Fri, 16 Apr 2021 07:37:58 -0700 (PDT) Received: by mail-ed1-x52c.google.com with SMTP id o20so6273583edc.7 for ; Fri, 16 Apr 2021 07:37:58 -0700 (PDT) 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=N6vojmZkPJ0W/HM2G539IcIFG9CT0JLwxTEhHQdKtaY=; b=rm9JZIGI7J8NRlsShT3Jm2NylnVTVIfGIeKW7Q1CXc8kPPNkWZKGqQ6MoWeTDN+jAM u2Dybq6Xdr1oghJSAxt/2RBf3XkhmwCSdKZuh6DGDh8XhyGoVk3FQrqp/6PoCIv5weuO PD1mxtYjsGeHgTVQYJk3Rcld+NVV6SY6H6Hg6kRv+SvOknye8SHOZSveDpoc92p1m4OC QWZw1sqOd5ppK/hMGjGSHPLowZpmCo2Vd0IazZLwQxaH3IE3jLa9MSoOH9A91pauiC10 rc2kusC6vNjyYx06Va744Lews3kxxZkiTSM29kInghaUCaxCe0JGVE/DNBzrir9RV0j2 xaOA== 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=N6vojmZkPJ0W/HM2G539IcIFG9CT0JLwxTEhHQdKtaY=; b=kVGynDtElkIv49n7P16zH/XZx1qTjSOjz3wmdpOE831/tQGLWAPpHjSI+1LzropVEQ 86Hs7Fa3xY/FYbFedFy/78P2lANq1DnnBoNzPSwIFi/OVZQCrjKPUYOhQKiHNq4ds0Th v2RC688ZYfpfj6WKVsvDrmWRUbCnYMUILlNzO0SL6swvN0Gm2+Wp1beiwQ4797qGcfdC x34A2BERoj40D6FGQGC8PWRnt1Oj4pVK5ROlkbX1WvkxU54eNwtNpDezSBKagZzl/lOE Sp4dv49bGMMIg/c7PXt0XqfGdpGIbZGH6mfujtal/7urzIEDtZpD0Xdo0ATEC/hNzgPA PlMw== X-Gm-Message-State: AOAM530kLYey9FEerk8qLxkWpB8gyE0Aplep+cMS1GE9KBns+OzR5OKq oNWnZkNLbosEtW+LnXroifjpZw== X-Google-Smtp-Source: ABdhPJzm0j3Stuq4xPY8GX3G7xb61sxgZBcqIhiy5LHrxAjAX1VCvOlb9r5FvP0WCOuRJS4mdeFOIg== X-Received: by 2002:a05:6402:1741:: with SMTP id v1mr10264129edx.127.1618583877582; Fri, 16 Apr 2021 07:37:57 -0700 (PDT) Received: from dell.default ([91.110.221.215]) by smtp.gmail.com with ESMTPSA id j10sm1326523ejk.93.2021.04.16.07.37.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Apr 2021 07:37:57 -0700 (PDT) From: Lee Jones To: lee.jones@linaro.org Cc: linux-kernel@vger.kernel.org, Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , David Airlie , Daniel Vetter , Sumit Semwal , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org Subject: [PATCH 26/40] drm/amd/amdgpu/amdgpu_device: Remove unused variable 'r' Date: Fri, 16 Apr 2021 15:37:11 +0100 Message-Id: <20210416143725.2769053-27-lee.jones@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210416143725.2769053-1-lee.jones@linaro.org> References: <20210416143725.2769053-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/amd/amdgpu/amdgpu_device.c: In function ‘amdgpu_device_suspend’: drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:3733:6: warning: variable ‘r’ set but not used [-Wunused-but-set-variable] Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: Sumit Semwal Cc: amd-gfx@lists.freedesktop.org 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/amd/amdgpu/amdgpu_device.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index b4ad1c055c702..eef54b265ffdd 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -3730,7 +3730,6 @@ void amdgpu_device_fini(struct amdgpu_device *adev) int amdgpu_device_suspend(struct drm_device *dev, bool fbcon) { struct amdgpu_device *adev = drm_to_adev(dev); - int r; if (dev->switch_power_state == DRM_SWITCH_POWER_OFF) return 0; @@ -3745,7 +3744,7 @@ int amdgpu_device_suspend(struct drm_device *dev, bool fbcon) amdgpu_ras_suspend(adev); - r = amdgpu_device_ip_suspend_phase1(adev); + amdgpu_device_ip_suspend_phase1(adev); if (!adev->in_s0ix) amdgpu_amdkfd_suspend(adev, adev->in_runpm); @@ -3755,7 +3754,7 @@ int amdgpu_device_suspend(struct drm_device *dev, bool fbcon) amdgpu_fence_driver_suspend(adev); - r = amdgpu_device_ip_suspend_phase2(adev); + amdgpu_device_ip_suspend_phase2(adev); /* evict remaining vram memory * This second call to evict vram is to evict the gart page table * using the CPU. From patchwork Fri Apr 16 14:37:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 12207947 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.7 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=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 E4434C43603 for ; Fri, 16 Apr 2021 14:38:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BAA356121E for ; Fri, 16 Apr 2021 14:38:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244578AbhDPOio (ORCPT ); Fri, 16 Apr 2021 10:38:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45248 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244306AbhDPOi0 (ORCPT ); Fri, 16 Apr 2021 10:38:26 -0400 Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [IPv6:2a00:1450:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C1AE1C061760 for ; Fri, 16 Apr 2021 07:38:01 -0700 (PDT) Received: by mail-ed1-x532.google.com with SMTP id m3so32537507edv.5 for ; Fri, 16 Apr 2021 07:38:01 -0700 (PDT) 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=q9QkHlwJDar64oIul6Zxhmqo4CTxwCRZxxTfk+OGqes=; b=eY+BehDOCCwJrQBgJvFkrLf60qYGNjp86LQ95v4aL7ItluI4Kc1SOgueUMBeL7xVO0 HabFWzx1pws/L5MRCFq5LUoT5qfUy3s5FD/uSxeZFuyHKY3170WEz1Csbb4fSPaBDIqN oRoIS2YwYhl3F0P/wmetAgGaxJNwr8QMpvE56Jxb1rGkseV0sHdrWs1gzTSOL2x1NJS0 Vj80LYVwo8lXzAojSa+aNSIeTjnQWOA9oP0WJp53MrM0/1L47DLNnl/6xm51fQAC1llu FYuAOZoo41nr91MY3qLkcrnWrr3xBTW/WLIuUjkwS7wdSBtV0LoR2GWHCg5gPjz2JP4q OdwA== 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=q9QkHlwJDar64oIul6Zxhmqo4CTxwCRZxxTfk+OGqes=; b=VG6JyFOaMtyVAKpKbTJ/Pb6crLZs60gSFEil5sKxxm2EJ0lVwNAyPg+BKOaGJWHU5d FgBWMAMzaegSzGbqezTiTTYyaR/dujsh6WLKKDzVRR2Hp3rAANI2pimAIPpa9zYeGJa5 mkGsaS62cmdJfeiXbyYTbEhpI76e3QsQkTo3Q6DFtKnO7/PA1kJBbUcmaSAsxbKtKj9a qu3NaDr6PO4NwiBcMF5c65ffinMsJWHqXfMXFFIKdMaGG/mYt9xvHIF57ryt2qthDCgM 8L8m3s14eoQbV8Wq8Bt28gJxWun7IogVzGccg7G90+cvHGvPqwwXWu2ODcPzeruIJbm4 ChSA== X-Gm-Message-State: AOAM5336VKY1IXkyosk9G87ONsaHORdWcl5Vrmg5w7CIzM5wQWJXOsTM hBtoWASgF6Yh/yfaEpABv3qX2Q== X-Google-Smtp-Source: ABdhPJyfwppiWNh6UNq5J0oc3JQa61CxtXjxBSY55rvdOBADEXG3x0lLiRIZS3Wa6Jra3UH/lva7pA== X-Received: by 2002:a05:6402:cb3:: with SMTP id cn19mr2427916edb.206.1618583880589; Fri, 16 Apr 2021 07:38:00 -0700 (PDT) Received: from dell.default ([91.110.221.215]) by smtp.gmail.com with ESMTPSA id j10sm1326523ejk.93.2021.04.16.07.37.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Apr 2021 07:38:00 -0700 (PDT) From: Lee Jones To: lee.jones@linaro.org Cc: linux-kernel@vger.kernel.org, Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , David Airlie , Daniel Vetter , Sumit Semwal , Jerome Glisse , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org Subject: [PATCH 29/40] drm/amd/amdgpu/amdgpu_fence: Provide description for 'sched_score' Date: Fri, 16 Apr 2021 15:37:14 +0100 Message-Id: <20210416143725.2769053-30-lee.jones@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210416143725.2769053-1-lee.jones@linaro.org> References: <20210416143725.2769053-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/amd/amdgpu/amdgpu_fence.c:444: warning: Function parameter or member 'sched_score' not described in 'amdgpu_fence_driver_init_ring' Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: Sumit Semwal Cc: Jerome Glisse Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Cc: linux-media@vger.kernel.org Cc: linaro-mm-sig@lists.linaro.org Signed-off-by: Lee Jones Reviewed-by: Christian König --- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c index 47ea468596184..30772608eac6c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c @@ -434,6 +434,7 @@ int amdgpu_fence_driver_start_ring(struct amdgpu_ring *ring, * * @ring: ring to init the fence driver on * @num_hw_submission: number of entries on the hardware queue + * @sched_score: optional score atomic shared with other schedulers * * Init the fence driver for the requested ring (all asics). * Helper function for amdgpu_fence_driver_init(). From patchwork Fri Apr 16 14:37:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 12207949 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.7 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=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 51AEFC43616 for ; Fri, 16 Apr 2021 14:38:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2F24D611AC for ; Fri, 16 Apr 2021 14:38:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244789AbhDPOip (ORCPT ); Fri, 16 Apr 2021 10:38:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244589AbhDPOi2 (ORCPT ); Fri, 16 Apr 2021 10:38:28 -0400 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E9DA1C061756 for ; Fri, 16 Apr 2021 07:38:02 -0700 (PDT) Received: by mail-ed1-x531.google.com with SMTP id e7so32475802edu.10 for ; Fri, 16 Apr 2021 07:38:02 -0700 (PDT) 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=I7F+9DKjv4pSxsjZ8Q4NSxZmBv+NpIxPJbgx2acVLUU=; b=xUDIIJR/cLuzx29sMHGLZuOY6AlLTmEc1nYFSxBrGbSXcio6hSFL/Qj5My76RSIH9v 2TVRPRZTGDZUYukol3Rrr41enxdOCl2w6ae1LlUjfQIp52cn4Hk2ugldcUdfREVUpYyz kZ6hBID8yhhVWiYsfLKSwy6p+Exx+V2kxGKoycf7iPUKdzeESN2WkGwvJXSEBud644PT I1eg02i76GgWn9puwVkudV9PSwN4mqxmZSc2KqQQyAigrLRsCAImTh+iComP6NC+Xxhc HL9krOFybdi4KocyKW5QMBdfBRmX3gL/dmsrCmFfgH13kdZ2wxyGx18f2ddaKZn4iXVK ppfg== 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=I7F+9DKjv4pSxsjZ8Q4NSxZmBv+NpIxPJbgx2acVLUU=; b=sgSVoO0dcvW1Wmvxw1Yny7jmkOwXXjmQI3cCzW34P1B3+EWTVLh5FsbBogkVoG/4AL es2IKdS7Jup13fjtk2F8KHSV8vELMDB8ZNo/UkZwA0sgWJB/e+2m5EHlU/2fBIJrkGA9 S8PEWHZJusorg+rcOu9uIowEaqyzjnByWrRaNQeKtsVoPYz1fWPydqbyQHxcQnuOm2uw SxboaHHTjl4tYyDGL7qmosiAuw0fKWaCjVrBMN2NPWW5X4yXvR+DutjzpYgA1UEWIQVd 9fMwDRY6JXs5ndVXQLw324ssJlUpPGuFg6ev1go9bP3FyuxbUjN2cexOAZnlL7ETrb9a Nzhw== X-Gm-Message-State: AOAM531Cwtkd22XhR8QWbzkbUB6a9L6iMUFomXJcJ/WTOlRc34tyIpRh hatPUccu7ScfIWbtYeLm9knjkA== X-Google-Smtp-Source: ABdhPJwNxKANqCbAqE4qRNcZ6coZt9d+It6wnNQh5h1d63Ti//CSPf5MsoYyaoVv1NgeAQygdGWyLA== X-Received: by 2002:a05:6402:3550:: with SMTP id f16mr10261727edd.134.1618583881703; Fri, 16 Apr 2021 07:38:01 -0700 (PDT) Received: from dell.default ([91.110.221.215]) by smtp.gmail.com with ESMTPSA id j10sm1326523ejk.93.2021.04.16.07.38.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Apr 2021 07:38:01 -0700 (PDT) From: Lee Jones To: lee.jones@linaro.org Cc: linux-kernel@vger.kernel.org, David Airlie , Daniel Vetter , Sumit Semwal , =?utf-8?q?Christian_K=C3=B6nig?= , Adam Jackson , Ben Widawsky , dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org Subject: [PATCH 30/40] drm/vgem/vgem_drv: Demote kernel-doc abuse Date: Fri, 16 Apr 2021 15:37:15 +0100 Message-Id: <20210416143725.2769053-31-lee.jones@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210416143725.2769053-1-lee.jones@linaro.org> References: <20210416143725.2769053-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/vgem/vgem_drv.c:29: warning: This comment starts with '/**', but isn't a kernel-doc comment. Refer Documentation/doc-guide/kernel-doc.rst Cc: David Airlie Cc: Daniel Vetter Cc: Sumit Semwal Cc: "Christian König" Cc: Adam Jackson Cc: Ben Widawsky 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/vgem/vgem_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vgem/vgem_drv.c b/drivers/gpu/drm/vgem/vgem_drv.c index a0e75f1d5d016..bf38a7e319d14 100644 --- a/drivers/gpu/drm/vgem/vgem_drv.c +++ b/drivers/gpu/drm/vgem/vgem_drv.c @@ -25,7 +25,7 @@ * Ben Widawsky */ -/** +/* * This is vgem, a (non-hardware-backed) GEM service. This is used by Mesa's * software renderer and the X server for efficient buffer sharing. */ From patchwork Fri Apr 16 14:37:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 12207951 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.7 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=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 00D1FC43600 for ; Fri, 16 Apr 2021 14:38:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CF79C6115B for ; Fri, 16 Apr 2021 14:38:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244804AbhDPOiq (ORCPT ); Fri, 16 Apr 2021 10:38:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45316 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244605AbhDPOia (ORCPT ); Fri, 16 Apr 2021 10:38:30 -0400 Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 22EF8C061342 for ; Fri, 16 Apr 2021 07:38:05 -0700 (PDT) Received: by mail-ej1-x62c.google.com with SMTP id v6so41185470ejo.6 for ; Fri, 16 Apr 2021 07:38:05 -0700 (PDT) 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=ZGyBouBX1Ggemr68Q6SGgePttKsGtb3+vFBnPKj0XKk=; b=zjKlrXCCCLp6PJd5mtBzTp6pYWfRMDUvqt2BWn+2iebcYzB4ncO09SI9ON5trK0Mam CjIjMhDYpJVSXmm7/T0jadBr3NikpYMCeaOhRFojpAVKzAabEx/CVte0Gsuqae2S6xdV m3ofbSyWJjul6HlGEexA3HzhJU5ERte6rjduLZpYCQX0D4qDhYvh11cZADkRRa7D7mVt VaRx3PHxNHgjRg+6O+QBVcbacEUXpPkop3e7KMFlSAGu8MI7ygi2QSXMBTeRYbMul+4O INtlWgVewA6b6Z4apPq07djKAEmY/3meppvazfhHplENudSCo2rSXtEgAI631O5pEX09 HbMA== 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=ZGyBouBX1Ggemr68Q6SGgePttKsGtb3+vFBnPKj0XKk=; b=gfa88/D6B/vs3WGHTK+08vL+ifqDA9Ipa9kBkePcyNge0mVz1kRThxQVvzjhI+2W4s XXg9AnAyqEuab5rIJDrQIpUK5HUhjHYr0UiBnvH0lqb5xeYw8Mph6+AoMg5eH4z2uBGj B3kJYlwodhPL22USQ98Xg2c0dbcyS3RIQUCFktc1zFkboXD3Wo7M50MHNWqOByinofQO aBKFqeNiL9Rk+5qUa3+FSob/emEZO2Azf7/tYT1/aFPOMXWsxg9TNiDkZ2umuFm7A6w0 OdEgcm7nLCOv2OO3XfEjpw4F1fJLcaD8gSVRQcEJtSXHwD5yiRuBknVIr+5pvPwgItLL 8Z1A== X-Gm-Message-State: AOAM5323YPLrxWUXAJZrGm4Fu9a0papfDap4gO8tj75nfDw1eHvbVXMp T0RgZdxtGOHvtob01f3p8SiY0g== X-Google-Smtp-Source: ABdhPJws+FLe7plPr6Ort0gG8DuAX1ky+aZQxssJs5xmE11JaLd6HoX6Enf722QkwyFmK8phDKpX0Q== X-Received: by 2002:a17:906:a20c:: with SMTP id r12mr8482174ejy.554.1618583883851; Fri, 16 Apr 2021 07:38:03 -0700 (PDT) Received: from dell.default ([91.110.221.215]) by smtp.gmail.com with ESMTPSA id j10sm1326523ejk.93.2021.04.16.07.38.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Apr 2021 07:38:03 -0700 (PDT) From: Lee Jones To: lee.jones@linaro.org Cc: linux-kernel@vger.kernel.org, Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , David Airlie , Daniel Vetter , Sumit Semwal , Jerome Glisse , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org Subject: [PATCH 32/40] drm/amd/amdgpu/amdgpu_ttm: Fix incorrectly documented function 'amdgpu_ttm_copy_mem_to_mem()' Date: Fri, 16 Apr 2021 15:37:17 +0100 Message-Id: <20210416143725.2769053-33-lee.jones@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210416143725.2769053-1-lee.jones@linaro.org> References: <20210416143725.2769053-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/amd/amdgpu/amdgpu_ttm.c:311: warning: expecting prototype for amdgpu_copy_ttm_mem_to_mem(). Prototype was for amdgpu_ttm_copy_mem_to_mem() instead Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: Sumit Semwal Cc: Jerome Glisse Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Cc: linux-media@vger.kernel.org Cc: linaro-mm-sig@lists.linaro.org Signed-off-by: Lee Jones Reviewed-by: Christian König --- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index 3bef0432cac2f..859314c0d6a39 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -288,7 +288,7 @@ static int amdgpu_ttm_map_buffer(struct ttm_buffer_object *bo, } /** - * amdgpu_copy_ttm_mem_to_mem - Helper function for copy + * amdgpu_ttm_copy_mem_to_mem - Helper function for copy * @adev: amdgpu device * @src: buffer/address where to read from * @dst: buffer/address where to write to From patchwork Fri Apr 16 14:37:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 12207953 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.7 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=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 05E91C43462 for ; Fri, 16 Apr 2021 14:38:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E34BE611AC for ; Fri, 16 Apr 2021 14:38:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235263AbhDPOiu (ORCPT ); Fri, 16 Apr 2021 10:38:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244465AbhDPOib (ORCPT ); Fri, 16 Apr 2021 10:38:31 -0400 Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0EC78C061343 for ; Fri, 16 Apr 2021 07:38:06 -0700 (PDT) Received: by mail-ej1-x634.google.com with SMTP id e14so42447275ejz.11 for ; Fri, 16 Apr 2021 07:38:05 -0700 (PDT) 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=I8mWOth0SK24IkrgdA5t1Y60F5TC0397g52f7X8Rsig=; b=YgMDFePlDrbu+lfm/PqgYEnXq98IKmEE0loDCtjkfHsTCMpAqMSDSjSYx714+3DxwP sqWegEyqCp6hLKtv9sHQ3EY82v4t8frAeIWli699zbPAb40ZEiBEaw4QPxu4w63nO9cB KHuWXBQLE38YoaknaLtK242G6dcoG3qqnb4sXYX5R1NGPq/CEXHvxiHxdnLKTkhav9VT d5PwX9lVNlJCGvNS/uKWUMm0C3PLBjQW4xtOybaxuBcKZOVkTF1eiTg3+dod3uTSasqB 6BDP78jpXknUPSDKOij9kcO1wkGkQeV+VEcLB6h7VbZ6fQUxzDiymRrTsnO2qA7yYH1c CIyw== 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=I8mWOth0SK24IkrgdA5t1Y60F5TC0397g52f7X8Rsig=; b=FPQ3nuN8szPzYmK1X2L27UyVJmoCVfe7YH12hwL2KdKgbmuKO7xllZ4mo6k4YJJgcs QBT3xCyb4GrCvs2OQGCvJ8MefsyrmrtdDs8Bm3sDid7kUag99IFkRvQZHknEh+vHcdCI g/dtCsmBydCj++xY2zJsnF9kixYQ+v4nIsgHB1bdtgWD4d+GwH4CLrCt94k27F3Nuo0M Wif17sZWC3LqZxwKFYoKMj06T9UU7wzb+2YpQQOr/rAYE1joB8jbKobtP8zMimiUaTgS wp0AUOyhkTxxWPnF1kwyVGAfek5IGEpGB5upXkw73WU487MxX6iqylQSfhLFamJoF23N NYrQ== X-Gm-Message-State: AOAM533erE8HwEE0PSGyZuWbxSOoDndep/Fa98zbpReVD+rbmjRDe96B JhkhoxwGILMeoG7zBnC59eUNAA== X-Google-Smtp-Source: ABdhPJwB+j4w26WCbdC8MZ2fDdqzcj3geypeOzbRKQYNfP0KVkmEKSezvqx2DhR7+h5BUh8BM1TP8A== X-Received: by 2002:a17:907:9691:: with SMTP id hd17mr8782424ejc.205.1618583884824; Fri, 16 Apr 2021 07:38:04 -0700 (PDT) Received: from dell.default ([91.110.221.215]) by smtp.gmail.com with ESMTPSA id j10sm1326523ejk.93.2021.04.16.07.38.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Apr 2021 07:38:04 -0700 (PDT) From: Lee Jones To: lee.jones@linaro.org Cc: linux-kernel@vger.kernel.org, Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , David Airlie , Daniel Vetter , Sumit Semwal , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org Subject: [PATCH 33/40] drm/amd/amdgpu/amdgpu_ring: Provide description for 'sched_score' Date: Fri, 16 Apr 2021 15:37:18 +0100 Message-Id: <20210416143725.2769053-34-lee.jones@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210416143725.2769053-1-lee.jones@linaro.org> References: <20210416143725.2769053-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/amd/amdgpu/amdgpu_ring.c:169: warning: Function parameter or member 'sched_score' not described in 'amdgpu_ring_init' Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: Sumit Semwal Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Cc: linux-media@vger.kernel.org Cc: linaro-mm-sig@lists.linaro.org Signed-off-by: Lee Jones Reviewed-by: Christian König --- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c index 688624ebe4211..7b634a1517f9c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c @@ -158,6 +158,7 @@ void amdgpu_ring_undo(struct amdgpu_ring *ring) * @irq_src: interrupt source to use for this ring * @irq_type: interrupt type to use for this ring * @hw_prio: ring priority (NORMAL/HIGH) + * @sched_score: optional score atomic shared with other schedulers * * Initialize the driver information for the selected ring (all asics). * Returns 0 on success, error on failure. From patchwork Fri Apr 16 14:37:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 12207955 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.7 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=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 C6429C43462 for ; Fri, 16 Apr 2021 14:38:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A592C6113D for ; Fri, 16 Apr 2021 14:38:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244616AbhDPOi5 (ORCPT ); Fri, 16 Apr 2021 10:38:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45278 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244702AbhDPOih (ORCPT ); Fri, 16 Apr 2021 10:38:37 -0400 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4CEFAC061348 for ; Fri, 16 Apr 2021 07:38:08 -0700 (PDT) Received: by mail-ej1-x629.google.com with SMTP id u21so42487354ejo.13 for ; Fri, 16 Apr 2021 07:38:08 -0700 (PDT) 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=N0J5Bxl7vhdML2GM3ovQErwfTec12UCEbn+lGIO9lAc=; b=Y9TWecd7BKcNNCyqA8M5xkHBbkrb0RLig/181L5KKhITa6WQrpLWHcWzAOUIpBbztH mfRFZYAaWiwyACw5lHpXyoD70Ly9TRr4SOMk5VawhA49+MUL7RyTRAajxJcDKndra2eH V4RfFTTeH2LlPtlHCKTk2r9xYprOHtVxqcZAqTx3FazjAI/9jOiGACuJN1F1+rFv/U1u E8PDt+mxyQaPN12boKUE0/+Sz3/u7luoqbIKEhu5RM1PsrE3aj8Zc7W4n1wcjHpJ5+xZ 2s7FZNTpszGtEwl1ty0W7VtlLhxWznOCaALkgQwHeA7SDpHoiMfZyMB0Cyhuer6c5ThR h2CQ== 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=N0J5Bxl7vhdML2GM3ovQErwfTec12UCEbn+lGIO9lAc=; b=s1827KGEK07qw7s5S5igCtM4A9wiwfbZ1rMq1+uZdkLuru3Mzd+/2cxTAiBwolYh+K S5Ls1tepFjDO8qXhVJ8V/wMzoeIYCKJ0wjTa/IVDmCwZ6NEb+vtNUh2Hfcqzl9K7p78O uzASk6mH0QbSj5U8IyyJXHSShVjwBfbSEE1vaa8oR/zvslLXFZqoL0FoghasygskRST8 DLTAYuUApdXE8VTLMZm1owFE4CIHLTcMIihURlxh4VVS8flws025EmTUOABm9uYGawZU yJT+QWq6T8y09A/LzgMNmZJn19N4lMTEVHj/sBierBMDa8pz4IOot1zXeXHI9DXLgt9w xt9Q== X-Gm-Message-State: AOAM533nkEe0k4lkj1S1HgXpT8DS3Zi9X/cs/qmYBVP5F9EMaSlQaqvo Tx7TbFMxWIvs5zyys/dQmLh0qg== X-Google-Smtp-Source: ABdhPJwQfIUje2tlYBZv8vPpUeMPQ8VZakZYwR5uwBK9VUsCi0n8gtjtebQD5JAd2uGQhYmRaUFAPA== X-Received: by 2002:a17:906:4119:: with SMTP id j25mr8642477ejk.459.1618583887046; Fri, 16 Apr 2021 07:38:07 -0700 (PDT) Received: from dell.default ([91.110.221.215]) by smtp.gmail.com with ESMTPSA id j10sm1326523ejk.93.2021.04.16.07.38.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Apr 2021 07:38:06 -0700 (PDT) From: Lee Jones To: lee.jones@linaro.org Cc: linux-kernel@vger.kernel.org, Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , David Airlie , Daniel Vetter , Sumit Semwal , Jerome Glisse , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org Subject: [PATCH 35/40] drm/amd/amdgpu/amdgpu_cs: Repair some function naming disparity Date: Fri, 16 Apr 2021 15:37:20 +0100 Message-Id: <20210416143725.2769053-36-lee.jones@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210416143725.2769053-1-lee.jones@linaro.org> References: <20210416143725.2769053-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/amd/amdgpu/amdgpu_cs.c:685: warning: expecting prototype for cs_parser_fini(). Prototype was for amdgpu_cs_parser_fini() instead drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c:1502: warning: expecting prototype for amdgpu_cs_wait_all_fence(). Prototype was for amdgpu_cs_wait_all_fences() instead drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c:1656: warning: expecting prototype for amdgpu_cs_find_bo_va(). Prototype was for amdgpu_cs_find_mapping() instead Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: Sumit Semwal Cc: Jerome Glisse Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Cc: linux-media@vger.kernel.org Cc: linaro-mm-sig@lists.linaro.org Signed-off-by: Lee Jones Reviewed-by: Christian König --- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index b5c7669980458..90136f9dedd65 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c @@ -672,7 +672,7 @@ static int amdgpu_cs_sync_rings(struct amdgpu_cs_parser *p) } /** - * cs_parser_fini() - clean parser states + * amdgpu_cs_parser_fini() - clean parser states * @parser: parser structure holding parsing context. * @error: error number * @backoff: indicator to backoff the reservation @@ -1488,7 +1488,7 @@ int amdgpu_cs_fence_to_handle_ioctl(struct drm_device *dev, void *data, } /** - * amdgpu_cs_wait_all_fence - wait on all fences to signal + * amdgpu_cs_wait_all_fences - wait on all fences to signal * * @adev: amdgpu device * @filp: file private @@ -1639,7 +1639,7 @@ int amdgpu_cs_wait_fences_ioctl(struct drm_device *dev, void *data, } /** - * amdgpu_cs_find_bo_va - find bo_va for VM address + * amdgpu_cs_find_mapping - find bo_va for VM address * * @parser: command submission parser context * @addr: VM address