From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A32AE14533D; Tue, 23 Apr 2024 21:44:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713908670; cv=none; b=dv5EgeJWpfBHlzCzPcFrz0g5ouqYgCSAe/zcg5X3R4+4Fq6T78VIoBY+TaAgO9W6FDvCG7WVTmpml6+aW+cUzYbJcUysilCxGPb/1BrmJtPN8dY6UX5nR9KnEUO0nwo9bst4I29R8yOnhlsPFzgin5o/qy9DFEbr37kzrsRK/Eo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713908670; c=relaxed/simple; bh=VHCnlKquvVOtnkxjzK6/ACbVX1C4gxB1O3lKrAFYC6c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NB9ar0FDx058p+jxpn1vc/g5zLBJmwa2D+iu/wJ0oljqkQxPmRYCruQt9IhLSSf2YmInkDCuca49JpsaEl8FTCkuzArCT6jZ161lGsV04j28nAwLMb33ApkQWZ+WqW+o3eRXwtJZZlIOrnMQJ9NbYbfv8pLJQxZeCkyc0FAXRFU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=GK7U/j6g; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="GK7U/j6g" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6D262C116B1; Tue, 23 Apr 2024 21:44:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1713908670; bh=VHCnlKquvVOtnkxjzK6/ACbVX1C4gxB1O3lKrAFYC6c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GK7U/j6gmPpvdmBypfv5LHCVRppF9xuU8sAbHZutKbf0U/wNmd0EB/HYmHaffrC8t nmlSMi0/7RFxPvjUEBkOKefRshvIXQDgv0ZE0j32qXhgYgrjRVa6eOiDywl2YJ2OS2 CRyOuTzezJMR8ICyCzNhHME6/mXjbDISvEC/1ypo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Zack Rusin , Ye Li , Broadcom internal kernel review list , dri-devel@lists.freedesktop.org, Martin Krastev , Sasha Levin Subject: [PATCH 6.1 001/141] drm/vmwgfx: Enable DMA mappings with SEV Date: Tue, 23 Apr 2024 14:37:49 -0700 Message-ID: <20240423213853.403789102@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240423213853.356988651@linuxfoundation.org> References: <20240423213853.356988651@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Zack Rusin [ Upstream commit 4c08f01934ab67d1d283d5cbaa52b923abcfe4cd ] Enable DMA mappings in vmwgfx after TTM has been fixed in commit 3bf3710e3718 ("drm/ttm: Add a generic TTM memcpy move for page-based iomem") This enables full guest-backed memory support and in particular allows usage of screen targets as the presentation mechanism. Signed-off-by: Zack Rusin Reported-by: Ye Li Tested-by: Ye Li Fixes: 3b0d6458c705 ("drm/vmwgfx: Refuse DMA operation when SEV encryption is active") Cc: Broadcom internal kernel review list Cc: dri-devel@lists.freedesktop.org Cc: # v6.6+ Reviewed-by: Martin Krastev Link: https://patchwork.freedesktop.org/patch/msgid/20240408022802.358641-1-zack.rusin@broadcom.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index 9d7a1b710f48f..53f63ad656a41 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c @@ -663,11 +663,12 @@ static int vmw_dma_select_mode(struct vmw_private *dev_priv) [vmw_dma_map_populate] = "Caching DMA mappings.", [vmw_dma_map_bind] = "Giving up DMA mappings early."}; - /* TTM currently doesn't fully support SEV encryption. */ - if (cc_platform_has(CC_ATTR_MEM_ENCRYPT)) - return -EINVAL; - - if (vmw_force_coherent) + /* + * When running with SEV we always want dma mappings, because + * otherwise ttm tt pool pages will bounce through swiotlb running + * out of available space. + */ + if (vmw_force_coherent || cc_platform_has(CC_ATTR_MEM_ENCRYPT)) dev_priv->map_mode = vmw_dma_alloc_coherent; else if (vmw_restrict_iommu) dev_priv->map_mode = vmw_dma_map_bind; -- 2.43.0