From patchwork Thu Jan 11 23:15:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 10158833 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 E195560170 for ; Thu, 11 Jan 2018 23:15:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D09A528517 for ; Thu, 11 Jan 2018 23:15:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C0C592860A; Thu, 11 Jan 2018 23:15:36 +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_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 2B33D28517 for ; Thu, 11 Jan 2018 23:15:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 02B0E6E4E9; Thu, 11 Jan 2018 23:15:34 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qt0-x241.google.com (mail-qt0-x241.google.com [IPv6:2607:f8b0:400d:c0d::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6D2AC6E4DD; Thu, 11 Jan 2018 23:15:32 +0000 (UTC) Received: by mail-qt0-x241.google.com with SMTP id g10so3970564qtj.12; Thu, 11 Jan 2018 15:15:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=x2vTfRD3fllrC9DpkvhOo1wXy3UVj+N8ZYOkRLQmxxQ=; b=mUa8mivXwZCtU5hR2xV/8Ie8e0NxVVRVpe3Zeeb9wxmaSGp5lrQhfkYYeAa2M898PI a3UP5t8LUsdksVC7bGGGmRTwD2L74lSVriYsRtWLgNz6hi676b/PgknIdRH2JZ5WC/pL E/l9fVlBraNb0xKtPnhj2rQHgG8LmLgD1erHvV7brNvRmtODbYFM+05IdTOLwYUd6K0W uWzZM3tNSuDqdHjq3Q5HEc2AOYpHcvvw2ls3Dys2xAPixJLridVSgHVXIFWP87ihkaZo MKruNJDXUEpJzk9aFqg7OkVUD/qBnPpIHWxKiAui2ukR7eUXDzKSELUhs7ArS5C5+Us4 PkdA== 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; bh=x2vTfRD3fllrC9DpkvhOo1wXy3UVj+N8ZYOkRLQmxxQ=; b=aKGGiD1Pw6Sfu5abCStuAwywOP3nQ6KR+MgWOrc6JUtfTSY70ig83sQTvDnt8nN+1c mAdcz8MdUTqS/T8LxGkaZId3A1+7sD95/F5x4xZoECaRLyabDRRaYzMu/2ACBTQNfBsU 0an1lzBdyM0j1TjKdBgohywRgFB9u8ASvFlAdtkz9MLp1wQM1rFuh/3bjfZGZHdKKhGZ DmkBbZ9dnQzTwKOirKLdB/kVkw1OCM8SpQ7/7vEtC1ynvl8XHDN0/ugCqLZDao/xl0jO WyeExaPMWHVGhplByT9jsjPBWw+a1Xp1B/t0rzIlj2pz3at0/xxskvhbw0Gk+k2IX2IO xW3g== X-Gm-Message-State: AKwxytdE9BcKl5gxjZAesDgy/83FhBwjMF06CvXNiNUXWeZx4uUkYcde 4uKhH0vOPLqE6DwWsER3gGg= X-Google-Smtp-Source: ACJfBov8b5ZyuBj7nU5zyQq2V/bTv+eYwv+Og5tqwV4U/A1OvmP5Ov4wP9fDsGC23EHFV98DjanyLg== X-Received: by 10.200.58.228 with SMTP id x91mr34259021qte.323.1515712531498; Thu, 11 Jan 2018 15:15:31 -0800 (PST) Received: from localhost (p200300E41F21CF00227DB10B7BBDB590.dip0.t-ipconnect.de. [2003:e4:1f21:cf00:227d:b10b:7bbd:b590]) by smtp.gmail.com with ESMTPSA id c12sm1690812qka.17.2018.01.11.15.15.30 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 11 Jan 2018 15:15:30 -0800 (PST) From: Thierry Reding To: Ben Skeggs Subject: [PATCH] drm/nouveau: Pass the proper arguments to nvif_object_map_handle() Date: Fri, 12 Jan 2018 00:15:28 +0100 Message-Id: <20180111231528.6768-1-thierry.reding@gmail.com> X-Mailer: git-send-email 2.15.1 Cc: linux-tegra@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Thierry Reding This is obviously wrong in the current code. Make sure to record the correct size of the arguments and pass the actual arguments to the nvif_object_map_handle() function. Suggested-by: Ben Skeggs Signed-off-by: Thierry Reding --- drivers/gpu/drm/nouveau/nouveau_bo.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index a8a957207f3a..8334b3f4e60b 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -1494,11 +1494,13 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *reg) args.nv50.ro = 0; args.nv50.kind = mem->kind; args.nv50.comp = mem->comp; + argc = sizeof(args.nv50); break; case NVIF_CLASS_MEM_GF100: args.gf100.version = 0; args.gf100.ro = 0; args.gf100.kind = mem->kind; + argc = sizeof(args.gf100); break; default: WARN_ON(1); @@ -1506,7 +1508,7 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *reg) } ret = nvif_object_map_handle(&mem->mem.object, - &argc, argc, + &args, argc, &handle, &length); if (ret != 1) { pr_info(" nvif_object_map_handle(): %d\n", ret);