From patchwork Fri Dec 14 07:41:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_K=C3=B6nig?= X-Patchwork-Id: 10730671 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8006C13B5 for ; Fri, 14 Dec 2018 07:41:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 729DE2D236 for ; Fri, 14 Dec 2018 07:41:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 66E692D251; Fri, 14 Dec 2018 07:41:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9DBC32D236 for ; Fri, 14 Dec 2018 07:41:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 850326F0C3; Fri, 14 Dec 2018 07:41:38 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by gabe.freedesktop.org (Postfix) with ESMTPS id D4FA56F181 for ; Fri, 14 Dec 2018 07:41:36 +0000 (UTC) Received: by mail-wr1-x443.google.com with SMTP id q18so4413123wrx.9 for ; Thu, 13 Dec 2018 23:41:36 -0800 (PST) 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=eoyeJp70acdD5vqQ7Im7cGwwcBSIg2eSMgnvabl6EVQ=; b=BM8VKk3h+dQ42PC4p4LRisQmK12LW16zKrZYuw0vX4/6UdTYEOfNIpb5wNbQGDHU/L lR2YxtYxETkDdZLOMe6ZQs3UfcSEkPSc8DZI5kdZdvSBj4MCnIpdEIjiN0Sgo+KcUo8M /o8pWaEXxrsO6qW63W32aMrSI9n94urC+20aheUk7KHyognrBYk/91x/ODAdzh/7JoZs rMihyFvgWAR7jTbVgtOV1yq8FV2qGoBmN5vhc5IhfHqPYqo3ciEuh0JcWT6gl4BHuDOW UHIN6ufsCaaTV/T/rpDX7a0C+pa2p88SoXFVX2zCvjRtpfvlaWIpOSP3kaIGu+0kVY7P ieeQ== X-Gm-Message-State: AA+aEWapFAiYFKlwfwNI+GY2XaC8LX8//MYqz8IaEq2J9trdWFLt9v4E wBJ76uzi9ApbandSdLKvAVs= X-Google-Smtp-Source: AFSGD/XYUltD6Kat/d8Y9d1+eMhDaPWCKFo3SfUeIFNoMjsUDuGgJwAaT25G6RVNAcOZ6i4y8EMFUA== X-Received: by 2002:adf:c612:: with SMTP id n18mr1567584wrg.174.1544773295485; Thu, 13 Dec 2018 23:41:35 -0800 (PST) Received: from abel.fritz.box ([2a02:908:125b:9a00:80ac:9536:38cb:3d0a]) by smtp.gmail.com with ESMTPSA id y13sm4181857wrn.73.2018.12.13.23.41.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Dec 2018 23:41:35 -0800 (PST) From: " =?utf-8?q?Christian_K=C3=B6nig?= " X-Google-Original-From: =?utf-8?q?Christian_K=C3=B6nig?= To: l.stach@pengutronix.de, dri-devel@lists.freedesktop.org, smasetty@codeaurora.org, alexander.deucher@amd.com Subject: [PATCH] drm/etnaviv: fix broken build Date: Fri, 14 Dec 2018 08:41:34 +0100 Message-Id: <20181214074134.2763-1-christian.koenig@amd.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 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" X-Virus-Scanned: ClamAV using ClamSMTP Fix a broken build because of a typo in "drm/scheduler: Add drm_sched_suspend/resume_timeout()". Signed-off-by: Christian König --- drivers/gpu/drm/etnaviv/etnaviv_dump.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/etnaviv/etnaviv_dump.c b/drivers/gpu/drm/etnaviv/etnaviv_dump.c index fd6bad2100cf..a07c828c6a9a 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_dump.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_dump.c @@ -135,13 +135,13 @@ void etnaviv_core_dump(struct etnaviv_gpu *gpu) mmu_size + gpu->buffer.size; /* Add in the active command buffers */ - spin_lock_irqsave(&sched->job_list_lock, flags); + spin_lock_irqsave(&gpu->sched->job_list_lock, flags); list_for_each_entry(s_job, &gpu->sched.ring_mirror_list, node) { submit = to_etnaviv_submit(s_job); file_size += submit->cmdbuf.size; n_obj++; } - spin_unlock_irqrestore(&sched->job_list_lock, flags); + spin_unlock_irqrestore(&gpu->sched->job_list_lock, flags); /* Add in the active buffer objects */ list_for_each_entry(vram, &gpu->mmu->mappings, mmu_node) { @@ -183,14 +183,14 @@ void etnaviv_core_dump(struct etnaviv_gpu *gpu) gpu->buffer.size, etnaviv_cmdbuf_get_va(&gpu->buffer)); - spin_lock_irqsave(&sched->job_list_lock, flags); + spin_lock_irqsave(&gpu->sched->job_list_lock, flags); list_for_each_entry(s_job, &gpu->sched.ring_mirror_list, node) { submit = to_etnaviv_submit(s_job); etnaviv_core_dump_mem(&iter, ETDUMP_BUF_CMD, submit->cmdbuf.vaddr, submit->cmdbuf.size, etnaviv_cmdbuf_get_va(&submit->cmdbuf)); } - spin_unlock_irqrestore(&sched->job_list_lock, flags); + spin_unlock_irqrestore(&gpu->sched->job_list_lock, flags); /* Reserve space for the bomap */ if (n_bomap_pages) {