From patchwork Mon Oct 26 21:00:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 318989 Delivered-To: patch@linaro.org Received: by 2002:a92:7b12:0:0:0:0:0 with SMTP id w18csp996476ilc; Mon, 26 Oct 2020 14:00:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzaufROLuAqRnnuusufa1QRQVNFNUAx17YwgTIzQpOWMie17DXr5Auw+xBvTMOJFCfV0sdB X-Received: by 2002:a62:ce08:0:b029:156:4427:4b29 with SMTP id y8-20020a62ce080000b029015644274b29mr18333959pfg.70.1603746050466; Mon, 26 Oct 2020 14:00:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603746050; cv=none; d=google.com; s=arc-20160816; b=pHcnR5MOca8RNzd1F3gBC3PkruTsUk4TgYCb2jF4ccvew4rznfFiw7sTJQbmnA6bBR vKQQxkE1mbNN8B0xAfakADWfJhJWIhJQ8K/2Keh6bjivw3gok8wGpkkJv5qpJEtgx6SX zdyAL2+HO1KGLMgur2BXVHcTu4EwtTEozMZYiTqJsudoexyfd8r4Hpq/o+K8mIylK+H4 ZvhnDEZafoN7HO4+rY7lr8qrhHju4ionww2eUH21tNbMc94WplSCCTcYJcIkQNuEB0vp dL1mpWS2LeiAmhuv4cMBrIupgum93Uj8PQ95ckdAcykg/WzjJdO4hXYl88W1gBzmJmG8 ETcQ== 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=wRWFxMK8pvo8HVTPx8DfY0MJkSHRTBkmREmej2yrlwA=; b=VuJGZcDLv0xLfE+NSxLGDAw0S1rrWjP6AyPJM3AnzKgVAkdncJUqy99oR4m5vNpHj/ dYb7KQ6mx6gJTWmeFwUTTIkGRMJWshyTZt4RYprHGPL/Hd5QkX+NALv0Aph50TPgkHD1 RivN1EQYxY5xQg3aQDvAvEYH3jSpZ766XxJFikWRb9qe+e0Wfzrv8qPpnqWQ1siNLass /jbvKLmiQg5bDBP6wPcmO4vuc0evJeJH6njhUf3QYS7Ha9QfPoIlbM6w51cMLHTKb8w1 fFrYS5Ri2gF5/hFbJR7Ll1IcZvZHNBRG+d+EtKtjmucPHjrJOJsnzTx/BnihnI4d1Ucm z7ag== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@kernel.org header.s=default header.b=VzUdhLcP; 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 s1si10208994pjl.34.2020.10.26.14.00.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2020 14:00:50 -0700 (PDT) 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=default header.b=VzUdhLcP; 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 016146EA6B; Mon, 26 Oct 2020 21:00:48 +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 92C896EA6A; Mon, 26 Oct 2020 21:00:46 +0000 (UTC) Received: from localhost.localdomain (unknown [192.30.34.233]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9B36520B1F; Mon, 26 Oct 2020 21:00:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603746046; bh=igjkUN6wESAd/DH60fWZ+VmAdJIU5sWPvyCPO5XJN48=; h=From:To:Cc:Subject:Date:From; b=VzUdhLcPpA/VYtY4oGcXxakGk/klmGlbWxN7jUe4lHINDG2OR0v498DkIilt3SKQx 9EgiYQT80bpyfptSqnLQC0nlOAwQ27biV7F2UzJBbeJzhw12tMcXZhs3tumDFTCB5/ EPQlB8+1RK2gG1f7tadgZIZl9RITJf45G3X7XF84= 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 Subject: [PATCH 1/5] drm/amdgpu: fix enum mismatches Date: Mon, 26 Oct 2020 22:00:29 +0100 Message-Id: <20201026210039.3884312-1-arnd@kernel.org> X-Mailer: git-send-email 2.27.0 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: dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, Arnd Bergmann , linux-kernel@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Arnd Bergmann gcc -Wextra warns about an incorrect prototype causing multiple mismatched enums: display/dc/gpio/gpio_service.c: In function 'dal_gpio_service_create': display/dc/gpio/gpio_service.c:70:50: warning: implicit conversion from 'enum dce_environment' to 'enum dce_version' [-Wenum-conversion] display/dc/gpio/gpio_service.c:71:4: warning: implicit conversion from 'enum dce_version' to 'enum dce_environment' [-Wenum-conversion] display/dc/gpio/gpio_service.c:76:46: warning: implicit conversion from 'enum dce_environment' to 'enum dce_version' [-Wenum-conversion] display/dc/gpio/gpio_service.c:77:4: warning: implicit conversion from 'enum dce_version' to 'enum dce_environment' [-Wenum-conversion] display/dc/core/dc.c: In function 'dc_construct': display/dc/core/dc.c:718:10: warning: implicit conversion from 'enum dce_version' to 'enum dce_environment' [-Wenum-conversion] display/dc/core/dc.c:719:10: warning: implicit conversion from 'enum dce_environment' to 'enum dce_version' [-Wenum-conversion] Fixes: 4562236b3bc0 ("drm/amd/dc: Add dc display driver (v2)") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c | 2 +- drivers/gpu/drm/amd/display/include/gpio_service_interface.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.27.0 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel diff --git a/drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c b/drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c index 92280cc05e2d..67bb5cc67255 100644 --- a/drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c +++ b/drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c @@ -54,7 +54,7 @@ struct gpio_service *dal_gpio_service_create( enum dce_version dce_version_major, - enum dce_version dce_version_minor, + enum dce_environment dce_version_minor, struct dc_context *ctx) { struct gpio_service *service; diff --git a/drivers/gpu/drm/amd/display/include/gpio_service_interface.h b/drivers/gpu/drm/amd/display/include/gpio_service_interface.h index 9c55d247227e..5f0f94e83d19 100644 --- a/drivers/gpu/drm/amd/display/include/gpio_service_interface.h +++ b/drivers/gpu/drm/amd/display/include/gpio_service_interface.h @@ -43,7 +43,7 @@ void dal_gpio_destroy( struct gpio_service *dal_gpio_service_create( enum dce_version dce_version_major, - enum dce_version dce_version_minor, + enum dce_environment dce_version_minor, struct dc_context *ctx); struct gpio *dal_gpio_service_create_irq( From patchwork Mon Oct 26 21:00:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 318990 Delivered-To: patch@linaro.org Received: by 2002:a92:7b12:0:0:0:0:0 with SMTP id w18csp996595ilc; Mon, 26 Oct 2020 14:01:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxBdkKeiI8T4dyEdkrD/LEDX77TqOyEEnjEttwa24DTSQMioG5HCeuJbYY1z9+EJKJ+8Z42 X-Received: by 2002:a17:902:8544:b029:d5:e680:1d23 with SMTP id d4-20020a1709028544b02900d5e6801d23mr14143254plo.46.1603746060202; Mon, 26 Oct 2020 14:01:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603746060; cv=none; d=google.com; s=arc-20160816; b=H2JGWapl3IwMCVFz/elGI1FgCyk2h5YkfVfsoKD+125AIo0RizkcIkTNfqS43BLNTk 9LcNXhu9IjSrmxATdhMOysO3xz+mCFThvyFNOj6hgjAaO7qEJMzdqJTSD2vU6bXBbpN9 ap/HSvenmQH4ejhmZgfx/T/bnUSI9/o796jNih6ZaYHLUbKeuhmYjrcVcVhyrjFYVLNw dMc0Xr/bG5RGdkgylu7pkiMBuo7gFIvCyyw231xxUNBFhFFd6jNZr90AFW3BSUztbIfr rRCTqmI+bioVLZZixbb0l0fvEfAfjXS/eN9YGsX8lydyDVoBB4U3jNcZexGgyLwelAmr IG+Q== 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:references:in-reply-to:message-id:date :subject:to:from:dkim-signature:delivered-to; bh=fX6zgbltyvubvahGQFlS9XXhXhdmABJyLL0ejRtdNIQ=; b=XL8hMo+IQz+iCa2jyUxWJecUoNRH1nYTHJdewSG3gMZmtBvfjGeZlU6byLNor7HVAf REsydJfRrNYDz9uIh3WZtIAJYa3mw70X/hl3zA7VA8bGU9WBQYKt9kjIXoZvYLT4YM8B VqPNjEDfG/XKyEH33k7pgSFBrVYXpynWMZMwVS5msyrApa+ys5NYDgSJbt63upogamk8 H6eyYnqE/1yh652OXt6xDvtgW3AVW2656b3NgfHkmITmT7PnX8KkMgUY0Gk32xpNQLul KnCdvHiFFh+sWsCzaoLYoZNIpzYqo6E2t0t8t4JMKW9nz/OH7WsFe4XZIyJALbX8HbH2 DsYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@kernel.org header.s=default header.b=m822+6P8; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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. [131.252.210.177]) by mx.google.com with ESMTPS id x136si6889196pgx.362.2020.10.26.14.00.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2020 14:01:00 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@kernel.org header.s=default header.b=m822+6P8; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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 3E2216E153; Mon, 26 Oct 2020 21:00:59 +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 8A8456E153; Mon, 26 Oct 2020 21:00:58 +0000 (UTC) Received: from localhost.localdomain (unknown [192.30.34.233]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8461220829; Mon, 26 Oct 2020 21:00:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603746058; bh=S+371Kp/IEcbCZF0KcUqWMaT3Ju144hq0HM9jkLGkDs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=m822+6P8iDuJDuwAS8D18uBp61uaCDfIDuLAp2fLjHgite5aZ+kwFSZXL/9WSJORV /KkDjt9Sv5LhsK/XWztvak4Sib5HC6/58r74NMoQ96R8+oF9+xfg2U8GtbhYS1R72v /EA4cEBQEuTfqiLLEzJm1NYeo4s8FYevkp8lepRY= 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 , David Galiffi , Jun Lei Subject: [PATCH 2/5] drm/amdgpu: fix incorrect enum type Date: Mon, 26 Oct 2020 22:00:30 +0100 Message-Id: <20201026210039.3884312-2-arnd@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201026210039.3884312-1-arnd@kernel.org> References: <20201026210039.3884312-1-arnd@kernel.org> 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: Martin Tsai , Arnd Bergmann , Rodrigo Siqueira , Wenjing Liu , linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, Hersen Wu , dri-devel@lists.freedesktop.org, abdoulaye berthe , David Galiffi , jinlong zhang Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Arnd Bergmann core_link_write_dpcd() returns enum dc_status, not ddc_result: display/dc/core/dc_link_dp.c: In function 'dp_set_panel_mode': display/dc/core/dc_link_dp.c:4237:11: warning: implicit conversion from 'enum dc_status' to 'enum ddc_result' [-Wenum-conversion] Avoid the warning by using the correct enum in the caller. Fixes: 0b226322434c ("drm/amd/display: Synchronous DisplayPort Link Training") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.27.0 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c index ff1e9963ec7a..98464886341f 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c @@ -4230,7 +4230,7 @@ void dp_set_panel_mode(struct dc_link *link, enum dp_panel_mode panel_mode) if (edp_config_set.bits.PANEL_MODE_EDP != panel_mode_edp) { - enum ddc_result result = DDC_RESULT_UNKNOWN; + enum dc_status result = DC_ERROR_UNEXPECTED; edp_config_set.bits.PANEL_MODE_EDP = panel_mode_edp; @@ -4240,7 +4240,7 @@ void dp_set_panel_mode(struct dc_link *link, enum dp_panel_mode panel_mode) &edp_config_set.raw, sizeof(edp_config_set.raw)); - ASSERT(result == DDC_RESULT_SUCESSFULL); + ASSERT(result == DC_OK); } } DC_LOG_DETECTION_DP_CAPS("Link: %d eDP panel mode supported: %d " From patchwork Mon Oct 26 21:00:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 318991 Delivered-To: patch@linaro.org Received: by 2002:a92:7b12:0:0:0:0:0 with SMTP id w18csp996786ilc; Mon, 26 Oct 2020 14:01:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxOwMUWOFmB2Knb7mo66oHlAq6Udz0xlRe4NavSmO3DPQWfOUFyHWQPuG/36Gi6z++Wz0DJ X-Received: by 2002:a17:902:bc49:b029:d6:44c7:565f with SMTP id t9-20020a170902bc49b02900d644c7565fmr1172196plz.11.1603746075632; Mon, 26 Oct 2020 14:01:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603746075; cv=none; d=google.com; s=arc-20160816; b=UDNdOzU0boV1QniQvAH8iBRv3Kvr+/mNxfKQSEp+BwejReTu1YYVFGILoPphge6HnU 3Fn3EnRerJrH+iSGiqQdkQVjC5ki/XEe5s2OUiCZBeZ82QrDu5z5+50duA1oJ84b21WN fT9BjBscLaLcjxMIpAnQ5Zult7Ofoj49GRjPdxsLh+wvj2CvU/AFPRum7zWIzepe1PbG h/Av53rKgGQn/9mNPeQFCh8cSiOmOQQ0mfEQUlo9i9ak4LTHmtso59F1RjJS75vgx3VB i+dU1862a1OWksJtOxZlAtoe8ihYpHsSLtp2NAA8uE1OOp49qBoFhdX87JI5QRUJMOF2 5Irg== 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:references:in-reply-to:message-id:date :subject:to:from:dkim-signature:delivered-to; bh=Ceic8HgRjlsJutHFB4YaV2f0tXKieR6F2oHkLAyWtq0=; b=RDwVzF+izwIuE5jasXx4sojvVTw+Wu6dQKjaE+WWgRSnflzTb1IK8BHvHEEIhqN5jc eJgNAc1B8LM7byPBrETHVPgSOe8AEDXO8otVBW23bQk+8WKTLpXuVfJDYvjJKDmLl/SN 5X28OEOKP953uSAi2tRbfTZlDBqN9X9mFW1VZddvv2FLO5ziI3FUF07XrM6OT81+GFsu Sm8e7oXoaZwXGrRwOBE7SZMIwhBxodZmPrgAjdKGsx6QFfK1oyZUwCXlW8YahBtdThCI Wft65Dl5/ndHj1LrEjuWCGgXLICVdHL6evmENn5bmcwCeRDpKpnbWpyPqVDaEoMGmjk4 ZohA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@kernel.org header.s=default header.b="vi5+D/JF"; 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 b9si9822990pgs.284.2020.10.26.14.01.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2020 14:01:15 -0700 (PDT) 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=default header.b="vi5+D/JF"; 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 7442E6EA6C; Mon, 26 Oct 2020 21:01:14 +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 8D4B46EA6C; Mon, 26 Oct 2020 21:01:13 +0000 (UTC) Received: from localhost.localdomain (unknown [192.30.34.233]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2953221D42; Mon, 26 Oct 2020 21:01:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603746073; bh=Lk7SZG1d78Y0M0/sdkdi9iWzsZwpEFXVLVMGyN2GSb8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vi5+D/JF7YUt770EnFWGv8pnra9SzX5huFSRhfGOo/HhzQF351X+gyf7Zf3iPSZmG 6/sUGbp2VaWYxm+djymmPQSD9tr777EecwSf6r/R4M2EBddnRipzPzR/FHr+HKxrFs XVppcHPpC5rsbBJYgaD9t3L17aYzPzb/MxIXY+hw= 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 , Jun Lei , Rodrigo Siqueira , Dmytro Laktyushkin Subject: [PATCH 3/5] drm/amdgpu: fix enum odm_combine_mode mismatch Date: Mon, 26 Oct 2020 22:00:31 +0100 Message-Id: <20201026210039.3884312-3-arnd@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201026210039.3884312-1-arnd@kernel.org> References: <20201026210039.3884312-1-arnd@kernel.org> 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: Charlene Liu , Sung Lee , David Galiffi , Arnd Bergmann , Naveed Ashfaq , dri-devel@lists.freedesktop.org, Wenjing Liu , linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, Aurabindo Pillai , Lewis Huang , Alvin Lee , Bhawanpreet Lakha Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Arnd Bergmann A conversion from 'bool' to 'enum odm_combine_mode' was incomplete, and gcc warns about this with many instances of display/dc/dml/dcn20/display_mode_vba_20.c:3899:44: warning: implicit conversion from 'enum ' to 'enum odm_combine_mode' [-Wenum-conversion] 3899 | locals->ODMCombineEnablePerState[i][k] = false; Change the ones that we get a warning for, using the same numerical values to leave the behavior unchanged. Fixes: 5fc11598166d ("drm/amd/display: expand dml structs") Signed-off-by: Arnd Bergmann --- I cannot tell if this is the correct conversion, please review carefully. --- .../amd/display/dc/dml/dcn20/display_mode_vba_20.c | 8 ++++---- .../amd/display/dc/dml/dcn20/display_mode_vba_20v2.c | 10 +++++----- .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 12 ++++++------ 3 files changed, 15 insertions(+), 15 deletions(-) -- 2.27.0 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20.c b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20.c index 45f028986a8d..0ec92aab617c 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20.c +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20.c @@ -3896,14 +3896,14 @@ void dml20_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l mode_lib->vba.PlaneRequiredDISPCLKWithODMCombine = mode_lib->vba.PixelClock[k] / 2 * (1 + mode_lib->vba.DISPCLKDPPCLKDSCCLKDownSpreading / 100.0); - locals->ODMCombineEnablePerState[i][k] = false; + locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_disabled; mode_lib->vba.PlaneRequiredDISPCLK = mode_lib->vba.PlaneRequiredDISPCLKWithoutODMCombine; if (mode_lib->vba.ODMCapability) { if (locals->PlaneRequiredDISPCLKWithoutODMCombine > mode_lib->vba.MaxDispclkRoundedDownToDFSGranularity) { - locals->ODMCombineEnablePerState[i][k] = true; + locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_2to1; mode_lib->vba.PlaneRequiredDISPCLK = mode_lib->vba.PlaneRequiredDISPCLKWithODMCombine; } else if (locals->HActive[k] > DCN20_MAX_420_IMAGE_WIDTH && locals->OutputFormat[k] == dm_420) { - locals->ODMCombineEnablePerState[i][k] = true; + locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_2to1; mode_lib->vba.PlaneRequiredDISPCLK = mode_lib->vba.PlaneRequiredDISPCLKWithODMCombine; } } @@ -3956,7 +3956,7 @@ void dml20_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l locals->RequiredDISPCLK[i][j] = 0.0; locals->DISPCLK_DPPCLK_Support[i][j] = true; for (k = 0; k <= mode_lib->vba.NumberOfActivePlanes - 1; k++) { - locals->ODMCombineEnablePerState[i][k] = false; + locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_disabled; if (locals->SwathWidthYSingleDPP[k] <= locals->MaximumSwathWidth[k]) { locals->NoOfDPP[i][j][k] = 1; locals->RequiredDPPCLK[i][j][k] = locals->MinDPPCLKUsingSingleDPP[k] diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20v2.c b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20v2.c index 860e72a51534..a26e3b8ea6ae 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20v2.c +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20v2.c @@ -3972,17 +3972,17 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode mode_lib->vba.PlaneRequiredDISPCLKWithODMCombine = mode_lib->vba.PixelClock[k] / 2 * (1 + mode_lib->vba.DISPCLKDPPCLKDSCCLKDownSpreading / 100.0); - locals->ODMCombineEnablePerState[i][k] = false; + locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_disabled; mode_lib->vba.PlaneRequiredDISPCLK = mode_lib->vba.PlaneRequiredDISPCLKWithoutODMCombine; if (mode_lib->vba.ODMCapability) { if (locals->PlaneRequiredDISPCLKWithoutODMCombine > MaxMaxDispclkRoundedDown) { - locals->ODMCombineEnablePerState[i][k] = true; + locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_2to1; mode_lib->vba.PlaneRequiredDISPCLK = mode_lib->vba.PlaneRequiredDISPCLKWithODMCombine; } else if (locals->DSCEnabled[k] && (locals->HActive[k] > DCN20_MAX_DSC_IMAGE_WIDTH)) { - locals->ODMCombineEnablePerState[i][k] = true; + locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_2to1; mode_lib->vba.PlaneRequiredDISPCLK = mode_lib->vba.PlaneRequiredDISPCLKWithODMCombine; } else if (locals->HActive[k] > DCN20_MAX_420_IMAGE_WIDTH && locals->OutputFormat[k] == dm_420) { - locals->ODMCombineEnablePerState[i][k] = true; + locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_2to1; mode_lib->vba.PlaneRequiredDISPCLK = mode_lib->vba.PlaneRequiredDISPCLKWithODMCombine; } } @@ -4035,7 +4035,7 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode locals->RequiredDISPCLK[i][j] = 0.0; locals->DISPCLK_DPPCLK_Support[i][j] = true; for (k = 0; k <= mode_lib->vba.NumberOfActivePlanes - 1; k++) { - locals->ODMCombineEnablePerState[i][k] = false; + locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_disabled; if (locals->SwathWidthYSingleDPP[k] <= locals->MaximumSwathWidth[k]) { locals->NoOfDPP[i][j][k] = 1; locals->RequiredDPPCLK[i][j][k] = locals->MinDPPCLKUsingSingleDPP[k] diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn21/display_mode_vba_21.c b/drivers/gpu/drm/amd/display/dc/dml/dcn21/display_mode_vba_21.c index 367c82b5ab4c..6fd7b9f1e2e6 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/dcn21/display_mode_vba_21.c +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn21/display_mode_vba_21.c @@ -3975,17 +3975,17 @@ void dml21_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l mode_lib->vba.PlaneRequiredDISPCLKWithODMCombine = mode_lib->vba.PixelClock[k] / 2 * (1 + mode_lib->vba.DISPCLKDPPCLKDSCCLKDownSpreading / 100.0); - locals->ODMCombineEnablePerState[i][k] = false; + locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_disabled; mode_lib->vba.PlaneRequiredDISPCLK = mode_lib->vba.PlaneRequiredDISPCLKWithoutODMCombine; if (mode_lib->vba.ODMCapability) { if (locals->PlaneRequiredDISPCLKWithoutODMCombine > MaxMaxDispclkRoundedDown) { - locals->ODMCombineEnablePerState[i][k] = true; + locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_2to1; mode_lib->vba.PlaneRequiredDISPCLK = mode_lib->vba.PlaneRequiredDISPCLKWithODMCombine; } else if (locals->DSCEnabled[k] && (locals->HActive[k] > DCN21_MAX_DSC_IMAGE_WIDTH)) { - locals->ODMCombineEnablePerState[i][k] = true; + locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_2to1; mode_lib->vba.PlaneRequiredDISPCLK = mode_lib->vba.PlaneRequiredDISPCLKWithODMCombine; } else if (locals->HActive[k] > DCN21_MAX_420_IMAGE_WIDTH && locals->OutputFormat[k] == dm_420) { - locals->ODMCombineEnablePerState[i][k] = true; + locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_2to1; mode_lib->vba.PlaneRequiredDISPCLK = mode_lib->vba.PlaneRequiredDISPCLKWithODMCombine; } } @@ -4038,7 +4038,7 @@ void dml21_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l locals->RequiredDISPCLK[i][j] = 0.0; locals->DISPCLK_DPPCLK_Support[i][j] = true; for (k = 0; k <= mode_lib->vba.NumberOfActivePlanes - 1; k++) { - locals->ODMCombineEnablePerState[i][k] = false; + locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_disabled; if (locals->SwathWidthYSingleDPP[k] <= locals->MaximumSwathWidth[k]) { locals->NoOfDPP[i][j][k] = 1; locals->RequiredDPPCLK[i][j][k] = locals->MinDPPCLKUsingSingleDPP[k] @@ -5213,7 +5213,7 @@ void dml21_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l mode_lib->vba.ODMCombineEnabled[k] = locals->ODMCombineEnablePerState[mode_lib->vba.VoltageLevel][k]; } else { - mode_lib->vba.ODMCombineEnabled[k] = false; + mode_lib->vba.ODMCombineEnabled[k] = dm_odm_combine_mode_disabled; } mode_lib->vba.DSCEnabled[k] = locals->RequiresDSC[mode_lib->vba.VoltageLevel][k]; From patchwork Mon Oct 26 21:00:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 318992 Delivered-To: patch@linaro.org Received: by 2002:a92:7b12:0:0:0:0:0 with SMTP id w18csp996968ilc; Mon, 26 Oct 2020 14:01:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwEwwGigsyujNgx0red9aZ/e7nCz5iiqY1wFCxjWamN39iDWHgpTsB3Y1c1ozBbaRrRDPmz X-Received: by 2002:a17:90a:d345:: with SMTP id i5mr21702249pjx.150.1603746090378; Mon, 26 Oct 2020 14:01:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603746090; cv=none; d=google.com; s=arc-20160816; b=pk3RLrJH6gpX6xsnUyXgfBrJB09UK7iMiQnMAUXTxT3R+YVrlrDOwULCiWwdketrUr zdiKawCKoQvagCBKNjqtx2nLWictUIu2Ohu8LC9HAyq8bj7rBqXOU58t5E3Iakjnx6Fl 3n8VJIt7tgwn8fp2Cj6aCnPIhZomCCGyJocNKXB+KAEGQNN8XMTMf9w0b50cuzYNAup3 IfKT8c2+HsXKAjULpitQw+lTZd1NLK97nBmDy5dxdoxQGPGduSpSLPUiH69VATxRYfwa j6q+9ZCFUixTClqH8ghjIJN18r9fFFG2NdA6jc1L0NApyldnNInUthS7vZisn3cnkkNp qaWw== 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:references:in-reply-to:message-id:date :subject:to:from:dkim-signature:delivered-to; bh=+Tav10YcnWaQ9hOuCTWOblXIyvhO9OzObG1ytV8U2WE=; b=fIlfDB+Z17PCH30/qsg4IGLs0oshj+oXv6nboMb7W/7WtFEB8CA49+0I5mjqhNIlsp 5dbsSRi6rd3Ps02SJ2X1fM5jol39m1yz4oYO1/C5MQnFLILmAsgzwxyOcZWtVFjccSSC YKYLPs5fe6d35sIIJCL4NbNMqj3m0scvPPPnkN64zM76zU5ZehklYPmbv63a2sj/bYWA sdnCtyRcQQ2MG19SWLdjqCYCQ0UzJ+IY3uGsnDEjvmelIBeJt+un9A44k/Gw7e4mu+Sc XHwxE8B1GMfpCBjKvBsnUfMUIEeEGZ9WlLb8hfejRMZ6A4b/cgMJqUKeACf0KHSQnL9L qmqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@kernel.org header.s=default header.b=LhJGZKnx; 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 a6si6363167pfg.267.2020.10.26.14.01.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2020 14:01:30 -0700 (PDT) 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=default header.b=LhJGZKnx; 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 0FF446EA6E; Mon, 26 Oct 2020 21:01:29 +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 D8B116EA6E; Mon, 26 Oct 2020 21:01:27 +0000 (UTC) Received: from localhost.localdomain (unknown [192.30.34.233]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5E32620829; Mon, 26 Oct 2020 21:01:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603746087; bh=MIKQiQBZmnJNoIdqgw0/BlRmOZ5SjarctyzS0l2h4+8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LhJGZKnxSeOcuD6ScbAADTnR9TLfI1UtJCyMiRiDdhHRuZuvsY3YrTaDxh6sGNlq/ GJNUazGYQ518GnLMyj7JxnE+sR70RBTEk+CHDZnfJAwrk6Kz51sc2k3Eqe9KndcdNq Br42FS+wMsgrnj3jVqhMnunD5FRtHzyJ9KYNpdAU= 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 , Anthony Koo , Krunoslav Kovac Subject: [PATCH 4/5] drm/amdgpu: fix build_coefficients() argument Date: Mon, 26 Oct 2020 22:00:32 +0100 Message-Id: <20201026210039.3884312-4-arnd@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201026210039.3884312-1-arnd@kernel.org> References: <20201026210039.3884312-1-arnd@kernel.org> 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: Lewis Huang , Arnd Bergmann , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Denis Efremov , Reza Amini , amd-gfx@lists.freedesktop.org, Josip Pavic , Nicholas Kazlauskas Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Arnd Bergmann gcc -Wextra warns about a function taking an enum argument being called with a bool: drivers/gpu/drm/amd/amdgpu/../display/modules/color/color_gamma.c: In function 'apply_degamma_for_user_regamma': drivers/gpu/drm/amd/amdgpu/../display/modules/color/color_gamma.c:1617:29: warning: implicit conversion from 'enum ' to 'enum dc_transfer_func_predefined' [-Wenum-conversion] 1617 | build_coefficients(&coeff, true); It appears that a patch was added using the old calling conventions after the type was changed, and the value should actually be 0 (TRANSFER_FUNCTION_SRGB) here instead of 1 (true). Fixes: 55a01d4023ce ("drm/amd/display: Add user_regamma to color module") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/amd/display/modules/color/color_gamma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.27.0 _______________________________________________ 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/modules/color/color_gamma.c b/drivers/gpu/drm/amd/display/modules/color/color_gamma.c index b8695660b480..09bc2c249e1a 100644 --- a/drivers/gpu/drm/amd/display/modules/color/color_gamma.c +++ b/drivers/gpu/drm/amd/display/modules/color/color_gamma.c @@ -1614,7 +1614,7 @@ static void apply_degamma_for_user_regamma(struct pwl_float_data_ex *rgb_regamma struct pwl_float_data_ex *rgb = rgb_regamma; const struct hw_x_point *coord_x = coordinates_x; - build_coefficients(&coeff, true); + build_coefficients(&coeff, TRANSFER_FUNCTION_SRGB); i = 0; while (i != hw_points_num + 1) { From patchwork Mon Oct 26 21:00:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 318993 Delivered-To: patch@linaro.org Received: by 2002:a92:7b12:0:0:0:0:0 with SMTP id w18csp997080ilc; Mon, 26 Oct 2020 14:01:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw/c+mAlleTUwmV39o4uDchP2dvq7w6yuyRAWcb6MQsP+RIVePJ2deVneEpGvG293zCMd9f X-Received: by 2002:a63:5466:: with SMTP id e38mr18500645pgm.23.1603746098961; Mon, 26 Oct 2020 14:01:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603746098; cv=none; d=google.com; s=arc-20160816; b=QXR6rXjCFmzVq6WQU3pnoFF0FihzA5wy1jJKdBFLpRA33dbfhp0VsPleeH05Gn7mkt SnmgCKuusJV/Y0tMZ8BDN2U1g3IUudc6Ie6J7rIwn8m4YxvowhEvDqw4W0ZEzY3PUISi Cvcnwa+6IQ7D4rXgKJER2yZXw5idYXdqSiGVCrOOLN6rtik4ZUBUczrIzYsi3ZFBTtp5 8sfm3EABn/Y9SMCFMfrEFxnjaOJOKL+/YTfgTO7xHw7IkcVgDn1orK0xLKx1XVtyaPF8 jILxcJPu76qbAW6rYH1uQZq6LJ9WCIqfXUv5KIrHEyyfsfDymsSTrrvujYM+JwHi3vlD ZlIQ== 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:references:in-reply-to:message-id:date :subject:to:from:dkim-signature:delivered-to; bh=jyO0acHo3oLHbXXZfF31t9XTQ8s3yVygsumIRQeR388=; b=u9X8aRPM21OYBeGWSTqn2fExd/G9JVyQ8cRc+uZQPzOvVnyR1TzmRnZBHtK/koZR1d Q0J0m1MqEgy/p/FnQaQRHZV1wuFiEf1e+u50cc9rVoZwEspg6gWrTQIDEbTm87o5TXnN 3UpuD3BwOxWRzZvommTazHb37VnQNsXuN+an+HBiHs+QGcWq9RmapqnOnpR7MLJSpu9i 6aeUfmw3eLugOx3qsseEtj1M0k2atuXu0I8C5shBrTZ7GzfxrcqUJDGemoVVKWhiihFD TpHP9HpiBRV5bNvdqGOEc0QuCIF5I1TBMeX691e18wvEAEQtfa7KHupjEnrOUIV2uoV1 iSPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@kernel.org header.s=default header.b=rtBeg7mo; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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. [131.252.210.177]) by mx.google.com with ESMTPS id k61si10023056pjh.27.2020.10.26.14.01.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2020 14:01:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@kernel.org header.s=default header.b=rtBeg7mo; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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 1332A6EA6A; Mon, 26 Oct 2020 21:01:38 +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 710726EA70; Mon, 26 Oct 2020 21:01:37 +0000 (UTC) Received: from localhost.localdomain (unknown [192.30.34.233]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D79C920829; Mon, 26 Oct 2020 21:01:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603746097; bh=Sl0AeOUeKfSSE44S4mD27orpF56Z7J4Bt+Y+zUMMhI4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rtBeg7moyP4a3B0SOX45SiZm/0H9T7+m88WonKBeQpCZrNXuvsDDBReECtc89l7mB HTATx/M+wvYCcJqGBOrPtSYLFQRYvxrzpO/F2uouCVJxPK+YugcbhDvk5M/yQMcO6g rbWaVRMU2coTP9psQFMCCYLW8u3avu/7Roo7jnGA= From: Arnd Bergmann To: Alex Deucher , =?utf-8?q?Christian_K=C3=B6n?= =?utf-8?q?ig?= , David Airlie , Daniel Vetter Subject: [PATCH 5/5] drm/amdgpu: disable -Woverride-init warning Date: Mon, 26 Oct 2020 22:00:33 +0100 Message-Id: <20201026210039.3884312-5-arnd@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201026210039.3884312-1-arnd@kernel.org> References: <20201026210039.3884312-1-arnd@kernel.org> 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: Yong Zhao , Arnd Bergmann , linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, Huang Rui , dri-devel@lists.freedesktop.org, Likun Gao , Evan Quan , Leo Liu , Hawking Zhang Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Arnd Bergmann Building with 'make W=1' produces countless warnings like amdgpu/../include/vega10_ip_offset.h:276:51: warning: initialized field overwritten [-Woverride-init] Shut these up by disabling the particular warning in the amdgpu driver. Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/amd/amdgpu/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.27.0 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel diff --git a/drivers/gpu/drm/amd/amdgpu/Makefile b/drivers/gpu/drm/amd/amdgpu/Makefile index 247dd46e1681..5a46949bc17c 100644 --- a/drivers/gpu/drm/amd/amdgpu/Makefile +++ b/drivers/gpu/drm/amd/amdgpu/Makefile @@ -36,7 +36,8 @@ ccflags-y := -I$(FULL_AMD_PATH)/include/asic_reg \ -I$(FULL_AMD_DISPLAY_PATH)/include \ -I$(FULL_AMD_DISPLAY_PATH)/dc \ -I$(FULL_AMD_DISPLAY_PATH)/amdgpu_dm \ - -I$(FULL_AMD_PATH)/amdkfd + -I$(FULL_AMD_PATH)/amdkfd \ + -Wno-override-init amdgpu-y := amdgpu_drv.o