Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <cb9f90d1-344e-c329-178e-3662c76eee7d@amd.com>
Date:   Mon, 31 Oct 2022 09:58:46 -0400
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.4.1
Subject: Re: [PATCH] drm/amd/display (gcc13): fix enum mismatch
To:     "Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Cc:     linux-kernel@vger.kernel.org, Martin Liska <mliska@suse.cz>,
        Leo Li <sunpeng.li@amd.com>,
        Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>,
        Alex Deucher <alexander.deucher@amd.com>,
        =?UTF-8?Q?Christian_K=c3=b6nig?= <christian.koenig@amd.com>,
        "Pan, Xinhui" <Xinhui.Pan@amd.com>,
        David Airlie <airlied@gmail.com>,
        Daniel Vetter <daniel@ffwll.ch>, amd-gfx@lists.freedesktop.org,
        dri-devel@lists.freedesktop.org
References: <20221031114247.10309-1-jirislaby@kernel.org>
Content-Language: en-US
From:   Harry Wentland <harry.wentland@amd.com>
In-Reply-To: <20221031114247.10309-1-jirislaby@kernel.org>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?VHVnNGhPWjRwRzNXME1wdzdmbU1YaW5kbXhrYU1SNE1HWXdOS0NSQlFtUmhl?=
 =?utf-8?B?QmhuYU1kdm5mZzR1eVprM210QnRnYXF0RGlUMkJnUTlIclozQ2hWcXRzOXVQ?=
 =?utf-8?B?TXdJT09FYXJxVlFrREJtZXN4TVc5ZkFIeHJweGlJTEFHQktpZTJmRmlLbHl6?=
 =?utf-8?B?Sm8zSXRVL2JUdTN4ZGZUVHNjaFRRTmtlZzYyY2tkQXlsWDlDUXpKUkVkZ3Ez?=
 =?utf-8?B?Z0hsWTBNZ1dKS0ZoT04weDBlMWlyYkt2SFVoT294YXJKZVp4aGRHdjdpNUlh?=
 =?utf-8?B?Z3J4bUZoeFh3aEZ1Q09hTUlsVHpZaTRYeUt1czNhVFBCdVJxdDRmeWMrNkR6?=
 =?utf-8?B?N0lLM0lQS3ZWbnVrTjFmcjZManYyTDRZcHpESmQrNENXdlkyb0NQQW1udUk4?=
 =?utf-8?B?VGlGQWU1OEpxVERyYTc1TmhGUVFKbkovMXM5czFRTS9ZSFZEMkJKdE53REFX?=
 =?utf-8?B?c29tanFNeGNjTVVLbFhaYTB3T295YUpNRU1BSGRCakxxN2g5RkNlZERub3g5?=
 =?utf-8?B?K2RKQjIwR3prZHkzdkZtZ05hSVdhSlo3aDRrTEVlR0xZM201b3luUXNsdmJU?=
 =?utf-8?B?TXFES21NVXV5L01aaFB5bHUzS3hMalNNREtrQVZZRnh2RkdQb0I2NDRwRXQx?=
 =?utf-8?B?ZkdlNjlXNWw0VEx0Z3p5NjRWZVpJb0M2V0l4eUtiR1lHd25QSmNBSFJhbVBI?=
 =?utf-8?B?SnhKU0F5ZnhvdWJyb1VyaXlmRlRuQS9QZHJxeHkzdHF3VEcwY1FpVENqYWZN?=
 =?utf-8?B?OGVROHg5VUVmUzg3Qm9pcndlNzJ0Q0xUbW9hRFMzakRsc0JndUJmK0YrbVcz?=
 =?utf-8?B?cHFhTUhOTG9FZ0FTRXVsOThDTE5IRUhTQVgwWEdTbE91N3VRUjlKQ3YxUC9H?=
 =?utf-8?B?SktMbzh2NlBEa21GOXlzQVpGVmxWektKTTFleitPL0NPck9nR2dCUklpM2JV?=
 =?utf-8?B?bDF4NU80NVZlQ1M4UUpGVE1LZlNzaWFsVkY2enBVVlRmUThtazlkSCtSbjQv?=
 =?utf-8?B?ZEFUYXJuUGZGVVdKdCsvVEs1N1Fub0xINlJzZVQ1UWl0MWtTOHMyOE1RelJy?=
 =?utf-8?B?VnN3SUVBNElGK2ZtRGd1S2NPRWY1MzFnVFdkVmdDcDdjd2pSbXY4SGJ0ZUxy?=
 =?utf-8?B?R044cXQvcEExMDRqNThQTGk4MVVQTzRMcytLOVRRNExNeGhWL3dWY1RVc0tJ?=
 =?utf-8?B?VlJaMktoQTNYc1RQL3p4NHZoRnBqMDFHQXcvQ0hVYWZuZ1ozZHNVYmR6Mlc1?=
 =?utf-8?B?bUZFY1FwRFRMVjgwTHlHaTA5eUtxUTlXRm5LR04xaWFWcWdkRnhhQnB5NWUy?=
 =?utf-8?B?WnpxZVQ1blZNN0lCWEV3ZWhVbStlcmRsM2l6RXlMenlNS2Y1ODJGZ3ViMlJK?=
 =?utf-8?B?Y0k3dzJLamU3TnVvbzFod3Btd1JNMkNTaGEzcmxaRmZpUTRmRXJ0ZnQ0V3FZ?=
 =?utf-8?B?UG1VdXZTb0NLR3ZUdEMxZ21kbC9tYldKTVBHMHZ3S2NOZ3JZNS92TkVUbHI3?=
 =?utf-8?B?eFFPVGY3ZVhQOWJsblJQdGltaXZscmlqRndSdmx4MlhtWUVuMzRNdGtyRlFp?=
 =?utf-8?B?RHFtUTBZRi9kMjd4WC9Zd3hINkNEN2dLM2ZWWTFNTkplaHo1L2NKeklKNkZz?=
 =?utf-8?B?b2ZaU01Ea1JDZ1ZGQUN1aStqM0NoOGNCK1Q3bU1WcGxSVWdrYk1kTFpMbVds?=
 =?utf-8?B?K2V5bjhCZTJtZG4yOU4vNVFXaG1IcitUL1UzcWE5ZlVBVVJnZzBRTE51QkRm?=
 =?utf-8?B?NkRXVi9mTFZHVURhdEoyM1dTa0swWnJBMWEzSVR5MjA1K29abit3bXRnZHN4?=
 =?utf-8?B?SDJMd3NuZFpEMU50a3VUZ1VGT29Vc1k3MEFHeGg3bWZZanZYWEFjRC9nWGFG?=
 =?utf-8?B?dHoxNHA2VjNFVktxQSttRldSS0hhNlNXdG9ZR0ZPTVhnWS8xd0NlQm1KZzN6?=
 =?utf-8?B?RlZnZ0ZXK0hVZzVTTUhqT2hTcityN01YVkE2ZVBNYzc2dmNaa3pRNGlLbENp?=
 =?utf-8?B?WjBELzVLbklYZEt1MXY0cjRJQm9RMUQ3cytNOUZ4QnhsNlluVnNoYW9BSXZP?=
 =?utf-8?B?YVVSUEF1UGRGUDk1VWlaMlMyU04wckhVUnNnNmtGcFV5TnBkU2pFVFhMYjBI?=
 =?utf-8?Q?3bj5liZH9XbqF0XqLbtbN+Aux?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c4dfc847-bb7b-48a9-b558-08dabb4809a8
X-MS-Exchange-CrossTenant-AuthSource: CO6PR12MB5427.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Oct 2022 13:58:50.3093
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: UOJKUpax1wgWx75UkW59+2bois0ZD9xjrrMmHXwgDS/vKygG7tgZq5rV1eQZz74of65om7yW0XyXQFR9jEk3mg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB7308
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 2022-10-31 07:42, Jiri Slaby (SUSE) wrote:
> rn_vbios_smu_set_dcn_low_power_state() produces a valid warning with
> gcc-13:
>   drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c:237:6: error: conflicting types for 'rn_vbios_smu_set_dcn_low_power_state' due to enum/integer mismatch; have 'void(struct clk_mgr_internal *, enum dcn_pwr_state)'
>   drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.h:36:6: note: previous declaration of 'rn_vbios_smu_set_dcn_low_power_state' with type 'void(struct clk_mgr_internal *, int)'
> 
> I.e. the type of the 2nd parameter of
> rn_vbios_smu_set_dcn_low_power_state() in the declaration is int, while
> the definition spells enum dcn_pwr_state. Synchronize them to the
> latter (and add a forward enum declaration).
> 
> Cc: Martin Liska <mliska@suse.cz>
> Cc: Harry Wentland <harry.wentland@amd.com>
> Cc: Leo Li <sunpeng.li@amd.com>
> Cc: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: "Christian König" <christian.koenig@amd.com>
> Cc: "Pan, Xinhui" <Xinhui.Pan@amd.com>
> Cc: David Airlie <airlied@gmail.com>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: amd-gfx@lists.freedesktop.org
> Cc: dri-devel@lists.freedesktop.org
> Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>

Reviewed-by: Harry Wentland <harry.wentland@amd.com>

Harry

> ---
>  .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.h   | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.h b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.h
> index 3e5df27aa96f..1ce19d875358 100644
> --- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.h
> +++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.h
> @@ -26,6 +26,8 @@
>  #ifndef DAL_DC_RN_CLK_MGR_VBIOS_SMU_H_
>  #define DAL_DC_RN_CLK_MGR_VBIOS_SMU_H_
>  
> +enum dcn_pwr_state;
> +
>  int rn_vbios_smu_get_smu_version(struct clk_mgr_internal *clk_mgr);
>  int rn_vbios_smu_set_dispclk(struct clk_mgr_internal *clk_mgr, int requested_dispclk_khz);
>  int rn_vbios_smu_set_dprefclk(struct clk_mgr_internal *clk_mgr);
> @@ -33,7 +35,7 @@ int rn_vbios_smu_set_hard_min_dcfclk(struct clk_mgr_internal *clk_mgr, int reque
>  int rn_vbios_smu_set_min_deep_sleep_dcfclk(struct clk_mgr_internal *clk_mgr, int requested_min_ds_dcfclk_khz);
>  void rn_vbios_smu_set_phyclk(struct clk_mgr_internal *clk_mgr, int requested_phyclk_khz);
>  int rn_vbios_smu_set_dppclk(struct clk_mgr_internal *clk_mgr, int requested_dpp_khz);
> -void rn_vbios_smu_set_dcn_low_power_state(struct clk_mgr_internal *clk_mgr, int display_count);
> +void rn_vbios_smu_set_dcn_low_power_state(struct clk_mgr_internal *clk_mgr, enum dcn_pwr_state);
>  void rn_vbios_smu_enable_48mhz_tmdp_refclk_pwrdwn(struct clk_mgr_internal *clk_mgr, bool enable);
>  void rn_vbios_smu_enable_pme_wa(struct clk_mgr_internal *clk_mgr);
>  int rn_vbios_smu_is_periodic_retraining_disabled(struct clk_mgr_internal *clk_mgr);