From patchwork Thu Sep 27 06:27:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nayan Deshmukh X-Patchwork-Id: 10617279 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 2A7A215E8 for ; Thu, 27 Sep 2018 06:28:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 10671296D4 for ; Thu, 27 Sep 2018 06:28:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 043B7296EF; Thu, 27 Sep 2018 06:28:28 +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 B095F296D4 for ; Thu, 27 Sep 2018 06:28:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8E7CD6E287; Thu, 27 Sep 2018 06:28:24 +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 8EB106E287 for ; Thu, 27 Sep 2018 06:28:22 +0000 (UTC) Received: by mail-wr1-x443.google.com with SMTP id j8-v6so1230201wrw.5 for ; Wed, 26 Sep 2018 23:28:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=aLFToV3RFApeeZJogFgW8ywoSXfGIFXWh5Lkys0RCDA=; b=jB4/6mn9PBIitjUx+YNGf2wd1mh2Ry28sGtCB/avVUqnBjFzEJT6Iq0Km7/MLr14Rx mkZjeM+yQqbmFEvKxe0i+7U0bSqDSsew1D+ZKtjh70d80t+oYtHdKtgccXhOfd0Ddq/N NRnuA89xI/uqdIiySomMEG+lRobHgPkN1WYokohMsDZ2bpmydWBNsw9naV0/Fywi94Mx JWZCQEuS4iSxWMnhGOvEJo02I95/WXCVSBVCbLhA3H9uD6Pd7SCLTX+2cq3ZjSpzMx9W OeJBKRuiGIJgN40I8Dv0T3cOpWZamDXiPWNZ1fwcO71P1tHm9YfNMw0UvqYoZ4zplzn6 RnOw== X-Gm-Message-State: ABuFfogeheeECQq320t2tqbMFsLGf61g2pU7rs1e757v667jqAe/oe/N he5ZdljR5ZtiQl2wrgWvReTHv0f1 X-Google-Smtp-Source: ACcGV61BVCYScvZo2EHo1vPaZ8+uQkXTzS6LUPt931+Sz7YjLbAjMbvmhBrzOp91B0UcVI3bBhUz3w== X-Received: by 2002:adf:92e6:: with SMTP id 93-v6mr7703094wrn.124.1538029700707; Wed, 26 Sep 2018 23:28:20 -0700 (PDT) Received: from localhost.localdomain (98.red-212-170-56.staticip.rima-tde.net. [212.170.56.98]) by smtp.gmail.com with ESMTPSA id x5-v6sm1091847wmi.37.2018.09.26.23.28.19 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 26 Sep 2018 23:28:19 -0700 (PDT) From: Nayan Deshmukh To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/etnaviv: fix build error due to change in scheduler struct Date: Thu, 27 Sep 2018 08:27:39 +0200 Message-Id: <20180927062739.21156-1-nayan26deshmukh@gmail.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <201809270202.APeQLsJY%fengguang.wu@intel.com> References: <201809270202.APeQLsJY%fengguang.wu@intel.com> 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: , Cc: alexander.deucher@amd.com, Nayan Deshmukh , christian.koenig@amd.com MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP The work_tdr field was moved from drm_sched_job to drm_gpu_scheduler as part of a previous patch. Fixes: 4f07d88d8534 drm/scheduler: remove timeout work_struct from drm_sched_job Signed-off-by: Nayan Deshmukh Acked-by: Christian König Acked-by: Lucas Stach Acked-by: Lucas Stach <l.stach@pengutronix.de>
--- drivers/gpu/drm/etnaviv/etnaviv_sched.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/etnaviv/etnaviv_sched.c b/drivers/gpu/drm/etnaviv/etnaviv_sched.c index 69e9b431bf1f..e7c3ed6c9a2e 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_sched.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_sched.c @@ -105,7 +105,7 @@ static void etnaviv_sched_timedout_job(struct drm_sched_job *sched_job) change = dma_addr - gpu->hangcheck_dma_addr; if (change < 0 || change > 16) { gpu->hangcheck_dma_addr = dma_addr; - schedule_delayed_work(&sched_job->work_tdr, + schedule_delayed_work(&sched_job->sched->work_tdr, sched_job->sched->timeout); return; }