From mboxrd@z Thu Jan 1 00:00:00 1970 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=-20.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 17482C07E99 for ; Mon, 5 Jul 2021 11:00:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F40796145D for ; Mon, 5 Jul 2021 11:00:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231516AbhGELDM (ORCPT ); Mon, 5 Jul 2021 07:03:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:48140 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231485AbhGELDL (ORCPT ); Mon, 5 Jul 2021 07:03:11 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id BB16F61447; Mon, 5 Jul 2021 11:00:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625482834; bh=C/HLHG6Av8lXqimOwroFa0oITaX+axl/LT1kTAHBQKg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cVlaGqyBLIpJRh/FRq6cHKayrObxcWJbfPcElW2CD8FxgTWnSg7Hcu+U/M0vGlR0C xjbjAc53OezqYgKl7RBOMwUBn8DZpa/lsUf17zMmGIB4EeKnQCFVKKUMFadoALiZAR nyKVRNmrgcn1dM8ZZMZMqgxvif5GRv3hU6b0TccDkbDyCYQluXrLc+NW6uUbONS0wY 0LmyDIG4fzxCTYmMYtG/rF3OgHUvCRne2s1btzjSmALkME/lcMQpcCAB6PDTa6BDf8 VIGpVxvGEDr6OqGnroJ2s/iSAle+8ssplaeUcPGFC03UhrLPvUwca1G2RF0IgJc3s1 u4dM0gofEUrow== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: =?UTF-8?q?Christian=20K=C3=B6nig?= , Alex Deucher , Sasha Levin Subject: [PATCH 5.4 3/6] drm/nouveau: fix dma_address check for CPU/GPU sync Date: Mon, 5 Jul 2021 07:00:26 -0400 Message-Id: <20210705110029.1513384-4-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210705110029.1513384-1-sashal@kernel.org> References: <20210705110029.1513384-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.130-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.4.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.4.130-rc1 X-KernelTest-Deadline: 2021-07-07T11:00+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Christian König [ Upstream commit d330099115597bbc238d6758a4930e72b49ea9ba ] AGP for example doesn't have a dma_address array. Signed-off-by: Christian König Acked-by: Alex Deucher Link: https://patchwork.freedesktop.org/patch/msgid/20210614110517.1624-1-christian.koenig@amd.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/nouveau/nouveau_bo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index f8015e0318d7..f7603be569fc 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -542,7 +542,7 @@ nouveau_bo_sync_for_device(struct nouveau_bo *nvbo) struct ttm_dma_tt *ttm_dma = (struct ttm_dma_tt *)nvbo->bo.ttm; int i; - if (!ttm_dma) + if (!ttm_dma || !ttm_dma->dma_address) return; /* Don't waste time looping if the object is coherent */ @@ -562,7 +562,7 @@ nouveau_bo_sync_for_cpu(struct nouveau_bo *nvbo) struct ttm_dma_tt *ttm_dma = (struct ttm_dma_tt *)nvbo->bo.ttm; int i; - if (!ttm_dma) + if (!ttm_dma || !ttm_dma->dma_address) return; /* Don't waste time looping if the object is coherent */ -- 2.30.2