Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp4570200pxv; Tue, 6 Jul 2021 04:18:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwhhc8sB+NckK1W1rM/ZqKyrKeXwg4CAmLYz/r//RL177g9zxG4MOMVhTvRlRe1EE8Cf1I2 X-Received: by 2002:a92:cda5:: with SMTP id g5mr13929748ild.117.1625570330774; Tue, 06 Jul 2021 04:18:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625570330; cv=none; d=google.com; s=arc-20160816; b=dV2X1qE4yWkK5NA6nqPKuelO1T9uW4N746bdy+d63L2pviOLW/emORqnCydDadsY6u HydL6fRT80lmXrNdsx5W9QQVz02GOD9twSvKVW3wKK4NY2HcBfZe6H5OrMPtk0gz5D/8 tBbDFJH9Oh8W6GqE/wPrx+M98lmT0/hw3hHUWdc9qwgQWKmYejY2cbr4QSdvmtqeUFjp DBDj6plhNoYp3mWzcdSklvkWI+Ip8IXtRiWW/8mDyakHA74VD1zxzdSiYj3dEbLGtWgw 5+kH9quO6hepIBKtFhbBURdZB8zwBYTm8Esvp84ukvXKxQL26F15bcC3mwLG7rbyDzwr XW1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Wh2F1S0lTr7ARzDN3OfhjVDjGBzKBig1i2sAN62nTVI=; b=khSwss45i30Q4I+bzQ+u289SkFheZz4Dg06WuER3Ot5kf4SjRIaOe6Ev4eLKqIfdhS XkShWb2VRluO1oiV3e51d+M4IPtu+caKPpIFOUkaT6zbNCvs6D2axWN3vsq54b6ZY8j2 20S6K97wPcZqkiye1QgTOt4w/TvSz8BUwY5omDe8qQiDadgktNGG4U/xD6+R1QI7+Re6 tii0PY2kyUikI6HDaVSV2eXC8WLYBlZTEoknUef06N8PTZV/Vc0DMq9Dnq/IDTq8/YlJ xWrk6qoPa+1lrPr99k+HHEfElTdgfP2k5l5Ad5KtMxw/3AxR5trOOmcXJDDlOcDqDZFS WcxQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=uGbl7yOH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w16si8502612jal.57.2021.07.06.04.18.39; Tue, 06 Jul 2021 04:18:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=uGbl7yOH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232481AbhGFLUl (ORCPT + 99 others); Tue, 6 Jul 2021 07:20:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:54302 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232404AbhGFLST (ORCPT ); Tue, 6 Jul 2021 07:18:19 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A51FD61C4E; Tue, 6 Jul 2021 11:15:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625570141; bh=FGDvieCdZUvRXaq+SoPPGIBddDqrEwFMckzntCzx+sA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uGbl7yOH7OOaiMD9lHJ7AS75jWZcdOo7eXmNnGg16SHQ5b7ky8u/+qxma2fZsG8m+ uYxZhVaySO8nN+M6BUrVbCeZ20MQKlY9c6KwPJk61laJtgrpEksCUoGMrUiUB0XXlZ fTW4KKxAzphtCt1ba6jUysVLtZYuWy25T9eKNV2D0Wpch8X7G6XwxYn5xXs4YOdThz 7I+2Ge+qAKLFEr/6c7MWnyOJXuNIIGtSN4loCH1gWlLwjxCjtzRNTo56S3y567so+t OQLJiL7Ig+urNgJW8+bvhSAh4AaLLg1r3P9DYpLMrnfrNrjvTMCXL3MX+ckeGJlPdH MVjkxzv+hmz8g== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Shiwu Zhang , Nirmoy Das , Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.13 066/189] drm/amdgpu: fix metadata_size for ubo ioctl queries Date: Tue, 6 Jul 2021 07:12:06 -0400 Message-Id: <20210706111409.2058071-66-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210706111409.2058071-1-sashal@kernel.org> References: <20210706111409.2058071-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Shiwu Zhang [ Upstream commit eba98523724be7ad3539f2c975de1527e0c99dd6 ] Although the kfd_ioctl_get_dmabuf_info() still fail it will indicate the caller right metadat_size useful for the same kfd ioctl next time. Signed-off-by: Shiwu Zhang Reviewed-by: Nirmoy Das Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c index f9434bc2f9b2..db00de33caa3 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c @@ -1246,6 +1246,9 @@ int amdgpu_bo_get_metadata(struct amdgpu_bo *bo, void *buffer, BUG_ON(bo->tbo.type == ttm_bo_type_kernel); ubo = to_amdgpu_bo_user(bo); + if (metadata_size) + *metadata_size = ubo->metadata_size; + if (buffer) { if (buffer_size < ubo->metadata_size) return -EINVAL; @@ -1254,8 +1257,6 @@ int amdgpu_bo_get_metadata(struct amdgpu_bo *bo, void *buffer, memcpy(buffer, ubo->metadata, ubo->metadata_size); } - if (metadata_size) - *metadata_size = ubo->metadata_size; if (flags) *flags = ubo->metadata_flags; -- 2.30.2