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=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,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 15BE2C43381 for ; Wed, 27 Mar 2019 18:04:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DA93A2063F for ; Wed, 27 Mar 2019 18:04:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553709856; bh=PS9cLOtuEHtVrC6GCM+3U4hVfZYr9gBjv0rFFMGxhio=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=iNsDwybvU5vyAsT3sIt46hWrtPh2kqA8K/vym5pNY4aFI116uGQx2K1Ih6maROwhl y53lbEuWqObnkksp9vZD1XvPiETm6ugVTyldr8Sy69E9tfoJVjT77UIUzjxHlxGIsY d7f+84izi3JQ7MxrNr5NdPFvF/1LuQzm4U/N7dMw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730921AbfC0SEO (ORCPT ); Wed, 27 Mar 2019 14:04:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:44664 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733148AbfC0SEG (ORCPT ); Wed, 27 Mar 2019 14:04:06 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (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 E160E2063F; Wed, 27 Mar 2019 18:04:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553709845; bh=PS9cLOtuEHtVrC6GCM+3U4hVfZYr9gBjv0rFFMGxhio=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YsaHK2ICNwF2Gc9G4ZSxU/M7eFvge+QjAPjSuPN2z3SCsVUOslSf832wBL+djO0zK iyJD2C1QX1ZCXxmHP6mGlEhOpFxheODPEL3hgfWKebYRp7GXF+Bf3APXtZyMlSjvpo pHYiP0LXHSV/X5FVd8tsDPiekman9vqjt3He8E3Y= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Nathan Chancellor , Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.0 070/262] drm/amd/display: Pass app_tf by value rather than by reference Date: Wed, 27 Mar 2019 13:58:45 -0400 Message-Id: <20190327180158.10245-70-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190327180158.10245-1-sashal@kernel.org> References: <20190327180158.10245-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Nathan Chancellor [ Upstream commit 672e78cab819ebe31e3b9b8abac367be8a110472 ] Clang warns when an expression that equals zero is used as a null pointer constant (in lieu of NULL): drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:4435:3: warning: expression which evaluates to zero treated as a null pointer constant of type 'const enum color_transfer_func *' [-Wnon-literal-null-conversion] TRANSFER_FUNC_UNKNOWN, ^~~~~~~~~~~~~~~~~~~~~ 1 warning generated. This warning is caused by commit bb47de736661 ("drm/amdgpu: Set FreeSync state using drm VRR properties") and it could be solved by using NULL instead of TRANSFER_FUNC_UNKNOWN or casting TRANSFER_FUNC_UNKNOWN as a pointer. However, after looking into it, there doesn't appear to be a good reason to pass app_tf by reference as it is never mutated along the way. This is the only code path in which app_tf is used: mod_freesync_build_vrr_infopacket -> build_vrr_infopacket_v2 -> build_vrr_infopacket_fs2_data Neither mod_freesync_build_vrr_infopacket or build_vrr_infopacket_v2 modify app_tf's value and build_vrr_infopacket_fs2_data expects just the value so we can avoid dereferencing anything by just passing in app_tf's value to mod_freesync_build_vrr_infopacket and build_vrr_infopacket_v2. There is no functional change because build_vrr_infopacket_fs2_data doesn't do anything if TRANSFER_FUNC_UNKNOWN is passed to it, the same as not calling build_vrr_infopacket_fs2_data at all like before this change when NULL was used for app_tf. Reviewed-by: Harry Wentland Signed-off-by: Nathan Chancellor Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/modules/freesync/freesync.c | 7 +++---- drivers/gpu/drm/amd/display/modules/inc/mod_freesync.h | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/amd/display/modules/freesync/freesync.c b/drivers/gpu/drm/amd/display/modules/freesync/freesync.c index 1544ed3f1747..945e845f3358 100644 --- a/drivers/gpu/drm/amd/display/modules/freesync/freesync.c +++ b/drivers/gpu/drm/amd/display/modules/freesync/freesync.c @@ -656,7 +656,7 @@ static void build_vrr_infopacket_v1(enum signal_type signal, static void build_vrr_infopacket_v2(enum signal_type signal, const struct mod_vrr_params *vrr, - const enum color_transfer_func *app_tf, + enum color_transfer_func app_tf, struct dc_info_packet *infopacket) { unsigned int payload_size = 0; @@ -664,8 +664,7 @@ static void build_vrr_infopacket_v2(enum signal_type signal, build_vrr_infopacket_header_v2(signal, infopacket, &payload_size); build_vrr_infopacket_data(vrr, infopacket); - if (app_tf != NULL) - build_vrr_infopacket_fs2_data(*app_tf, infopacket); + build_vrr_infopacket_fs2_data(app_tf, infopacket); build_vrr_infopacket_checksum(&payload_size, infopacket); @@ -676,7 +675,7 @@ void mod_freesync_build_vrr_infopacket(struct mod_freesync *mod_freesync, const struct dc_stream_state *stream, const struct mod_vrr_params *vrr, enum vrr_packet_type packet_type, - const enum color_transfer_func *app_tf, + enum color_transfer_func app_tf, struct dc_info_packet *infopacket) { /* SPD info packet for FreeSync */ diff --git a/drivers/gpu/drm/amd/display/modules/inc/mod_freesync.h b/drivers/gpu/drm/amd/display/modules/inc/mod_freesync.h index 949a8b62aa98..063af6258fd9 100644 --- a/drivers/gpu/drm/amd/display/modules/inc/mod_freesync.h +++ b/drivers/gpu/drm/amd/display/modules/inc/mod_freesync.h @@ -145,7 +145,7 @@ void mod_freesync_build_vrr_infopacket(struct mod_freesync *mod_freesync, const struct dc_stream_state *stream, const struct mod_vrr_params *vrr, enum vrr_packet_type packet_type, - const enum color_transfer_func *app_tf, + enum color_transfer_func app_tf, struct dc_info_packet *infopacket); void mod_freesync_build_vrr_params(struct mod_freesync *mod_freesync, -- 2.19.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 5.0 070/262] drm/amd/display: Pass app_tf by value rather than by reference Date: Wed, 27 Mar 2019 13:58:45 -0400 Message-ID: <20190327180158.10245-70-sashal@kernel.org> References: <20190327180158.10245-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190327180158.10245-1-sashal-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Alex Deucher , Sasha Levin , Nathan Chancellor , dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogTmF0aGFuIENoYW5jZWxsb3IgPG5hdGVjaGFuY2VsbG9yQGdtYWlsLmNvbT4KClsgVXBz dHJlYW0gY29tbWl0IDY3MmU3OGNhYjgxOWViZTMxZTNiOWI4YWJhYzM2N2JlOGExMTA0NzIgXQoK Q2xhbmcgd2FybnMgd2hlbiBhbiBleHByZXNzaW9uIHRoYXQgZXF1YWxzIHplcm8gaXMgdXNlZCBh cyBhIG51bGwKcG9pbnRlciBjb25zdGFudCAoaW4gbGlldSBvZiBOVUxMKToKCmRyaXZlcnMvZ3B1 L2RybS9hbWQvYW1kZ3B1Ly4uL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9kbS5jOjQ0MzU6MzoK d2FybmluZzogZXhwcmVzc2lvbiB3aGljaCBldmFsdWF0ZXMgdG8gemVybyB0cmVhdGVkIGFzIGEg bnVsbCBwb2ludGVyCmNvbnN0YW50IG9mIHR5cGUgJ2NvbnN0IGVudW0gY29sb3JfdHJhbnNmZXJf ZnVuYyAqJwpbLVdub24tbGl0ZXJhbC1udWxsLWNvbnZlcnNpb25dCiAgICAgICAgICAgICAgICBU UkFOU0ZFUl9GVU5DX1VOS05PV04sCiAgICAgICAgICAgICAgICBefn5+fn5+fn5+fn5+fn5+fn5+ fn4KMSB3YXJuaW5nIGdlbmVyYXRlZC4KClRoaXMgd2FybmluZyBpcyBjYXVzZWQgYnkgY29tbWl0 IGJiNDdkZTczNjY2MSAoImRybS9hbWRncHU6IFNldCBGcmVlU3luYwpzdGF0ZSB1c2luZyBkcm0g VlJSIHByb3BlcnRpZXMiKSBhbmQgaXQgY291bGQgYmUgc29sdmVkIGJ5IHVzaW5nIE5VTEwKaW5z dGVhZCBvZiBUUkFOU0ZFUl9GVU5DX1VOS05PV04gb3IgY2FzdGluZyBUUkFOU0ZFUl9GVU5DX1VO S05PV04gYXMgYQpwb2ludGVyLiBIb3dldmVyLCBhZnRlciBsb29raW5nIGludG8gaXQsIHRoZXJl IGRvZXNuJ3QgYXBwZWFyIHRvIGJlIGEKZ29vZCByZWFzb24gdG8gcGFzcyBhcHBfdGYgYnkgcmVm ZXJlbmNlIGFzIGl0IGlzIG5ldmVyIG11dGF0ZWQgYWxvbmcgdGhlCndheS4gVGhpcyBpcyB0aGUg b25seSBjb2RlIHBhdGggaW4gd2hpY2ggYXBwX3RmIGlzIHVzZWQ6Cgptb2RfZnJlZXN5bmNfYnVp bGRfdnJyX2luZm9wYWNrZXQgLT4KICAgIGJ1aWxkX3Zycl9pbmZvcGFja2V0X3YyIC0+CiAgICAg ICAgYnVpbGRfdnJyX2luZm9wYWNrZXRfZnMyX2RhdGEKCk5laXRoZXIgbW9kX2ZyZWVzeW5jX2J1 aWxkX3Zycl9pbmZvcGFja2V0IG9yIGJ1aWxkX3Zycl9pbmZvcGFja2V0X3YyCm1vZGlmeSBhcHBf dGYncyB2YWx1ZSBhbmQgYnVpbGRfdnJyX2luZm9wYWNrZXRfZnMyX2RhdGEgZXhwZWN0cyBqdXN0 CnRoZSB2YWx1ZSBzbyB3ZSBjYW4gYXZvaWQgZGVyZWZlcmVuY2luZyBhbnl0aGluZyBieSBqdXN0 IHBhc3NpbmcgaW4KYXBwX3RmJ3MgdmFsdWUgdG8gbW9kX2ZyZWVzeW5jX2J1aWxkX3Zycl9pbmZv cGFja2V0IGFuZApidWlsZF92cnJfaW5mb3BhY2tldF92Mi4KClRoZXJlIGlzIG5vIGZ1bmN0aW9u YWwgY2hhbmdlIGJlY2F1c2UgYnVpbGRfdnJyX2luZm9wYWNrZXRfZnMyX2RhdGEKZG9lc24ndCBk byBhbnl0aGluZyBpZiBUUkFOU0ZFUl9GVU5DX1VOS05PV04gaXMgcGFzc2VkIHRvIGl0LCB0aGUg c2FtZQphcyBub3QgY2FsbGluZyBidWlsZF92cnJfaW5mb3BhY2tldF9mczJfZGF0YSBhdCBhbGwg bGlrZSBiZWZvcmUgdGhpcwpjaGFuZ2Ugd2hlbiBOVUxMIHdhcyB1c2VkIGZvciBhcHBfdGYuCgpS ZXZpZXdlZC1ieTogSGFycnkgV2VudGxhbmQgPGhhcnJ5LndlbnRsYW5kQGFtZC5jb20+ClNpZ25l ZC1vZmYtYnk6IE5hdGhhbiBDaGFuY2VsbG9yIDxuYXRlY2hhbmNlbGxvckBnbWFpbC5jb20+ClNp Z25lZC1vZmYtYnk6IEFsZXggRGV1Y2hlciA8YWxleGFuZGVyLmRldWNoZXJAYW1kLmNvbT4KU2ln bmVkLW9mZi1ieTogU2FzaGEgTGV2aW4gPHNhc2hhbEBrZXJuZWwub3JnPgotLS0KIGRyaXZlcnMv Z3B1L2RybS9hbWQvZGlzcGxheS9tb2R1bGVzL2ZyZWVzeW5jL2ZyZWVzeW5jLmMgfCA3ICsrKy0t LS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9tb2R1bGVzL2luYy9tb2RfZnJlZXN5bmMu aCAgfCAyICstCiAyIGZpbGVzIGNoYW5nZWQsIDQgaW5zZXJ0aW9ucygrKSwgNSBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvbW9kdWxlcy9mcmVl c3luYy9mcmVlc3luYy5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L21vZHVsZXMvZnJl ZXN5bmMvZnJlZXN5bmMuYwppbmRleCAxNTQ0ZWQzZjE3NDcuLjk0NWU4NDVmMzM1OCAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L21vZHVsZXMvZnJlZXN5bmMvZnJlZXN5 bmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvbW9kdWxlcy9mcmVlc3luYy9m cmVlc3luYy5jCkBAIC02NTYsNyArNjU2LDcgQEAgc3RhdGljIHZvaWQgYnVpbGRfdnJyX2luZm9w YWNrZXRfdjEoZW51bSBzaWduYWxfdHlwZSBzaWduYWwsCiAKIHN0YXRpYyB2b2lkIGJ1aWxkX3Zy cl9pbmZvcGFja2V0X3YyKGVudW0gc2lnbmFsX3R5cGUgc2lnbmFsLAogCQljb25zdCBzdHJ1Y3Qg bW9kX3Zycl9wYXJhbXMgKnZyciwKLQkJY29uc3QgZW51bSBjb2xvcl90cmFuc2Zlcl9mdW5jICph cHBfdGYsCisJCWVudW0gY29sb3JfdHJhbnNmZXJfZnVuYyBhcHBfdGYsCiAJCXN0cnVjdCBkY19p bmZvX3BhY2tldCAqaW5mb3BhY2tldCkKIHsKIAl1bnNpZ25lZCBpbnQgcGF5bG9hZF9zaXplID0g MDsKQEAgLTY2NCw4ICs2NjQsNyBAQCBzdGF0aWMgdm9pZCBidWlsZF92cnJfaW5mb3BhY2tldF92 MihlbnVtIHNpZ25hbF90eXBlIHNpZ25hbCwKIAlidWlsZF92cnJfaW5mb3BhY2tldF9oZWFkZXJf djIoc2lnbmFsLCBpbmZvcGFja2V0LCAmcGF5bG9hZF9zaXplKTsKIAlidWlsZF92cnJfaW5mb3Bh Y2tldF9kYXRhKHZyciwgaW5mb3BhY2tldCk7CiAKLQlpZiAoYXBwX3RmICE9IE5VTEwpCi0JCWJ1 aWxkX3Zycl9pbmZvcGFja2V0X2ZzMl9kYXRhKCphcHBfdGYsIGluZm9wYWNrZXQpOworCWJ1aWxk X3Zycl9pbmZvcGFja2V0X2ZzMl9kYXRhKGFwcF90ZiwgaW5mb3BhY2tldCk7CiAKIAlidWlsZF92 cnJfaW5mb3BhY2tldF9jaGVja3N1bSgmcGF5bG9hZF9zaXplLCBpbmZvcGFja2V0KTsKIApAQCAt Njc2LDcgKzY3NSw3IEBAIHZvaWQgbW9kX2ZyZWVzeW5jX2J1aWxkX3Zycl9pbmZvcGFja2V0KHN0 cnVjdCBtb2RfZnJlZXN5bmMgKm1vZF9mcmVlc3luYywKIAkJY29uc3Qgc3RydWN0IGRjX3N0cmVh bV9zdGF0ZSAqc3RyZWFtLAogCQljb25zdCBzdHJ1Y3QgbW9kX3Zycl9wYXJhbXMgKnZyciwKIAkJ ZW51bSB2cnJfcGFja2V0X3R5cGUgcGFja2V0X3R5cGUsCi0JCWNvbnN0IGVudW0gY29sb3JfdHJh bnNmZXJfZnVuYyAqYXBwX3RmLAorCQllbnVtIGNvbG9yX3RyYW5zZmVyX2Z1bmMgYXBwX3RmLAog CQlzdHJ1Y3QgZGNfaW5mb19wYWNrZXQgKmluZm9wYWNrZXQpCiB7CiAJLyogU1BEIGluZm8gcGFj a2V0IGZvciBGcmVlU3luYyAqLwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNw bGF5L21vZHVsZXMvaW5jL21vZF9mcmVlc3luYy5oIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNw bGF5L21vZHVsZXMvaW5jL21vZF9mcmVlc3luYy5oCmluZGV4IDk0OWE4YjYyYWE5OC4uMDYzYWY2 MjU4ZmQ5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvbW9kdWxlcy9p bmMvbW9kX2ZyZWVzeW5jLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L21vZHVs ZXMvaW5jL21vZF9mcmVlc3luYy5oCkBAIC0xNDUsNyArMTQ1LDcgQEAgdm9pZCBtb2RfZnJlZXN5 bmNfYnVpbGRfdnJyX2luZm9wYWNrZXQoc3RydWN0IG1vZF9mcmVlc3luYyAqbW9kX2ZyZWVzeW5j LAogCQljb25zdCBzdHJ1Y3QgZGNfc3RyZWFtX3N0YXRlICpzdHJlYW0sCiAJCWNvbnN0IHN0cnVj dCBtb2RfdnJyX3BhcmFtcyAqdnJyLAogCQllbnVtIHZycl9wYWNrZXRfdHlwZSBwYWNrZXRfdHlw ZSwKLQkJY29uc3QgZW51bSBjb2xvcl90cmFuc2Zlcl9mdW5jICphcHBfdGYsCisJCWVudW0gY29s b3JfdHJhbnNmZXJfZnVuYyBhcHBfdGYsCiAJCXN0cnVjdCBkY19pbmZvX3BhY2tldCAqaW5mb3Bh Y2tldCk7CiAKIHZvaWQgbW9kX2ZyZWVzeW5jX2J1aWxkX3Zycl9wYXJhbXMoc3RydWN0IG1vZF9m cmVlc3luYyAqbW9kX2ZyZWVzeW5jLAotLSAKMi4xOS4xCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2FtZC1nZng=