Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp3710864pxv; Mon, 5 Jul 2021 04:00:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwS8e27Nh346J1B6cyGpK8W+gG5uNh1ks5p8+ru8T6VPU5HJXVXv3kWYj/W/MB/qdDEDxuC X-Received: by 2002:a92:d4c9:: with SMTP id o9mr10081571ilm.263.1625482841766; Mon, 05 Jul 2021 04:00:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625482841; cv=none; d=google.com; s=arc-20160816; b=Oe5nxutsv6AKdj3jaQkvKCPU6c95YKnuZrInz6HRNlYGqwgJ6EeR4jL+nhhSd67h4g pQCfn0z1JG8k13Ui2ijLqCO/pPU8LXdEQ+RMXI6wGCjGKgj3zP5L10R56TERfLtnVH1c pbNZqT+Jx4dqoO8DJUGLx/o5XqzRLWPb4jcveHkbavjgxEw01YevydmocMo2jvbgK03K YqESWFkDPUEXycW2ZoDzuDzDBfIelYvRU9jIDRaNDWNJW7mGL+QS7+GXB4QzmtSy0+T6 PT2aDiWr0IzdmxYEfZ2ztPWEwSJziKPeO3Ty7ownIr4hRalAkpthrlzljrqkKwEIRjCT nt+g== 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=R+j0H3ttgOiKhgubxCpFlehSHKTBOJkZ7prkUOK6U2E=; b=bAbvRbnHIqViYq8AO6lYN8Rw98uEsH9fYpjVxwR1AlfFd59KxvPikBTdMvgWmM5tyZ eiKS5oY/9HdPLu0RWpDebm1uHtasgTM4Id0TYSjICYqiVYjla/C2qFmS8TAQa9XSSOrq wv4cpn2H4Rwb9qFstmqlfnyU8fPbvn4mHSF2dtBLCpDjEKHt6txjsuho0dbK/HBpA68H qERMVFo+CK2bw9X236cpJazFEBmnRNq3ny/NOTZry7mWloksm/JEajRuiRCGS9Bkw5KP MPhDAjBOYI8LIJPR6uaB5rL91fwW91341C2uxKyaWE3DyP0op0dh62DlSwF3vHifhNfQ Psaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=RWSRzJwO; 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 z18si734105jat.72.2021.07.05.04.00.30; Mon, 05 Jul 2021 04:00:41 -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=RWSRzJwO; 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 S231354AbhGELCX (ORCPT + 99 others); Mon, 5 Jul 2021 07:02:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:47282 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231256AbhGELCQ (ORCPT ); Mon, 5 Jul 2021 07:02:16 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9C5606141C; Mon, 5 Jul 2021 10:59:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625482780; bh=uvJEh0sxCUzclhUTIdb3WixNobiqcA+N5C6zNMxBtcs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RWSRzJwO4CcL8p75JTIMMJXAaQtnNvdt/oZqekdVf1Th0NK3zmR1db22QB07a+5ms CufAS2iilDuLLvNAcjNKgQgNflU75jt8RF/ylDjCMAoHlxdM0wTZvO5hVNRkApQzhd jG6jB1JxzgXUjzy4vI4APeBPz24258v6IYRdpmVYLznXiy2cXBu6luW3441zBzt8Xx h4EvexO6yuCHEzkAqlN0CV6SqWocCp6VM59me3138KZwqbHhU8fSNKla5xoXSZxFzB D2jr7N5R6bt0ROKcgGKNjvNwR3/STimFQXnXlLZz8Hl6bj7lkQky4hq7qmQJjiNiHF ftfAaz6QuZ5QQ== 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.12 4/7] drm/nouveau: fix dma_address check for CPU/GPU sync Date: Mon, 5 Jul 2021 06:59:31 -0400 Message-Id: <20210705105934.1513188-5-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210705105934.1513188-1-sashal@kernel.org> References: <20210705105934.1513188-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.12.15-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.12.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.12.15-rc1 X-KernelTest-Deadline: 2021-07-07T10:59+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 f2720a006199..0a47a2a5553d 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -549,7 +549,7 @@ nouveau_bo_sync_for_device(struct nouveau_bo *nvbo) struct ttm_tt *ttm_dma = (struct ttm_tt *)nvbo->bo.ttm; int i, j; - if (!ttm_dma) + if (!ttm_dma || !ttm_dma->dma_address) return; if (!ttm_dma->pages) { NV_DEBUG(drm, "ttm_dma 0x%p: pages NULL\n", ttm_dma); @@ -585,7 +585,7 @@ nouveau_bo_sync_for_cpu(struct nouveau_bo *nvbo) struct ttm_tt *ttm_dma = (struct ttm_tt *)nvbo->bo.ttm; int i, j; - if (!ttm_dma) + if (!ttm_dma || !ttm_dma->dma_address) return; if (!ttm_dma->pages) { NV_DEBUG(drm, "ttm_dma 0x%p: pages NULL\n", ttm_dma); -- 2.30.2