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=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, 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 8EEF8C4743C for ; Mon, 14 Jun 2021 11:05:25 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5D1FB611C1 for ; Mon, 14 Jun 2021 11:05:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5D1FB611C1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=nouveau-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CB82F89C05; Mon, 14 Jun 2021 11:05:21 +0000 (UTC) Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by gabe.freedesktop.org (Postfix) with ESMTPS id 37BEA89B30; Mon, 14 Jun 2021 11:05:20 +0000 (UTC) Received: by mail-ed1-x529.google.com with SMTP id r7so31506736edv.12; Mon, 14 Jun 2021 04:05:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=poJHyYi+U6hi4XqNqX9Ddd4HYWOh74niH3vqVM4huzI=; b=leVGIxAzOPZLakkvuPONeueYQpPw6n80dnPy9wBm6R/syQZmuhzJM+N3kvTLJlXorI CaxhbkhOhRU09Akhlo1XpKUUcq9NEBg4/vYubH9z3p9cfwMF+3Y3pSrBU00jSubh8Kdl Ag0IDyx0KeYJw8V7Qc3m1A3WnO76W1W7eEIJwG4hS5HW0tyRqbXHjNChzkAMQAXuW2bC YM8CtlzJQFgvuYaK1RkjaI+Snd9IOsRR16KFzihGH9QO8yIq4XMNDjkfWDUsOYsnZiew hSTdiK0aVZdv4GoQF1tU/JgnEaNpsN+dTF/U/3XNc4rnytcGeImIrVJPzlBHwKJHXYdq ounA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=poJHyYi+U6hi4XqNqX9Ddd4HYWOh74niH3vqVM4huzI=; b=nq5kGlyGgPuHr7oKrDz5SuA/OXr78A6xc/4JWW6Cx2KNbg573jrBHYMQquaf5fel0m d0uiLEe1EAVG4mqwD5lpz87tNr7d96P2VQHyuGEjpNucgtsfcl4YXCFjP+tEa+JwyLPF Qli+SGIUVVAQf3kMjZwd7AmQr6kOHlaVahHEOlpdN8BQZdfaeS+/gxf6bkyYCSFuegSR Di1d9ZWc7aCtN10jBKCsNOIoIyap/tAcEcfUhBUG3ZF8D47oVH4//V2EGd03P4h0z5Fr PatMISqaDcx1LulTqFoLS9k7gBTbEdQ07vgHQn4CX8Sm7K6PiYihD9djm6D+fRz6ZlFS Xhaw== X-Gm-Message-State: AOAM532QVGl1kZB2mMGscKEYVx6RBFm2MwObu7oVa46IUCQlgR782xVn T1mH4fTMm5wk9TxAIszMwX6Qhurf40Y= X-Google-Smtp-Source: ABdhPJxfeDXHZr6wp9ldQF4GsMa6NNw6mikAo2ke3BKc19aLK9cwAxjYNAkiUqA/8ZN7KYepyHiVMQ== X-Received: by 2002:a05:6402:11d3:: with SMTP id j19mr16444655edw.247.1623668718852; Mon, 14 Jun 2021 04:05:18 -0700 (PDT) Received: from abel.fritz.box ([2a02:908:1252:fb60:f8f:f28f:880f:43d2]) by smtp.gmail.com with ESMTPSA id b22sm8442242eds.71.2021.06.14.04.05.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 04:05:18 -0700 (PDT) From: "=?UTF-8?q?Christian=20K=C3=B6nig?=" X-Google-Original-From: =?UTF-8?q?Christian=20K=C3=B6nig?= To: linux@zary.sk, bskeggs@redhat.com, dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org Date: Mon, 14 Jun 2021 13:05:17 +0200 Message-Id: <20210614110517.1624-1-christian.koenig@amd.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [Nouveau] [PATCH] drm/nouveau: fix dma_address check for CPU/GPU sync X-BeenThere: nouveau@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Nouveau development list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: nouveau-bounces@lists.freedesktop.org Sender: "Nouveau" QUdQIGZvciBleGFtcGxlIGRvZXNuJ3QgaGF2ZSBhIGRtYV9hZGRyZXNzIGFycmF5LgoKU2lnbmVk LW9mZi1ieTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgotLS0K IGRyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L25vdXZlYXVfYm8uYyB8IDQgKystLQogMSBmaWxlIGNo YW5nZWQsIDIgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vbm91dmVhdS9ub3V2ZWF1X2JvLmMgYi9kcml2ZXJzL2dwdS9kcm0vbm91dmVh dS9ub3V2ZWF1X2JvLmMKaW5kZXggM2UwOWRmMDQ3MmNlLi4xNzBhYmE5OWExMTAgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L25vdXZlYXVfYm8uYworKysgYi9kcml2ZXJzL2dw dS9kcm0vbm91dmVhdS9ub3V2ZWF1X2JvLmMKQEAgLTU0Niw3ICs1NDYsNyBAQCBub3V2ZWF1X2Jv X3N5bmNfZm9yX2RldmljZShzdHJ1Y3Qgbm91dmVhdV9ibyAqbnZibykKIAlzdHJ1Y3QgdHRtX3R0 ICp0dG1fZG1hID0gKHN0cnVjdCB0dG1fdHQgKiludmJvLT5iby50dG07CiAJaW50IGksIGo7CiAK LQlpZiAoIXR0bV9kbWEpCisJaWYgKCF0dG1fZG1hIHx8ICF0dG1fZG1hLT5kbWFfYWRkcmVzcykK IAkJcmV0dXJuOwogCWlmICghdHRtX2RtYS0+cGFnZXMpIHsKIAkJTlZfREVCVUcoZHJtLCAidHRt X2RtYSAweCVwOiBwYWdlcyBOVUxMXG4iLCB0dG1fZG1hKTsKQEAgLTU4Miw3ICs1ODIsNyBAQCBu b3V2ZWF1X2JvX3N5bmNfZm9yX2NwdShzdHJ1Y3Qgbm91dmVhdV9ibyAqbnZibykKIAlzdHJ1Y3Qg dHRtX3R0ICp0dG1fZG1hID0gKHN0cnVjdCB0dG1fdHQgKiludmJvLT5iby50dG07CiAJaW50IGks IGo7CiAKLQlpZiAoIXR0bV9kbWEpCisJaWYgKCF0dG1fZG1hIHx8ICF0dG1fZG1hLT5kbWFfYWRk cmVzcykKIAkJcmV0dXJuOwogCWlmICghdHRtX2RtYS0+cGFnZXMpIHsKIAkJTlZfREVCVUcoZHJt LCAidHRtX2RtYSAweCVwOiBwYWdlcyBOVUxMXG4iLCB0dG1fZG1hKTsKLS0gCjIuMjUuMQoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KTm91dmVhdSBtYWls aW5nIGxpc3QKTm91dmVhdUBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9ub3V2ZWF1Cg== 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=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 387B2C2B9F4 for ; Mon, 14 Jun 2021 11:05:22 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 05D9E611C1 for ; Mon, 14 Jun 2021 11:05:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 05D9E611C1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6210089B30; Mon, 14 Jun 2021 11:05:21 +0000 (UTC) Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by gabe.freedesktop.org (Postfix) with ESMTPS id 37BEA89B30; Mon, 14 Jun 2021 11:05:20 +0000 (UTC) Received: by mail-ed1-x529.google.com with SMTP id r7so31506736edv.12; Mon, 14 Jun 2021 04:05:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=poJHyYi+U6hi4XqNqX9Ddd4HYWOh74niH3vqVM4huzI=; b=leVGIxAzOPZLakkvuPONeueYQpPw6n80dnPy9wBm6R/syQZmuhzJM+N3kvTLJlXorI CaxhbkhOhRU09Akhlo1XpKUUcq9NEBg4/vYubH9z3p9cfwMF+3Y3pSrBU00jSubh8Kdl Ag0IDyx0KeYJw8V7Qc3m1A3WnO76W1W7eEIJwG4hS5HW0tyRqbXHjNChzkAMQAXuW2bC YM8CtlzJQFgvuYaK1RkjaI+Snd9IOsRR16KFzihGH9QO8yIq4XMNDjkfWDUsOYsnZiew hSTdiK0aVZdv4GoQF1tU/JgnEaNpsN+dTF/U/3XNc4rnytcGeImIrVJPzlBHwKJHXYdq ounA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=poJHyYi+U6hi4XqNqX9Ddd4HYWOh74niH3vqVM4huzI=; b=nq5kGlyGgPuHr7oKrDz5SuA/OXr78A6xc/4JWW6Cx2KNbg573jrBHYMQquaf5fel0m d0uiLEe1EAVG4mqwD5lpz87tNr7d96P2VQHyuGEjpNucgtsfcl4YXCFjP+tEa+JwyLPF Qli+SGIUVVAQf3kMjZwd7AmQr6kOHlaVahHEOlpdN8BQZdfaeS+/gxf6bkyYCSFuegSR Di1d9ZWc7aCtN10jBKCsNOIoIyap/tAcEcfUhBUG3ZF8D47oVH4//V2EGd03P4h0z5Fr PatMISqaDcx1LulTqFoLS9k7gBTbEdQ07vgHQn4CX8Sm7K6PiYihD9djm6D+fRz6ZlFS Xhaw== X-Gm-Message-State: AOAM532QVGl1kZB2mMGscKEYVx6RBFm2MwObu7oVa46IUCQlgR782xVn T1mH4fTMm5wk9TxAIszMwX6Qhurf40Y= X-Google-Smtp-Source: ABdhPJxfeDXHZr6wp9ldQF4GsMa6NNw6mikAo2ke3BKc19aLK9cwAxjYNAkiUqA/8ZN7KYepyHiVMQ== X-Received: by 2002:a05:6402:11d3:: with SMTP id j19mr16444655edw.247.1623668718852; Mon, 14 Jun 2021 04:05:18 -0700 (PDT) Received: from abel.fritz.box ([2a02:908:1252:fb60:f8f:f28f:880f:43d2]) by smtp.gmail.com with ESMTPSA id b22sm8442242eds.71.2021.06.14.04.05.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 04:05:18 -0700 (PDT) From: "=?UTF-8?q?Christian=20K=C3=B6nig?=" X-Google-Original-From: =?UTF-8?q?Christian=20K=C3=B6nig?= To: linux@zary.sk, bskeggs@redhat.com, dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org Subject: [PATCH] drm/nouveau: fix dma_address check for CPU/GPU sync Date: Mon, 14 Jun 2021 13:05:17 +0200 Message-Id: <20210614110517.1624-1-christian.koenig@amd.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" AGP for example doesn't have a dma_address array. Signed-off-by: Christian König --- 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 3e09df0472ce..170aba99a110 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -546,7 +546,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); @@ -582,7 +582,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.25.1