From patchwork Mon Jan 25 12:48:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 370220 Delivered-To: patch@linaro.org Received: by 2002:a02:a60d:0:0:0:0:0 with SMTP id c13csp3955066jam; Mon, 25 Jan 2021 04:49:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJxbm6KMojqiqsiIGEKgDn8h9rp7EhKsJJt42IOnIQ2C7buK7e3RdSbk2oNKslmg32hh7TK3 X-Received: by 2002:a62:ee18:0:b029:1b3:b9d2:6d7b with SMTP id e24-20020a62ee180000b02901b3b9d26d7bmr327294pfi.32.1611578941601; Mon, 25 Jan 2021 04:49:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611578941; cv=none; d=google.com; s=arc-20160816; b=z0dhqeRM/qSYBGgKmxZdpf7tz1iMoI/8mJ/D9tY+LGDwi/S7ayTgODmzTydj89CubW w73rUzdly9tjNtmhslM1IyOY6LkgzKLcyJzE2Uu7e7qdKGcJBdXsNRTXwuMHGkxcWidl kkvrbhcqp31Xqu9CJH1Jf79Xpc7u/wUEBy4G2eDyfXMnXyE8AoGtqatpi/pjGVnpTq33 KgErU/qtQkF6mHFKd3ImT4TgDDb6oUi7zWjS/L0Jz8aatnA4/65CUeolyRz3nJJM7NbO OruDKmi2+YH7IUxVv+AHx7M8SwgWtEE4TOO7H1Y//QQsvC0RFnEvk4jRk5wCd+KED3HM gVHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:message-id:date:subject:to:from :dkim-signature:delivered-to; bh=T/ApZyae5rFNWmwIfcW3fwUylqwB5awFJFAKc50o/W8=; b=06mPdaNfIiIkT0BwSJiq7fT+R+E0Xzz0A2rtSnxN33pbFP3RjLPQp20TekMO+tifMY vtGYjmMlN5iRV7c66jacSoZnTtBX0teoNjnQNJHr0TNYOwIYWtT7T1MfUhtL/23szF03 IJwXnmwZBDQqIOmeBzJu3VMqFhIML1pPI9iOpb+E9TCpmUqddgAMKjFMcSamD6aJZEmT fgPQTIj2YjB4fr4lCQrrJbycqfHF8xi4X21cGPu4dnbQ0xaUAXngyqWhQxOCrjobqGlG fnq0LoxvS+HczYqB8hwmido4b7Sr/WiX364YTYQ89CdrTYIlhCF5B4e+Y2Jm89ThjZui p8lQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@kernel.org header.s=k20201202 header.b=tOVJ4eqU; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [2610:10:20:722:a800:ff:fe36:1795]) by mx.google.com with ESMTPS id m15si19166986pgl.470.2021.01.25.04.49.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Jan 2021 04:49:01 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) client-ip=2610:10:20:722:a800:ff:fe36:1795; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@kernel.org header.s=k20201202 header.b=tOVJ4eqU; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 59CD26E159; Mon, 25 Jan 2021 12:48:57 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id CFFC16E104; Mon, 25 Jan 2021 12:48:55 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 5CA5022242; Mon, 25 Jan 2021 12:48:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1611578935; bh=se/FbQzcYysZD1EUhPOo2TaDIwNovBNtkDv0eXU7IjM=; h=From:To:Cc:Subject:Date:From; b=tOVJ4eqUv2zP/nYVpAo9hE/5oML2JQ3sukeCtcxh2TFGxUbLiVgsQdjAStlse5uIv y20U37xqi0PqnPh2CdB85vTeLa20ONJ7Whj2l6ieJ2uBMe5+oxfAIKAzaXuKuMUBf7 eG+JSnIIcfRMb6yGebqoOK6xPXZmVMEUlPAzxzzO1l1htyPbRp0y2ew9cCUq98002O 8gRoNVY00FEOFcryKke37/qp9ZTVnA76pUmeDBucC2iWB/7tgIIYdyjFjXdWe5elhD cAxnue7V35+6PoW5nYtatrPwXYGcowhky+3NWK9V6n9+dldGZCre4xKaaBHsn780EE EDVr/k2qcqpHA== From: Arnd Bergmann To: Harry Wentland , Leo Li , Alex Deucher , =?utf-8?q?Christian_K=C3=B6?= =?utf-8?q?nig?= , David Airlie , Daniel Vetter , Bhawanpreet Lakha , Nicholas Kazlauskas Subject: [PATCH] drm/amd/display: fix unused variable warning Date: Mon, 25 Jan 2021 13:48:43 +0100 Message-Id: <20210125124849.102037-1-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 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: , Cc: Stylon Wang , Arnd Bergmann , Rodrigo Siqueira , linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, Aurabindo Pillai , dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Arnd Bergmann After all users of the 'dm' warnings got hidden in an #ifdef, the compiler started warning about it being unused: drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:5380:33: error: unused variable 'dm' [-Werror,-Wunused-variable] Add another such #ifdef. Fixes: 98ab5f3513f9 ("drm/amd/display: Fix deadlock during gpu reset v3") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.29.2 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel Reviewed-by: Harry Wentland diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index a90dc4d31c32..37bf2dd87e1e 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -5377,7 +5377,9 @@ static inline int dm_set_vblank(struct drm_crtc *crtc, bool enable) struct amdgpu_crtc *acrtc = to_amdgpu_crtc(crtc); struct amdgpu_device *adev = drm_to_adev(crtc->dev); struct dm_crtc_state *acrtc_state = to_dm_crtc_state(crtc->state); +#if defined(CONFIG_DRM_AMD_DC_DCN) struct amdgpu_display_manager *dm = &adev->dm; +#endif int rc = 0; if (enable) {