Received: by 2002:ac0:da4c:0:0:0:0:0 with SMTP id a12csp854174imi; Thu, 21 Jul 2022 12:16:40 -0700 (PDT) X-Google-Smtp-Source: AGRyM1s1GgxfI92P9y5VI3taGt+ioAG0rgd4c2f5wxHb/8vKFjLUUO2wK0yQC5grzPc71ftjyU6r X-Received: by 2002:a17:907:2848:b0:72b:5ba5:1db5 with SMTP id el8-20020a170907284800b0072b5ba51db5mr4001ejc.703.1658431000283; Thu, 21 Jul 2022 12:16:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658431000; cv=none; d=google.com; s=arc-20160816; b=U6Nlm5FlvMuIx23vsIXETufeBSTIhaQdKzQalVeNvIZ1K5FVpWpZNQftXukFDeqD6t gzOX7i97diiCtvvS+bU2rwsARdv2itpjqNnMNAC3ynL2UWgaNfoDo6Je5HMpkE8kDczd wg9PDEZVOaFZwRsH8uYUlnpWFcno+xDhAsCJCNoxd47TztElTQQaDK2vdqVf/fP3DJnY Y+g2j5QJmOtir0og3ujrZVhbQ94OJEdJGnr6aGm488pqr3Jnb4jhpTQiFrpLPiJOr4BY 43RksdfqNk/6Uf1mE0OA24IuY3MOMzidw+Y0gI6EBnYN3s6WWU7GHkBjeuVjVCvPDlau 7X4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=uFpYU1Yhz5tbCuLt3Y+Lwbfh7JZPS94ZpvQo0m8RbTY=; b=b2MUbCUm0laLu5RzB5bXknEE/dXRT2pLh4KjmgpZZGcgAebvshZRhKTTYahVLfYpbx L/abhA0Nhy8J09NB9DDg/D0I73RtqWJMGX1gv9GPlhKKIIZQWMDpN+sHh1oU1rmPi9Yt xfacsjjftDaRpbPIIaviRg4A6QKvlbMQp4C8ceydZYIWgzZe6PhEzB3zIr8qd+ruraIF 2QZedzvFrrudcqi+eHa+c9xZceumBMAJm1SQMwpIC0IQlHA9WJ/RgWzk0bqg+yvFIBJw 1McRyYHGY3pfk63l7wvdEyraKVgmafAMktz8QAMEkvL7g2rKTsYhDo8YSU1/vKTh8u+w qHIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@riseup.net header.s=squak header.b="dS/YowjF"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=riseup.net Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u1-20020a1709061da100b00726d03899basi3360632ejh.344.2022.07.21.12.16.15; Thu, 21 Jul 2022 12:16:40 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@riseup.net header.s=squak header.b="dS/YowjF"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=riseup.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232975AbiGUShW (ORCPT + 99 others); Thu, 21 Jul 2022 14:37:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56060 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233072AbiGUShS (ORCPT ); Thu, 21 Jul 2022 14:37:18 -0400 Received: from mx1.riseup.net (mx1.riseup.net [198.252.153.129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E23BB8C8C2 for ; Thu, 21 Jul 2022 11:37:16 -0700 (PDT) Received: from fews2.riseup.net (fews2-pn.riseup.net [10.0.1.84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mail.riseup.net", Issuer "R3" (not verified)) by mx1.riseup.net (Postfix) with ESMTPS id 4LphBN0ngzzDqPr; Thu, 21 Jul 2022 18:37:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1658428636; bh=cYPIZQ2rMf7bDPZ1Cs8X0HwhGy3NGW0cHxWuAgeiORg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dS/YowjFpSfyNTZnrXIEtrOtnPdZENEel2UpJsHGRXuNYmyEGVXAoKBavxUr6UaxU l2vbkgoa8OwpBnaP6ZpRKsrCM42bpit8lUll281Ltb3acAlTyyfCRNk6aHgoJyNJ7h zNVmnfCqJKFeoxgsuW4RzmP5n5RPwuBKvzGQZ8DA= X-Riseup-User-ID: 048B8FEF5AA4E486E8389CF630C6D6328F2F4A8F8D2B5925994D78C78EF6213F Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews2.riseup.net (Postfix) with ESMTPSA id 4LphBG0jLdz1yWd; Thu, 21 Jul 2022 18:37:09 +0000 (UTC) From: =?UTF-8?q?Ma=C3=ADra=20Canal?= To: Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , christian.koenig@amd.com, Xinhui.Pan@amd.com, David Airlie , Daniel Vetter , Nicholas Kazlauskas , Dmytro Laktyushkin , Aurabindo Pillai Cc: amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, mwen@igalia.com, andrealmeid@riseup.net, Isabella Basso , magalilemes00@gmail.com, tales.aparecida@gmail.com, =?UTF-8?q?Ma=C3=ADra=20Canal?= Subject: [PATCH v2 3/4] drm/amd/display: Remove parameters from rq_dlg_get_dlg_reg Date: Thu, 21 Jul 2022 15:36:32 -0300 Message-Id: <20220721183633.1004611-3-mairacanal@riseup.net> In-Reply-To: <20220721183633.1004611-1-mairacanal@riseup.net> References: <20220721183633.1004611-1-mairacanal@riseup.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,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: X-Mailing-List: linux-kernel@vger.kernel.org Across all DCN's (except DCN32, that has a separate rq_dlg_get_dlg_reg), the parameters const bool vm_en, const bool ignore_viewport_pos, and const bool immediate_flip_support are not used on the function. Therefore, change the rq_dlg_get_dlg_reg signature by deleting those parameters. Signed-off-by: Maíra Canal --- v1 -> v2: - Replace "enum" to "enum entries" (André Almeida). --- .../drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 3 +-- .../dc/dml/dcn20/display_rq_dlg_calc_20.c | 5 +---- .../dc/dml/dcn20/display_rq_dlg_calc_20.h | 5 +---- .../dc/dml/dcn20/display_rq_dlg_calc_20v2.c | 5 +---- .../dc/dml/dcn20/display_rq_dlg_calc_20v2.h | 5 +---- .../dc/dml/dcn21/display_rq_dlg_calc_21.c | 5 +---- .../dc/dml/dcn21/display_rq_dlg_calc_21.h | 5 +---- .../dc/dml/dcn30/display_rq_dlg_calc_30.c | 18 +++--------------- .../dc/dml/dcn30/display_rq_dlg_calc_30.h | 5 +---- .../dc/dml/dcn31/display_rq_dlg_calc_31.c | 19 +++---------------- .../dc/dml/dcn31/display_rq_dlg_calc_31.h | 5 +---- .../dc/dml/dcn314/display_rq_dlg_calc_314.c | 15 ++------------- .../dc/dml/dcn314/display_rq_dlg_calc_314.h | 5 +---- .../drm/amd/display/dc/dml/display_mode_lib.h | 5 +---- .../gpu/drm/amd/display/dc/dml/dml_wrapper.c | 3 +-- 15 files changed, 20 insertions(+), 88 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c b/drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c index dc60b835e938..d9cfb29a2651 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c @@ -857,8 +857,7 @@ void dcn20_calculate_dlg_params( pipe_cnt, pipe_idx, cstate_en, - context->bw_ctx.bw.dcn.clk.p_state_change_support, - false, false, true); + context->bw_ctx.bw.dcn.clk.p_state_change_support); context->bw_ctx.dml.funcs.rq_dlg_get_rq_reg(&context->bw_ctx.dml, &context->res_ctx.pipe_ctx[i].rq_regs, diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20.c b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20.c index 548cdef8a8ad..d0a4c69b47c8 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20.c +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20.c @@ -1553,10 +1553,7 @@ void dml20_rq_dlg_get_dlg_reg(struct display_mode_lib *mode_lib, const unsigned int num_pipes, const unsigned int pipe_idx, const bool cstate_en, - const bool pstate_en, - const bool vm_en, - const bool ignore_viewport_pos, - const bool immediate_flip_support) + const bool pstate_en) { display_rq_params_st rq_param = {0}; display_dlg_sys_params_st dlg_sys_param = {0}; diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20.h b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20.h index 8b23867e97c1..36c3692e53b8 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20.h +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20.h @@ -65,9 +65,6 @@ void dml20_rq_dlg_get_dlg_reg( const unsigned int num_pipes, const unsigned int pipe_idx, const bool cstate_en, - const bool pstate_en, - const bool vm_en, - const bool ignore_viewport_pos, - const bool immediate_flip_support); + const bool pstate_en); #endif diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.c b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.c index 0fc9f3e3ffae..17df9d31c11f 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.c +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.c @@ -1554,10 +1554,7 @@ void dml20v2_rq_dlg_get_dlg_reg(struct display_mode_lib *mode_lib, const unsigned int num_pipes, const unsigned int pipe_idx, const bool cstate_en, - const bool pstate_en, - const bool vm_en, - const bool ignore_viewport_pos, - const bool immediate_flip_support) + const bool pstate_en) { display_rq_params_st rq_param = {0}; display_dlg_sys_params_st dlg_sys_param = {0}; diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.h b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.h index 2b4e46ea1c3d..f524f1ccfe41 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.h +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.h @@ -65,9 +65,6 @@ void dml20v2_rq_dlg_get_dlg_reg( const unsigned int num_pipes, const unsigned int pipe_idx, const bool cstate_en, - const bool pstate_en, - const bool vm_en, - const bool ignore_viewport_pos, - const bool immediate_flip_support); + const bool pstate_en); #endif diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn21/display_rq_dlg_calc_21.c b/drivers/gpu/drm/amd/display/dc/dml/dcn21/display_rq_dlg_calc_21.c index 618f4b682ab1..502dafc6dd79 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/dcn21/display_rq_dlg_calc_21.c +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn21/display_rq_dlg_calc_21.c @@ -1662,10 +1662,7 @@ void dml21_rq_dlg_get_dlg_reg( const unsigned int num_pipes, const unsigned int pipe_idx, const bool cstate_en, - const bool pstate_en, - const bool vm_en, - const bool ignore_viewport_pos, - const bool immediate_flip_support) + const bool pstate_en) { display_rq_params_st rq_param = {0}; display_dlg_sys_params_st dlg_sys_param = {0}; diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn21/display_rq_dlg_calc_21.h b/drivers/gpu/drm/amd/display/dc/dml/dcn21/display_rq_dlg_calc_21.h index af6ad0ca9cf8..822c68089ca8 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/dcn21/display_rq_dlg_calc_21.h +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn21/display_rq_dlg_calc_21.h @@ -65,9 +65,6 @@ void dml21_rq_dlg_get_dlg_reg( const unsigned int num_pipes, const unsigned int pipe_idx, const bool cstate_en, - const bool pstate_en, - const bool vm_en, - const bool ignore_viewport_pos, - const bool immediate_flip_support); + const bool pstate_en); #endif diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.c b/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.c index 8179be1f34bb..b3bdb7283a7e 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.c +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.c @@ -898,10 +898,7 @@ static void dml_rq_dlg_get_dlg_params(struct display_mode_lib *mode_lib, const display_rq_dlg_params_st rq_dlg_param, const display_dlg_sys_params_st dlg_sys_param, const bool cstate_en, - const bool pstate_en, - const bool vm_en, - const bool ignore_viewport_pos, - const bool immediate_flip_support) + const bool pstate_en) { const display_pipe_source_params_st *src = &e2e_pipe_param[pipe_idx].pipe.src; const display_pipe_dest_params_st *dst = &e2e_pipe_param[pipe_idx].pipe.dest; @@ -1031,9 +1028,6 @@ static void dml_rq_dlg_get_dlg_params(struct display_mode_lib *mode_lib, dml_print("DML_DLG: %s: cstate_en = %d\n", __func__, cstate_en); dml_print("DML_DLG: %s: pstate_en = %d\n", __func__, pstate_en); - dml_print("DML_DLG: %s: vm_en = %d\n", __func__, vm_en); - dml_print("DML_DLG: %s: ignore_viewport_pos = %d\n", __func__, ignore_viewport_pos); - dml_print("DML_DLG: %s: immediate_flip_support = %d\n", __func__, immediate_flip_support); dml_print("DML_DLG: %s: dppclk_freq_in_mhz = %3.2f\n", __func__, dppclk_freq_in_mhz); dml_print("DML_DLG: %s: dispclk_freq_in_mhz = %3.2f\n", __func__, dispclk_freq_in_mhz); @@ -1746,10 +1740,7 @@ void dml30_rq_dlg_get_dlg_reg(struct display_mode_lib *mode_lib, const unsigned int num_pipes, const unsigned int pipe_idx, const bool cstate_en, - const bool pstate_en, - const bool vm_en, - const bool ignore_viewport_pos, - const bool immediate_flip_support) + const bool pstate_en) { display_rq_params_st rq_param = { 0 }; display_dlg_sys_params_st dlg_sys_param = { 0 }; @@ -1785,10 +1776,7 @@ void dml30_rq_dlg_get_dlg_reg(struct display_mode_lib *mode_lib, rq_param.dlg, dlg_sys_param, cstate_en, - pstate_en, - vm_en, - ignore_viewport_pos, - immediate_flip_support); + pstate_en); dml_print("DML_DLG: Calculation for pipe[%d] end\n", pipe_idx); } diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.h b/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.h index 625e41f8d575..d28ed3ae3f94 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.h +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.h @@ -61,9 +61,6 @@ void dml30_rq_dlg_get_dlg_reg(struct display_mode_lib *mode_lib, const unsigned int num_pipes, const unsigned int pipe_idx, const bool cstate_en, - const bool pstate_en, - const bool vm_en, - const bool ignore_viewport_pos, - const bool immediate_flip_support); + const bool pstate_en); #endif diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn31/display_rq_dlg_calc_31.c b/drivers/gpu/drm/amd/display/dc/dml/dcn31/display_rq_dlg_calc_31.c index 66b82e4f05c6..c36dd3a79871 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/dcn31/display_rq_dlg_calc_31.c +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn31/display_rq_dlg_calc_31.c @@ -859,10 +859,7 @@ static void dml_rq_dlg_get_dlg_params( const display_rq_dlg_params_st *rq_dlg_param, const display_dlg_sys_params_st *dlg_sys_param, const bool cstate_en, - const bool pstate_en, - const bool vm_en, - const bool ignore_viewport_pos, - const bool immediate_flip_support) + const bool pstate_en) { const display_pipe_source_params_st *src = &e2e_pipe_param[pipe_idx].pipe.src; const display_pipe_dest_params_st *dst = &e2e_pipe_param[pipe_idx].pipe.dest; @@ -970,9 +967,6 @@ static void dml_rq_dlg_get_dlg_params( dml_print("DML_DLG: %s: cstate_en = %d\n", __func__, cstate_en); dml_print("DML_DLG: %s: pstate_en = %d\n", __func__, pstate_en); - dml_print("DML_DLG: %s: vm_en = %d\n", __func__, vm_en); - dml_print("DML_DLG: %s: ignore_viewport_pos = %d\n", __func__, ignore_viewport_pos); - dml_print("DML_DLG: %s: immediate_flip_support = %d\n", __func__, immediate_flip_support); dml_print("DML_DLG: %s: dppclk_freq_in_mhz = %3.2f\n", __func__, dppclk_freq_in_mhz); dml_print("DML_DLG: %s: refclk_freq_in_mhz = %3.2f\n", __func__, refclk_freq_in_mhz); @@ -983,7 +977,6 @@ static void dml_rq_dlg_get_dlg_params( disp_dlg_regs->refcyc_per_htotal = (unsigned int) (ref_freq_to_pix_freq * (double) htotal * dml_pow(2, 8)); disp_dlg_regs->dlg_vblank_end = interlaced ? (vblank_end / 2) : vblank_end; // 15 bits - //set_prefetch_mode(mode_lib, cstate_en, pstate_en, ignore_viewport_pos, immediate_flip_support); min_ttu_vblank = get_min_ttu_vblank_in_us(mode_lib, e2e_pipe_param, num_pipes, pipe_idx); // From VBA dlg_vblank_start = interlaced ? (vblank_start / 2) : vblank_start; @@ -1576,10 +1569,7 @@ void dml31_rq_dlg_get_dlg_reg( const unsigned int num_pipes, const unsigned int pipe_idx, const bool cstate_en, - const bool pstate_en, - const bool vm_en, - const bool ignore_viewport_pos, - const bool immediate_flip_support) + const bool pstate_en) { display_rq_params_st rq_param = {0}; display_dlg_sys_params_st dlg_sys_param = {0}; @@ -1610,10 +1600,7 @@ void dml31_rq_dlg_get_dlg_reg( &rq_param.dlg, &dlg_sys_param, cstate_en, - pstate_en, - vm_en, - ignore_viewport_pos, - immediate_flip_support); + pstate_en); dml_print("DML_DLG: Calculation for pipe[%d] end\n", pipe_idx); } diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn31/display_rq_dlg_calc_31.h b/drivers/gpu/drm/amd/display/dc/dml/dcn31/display_rq_dlg_calc_31.h index 8ee991351699..5b0b438a9804 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/dcn31/display_rq_dlg_calc_31.h +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn31/display_rq_dlg_calc_31.h @@ -61,9 +61,6 @@ void dml31_rq_dlg_get_dlg_reg(struct display_mode_lib *mode_lib, const unsigned int num_pipes, const unsigned int pipe_idx, const bool cstate_en, - const bool pstate_en, - const bool vm_en, - const bool ignore_viewport_pos, - const bool immediate_flip_support); + const bool pstate_en); #endif diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn314/display_rq_dlg_calc_314.c b/drivers/gpu/drm/amd/display/dc/dml/dcn314/display_rq_dlg_calc_314.c index 61ee9ba063a7..37ecc4a6ae11 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/dcn314/display_rq_dlg_calc_314.c +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn314/display_rq_dlg_calc_314.c @@ -943,11 +943,7 @@ static void dml_rq_dlg_get_dlg_params( display_ttu_regs_st *disp_ttu_regs, const display_rq_dlg_params_st *rq_dlg_param, const display_dlg_sys_params_st *dlg_sys_param, - const bool cstate_en, - const bool pstate_en, - const bool vm_en, - const bool ignore_viewport_pos, - const bool immediate_flip_support) + const bool cstate_en) { const display_pipe_source_params_st *src = &e2e_pipe_param[pipe_idx].pipe.src; const display_pipe_dest_params_st *dst = &e2e_pipe_param[pipe_idx].pipe.dest; @@ -1060,9 +1056,6 @@ static void dml_rq_dlg_get_dlg_params( dml_print("DML_DLG: %s: cstate_en = %d\n", __func__, cstate_en); dml_print("DML_DLG: %s: pstate_en = %d\n", __func__, pstate_en); - dml_print("DML_DLG: %s: vm_en = %d\n", __func__, vm_en); - dml_print("DML_DLG: %s: ignore_viewport_pos = %d\n", __func__, ignore_viewport_pos); - dml_print("DML_DLG: %s: immediate_flip_support = %d\n", __func__, immediate_flip_support); dml_print("DML_DLG: %s: dppclk_freq_in_mhz = %3.2f\n", __func__, dppclk_freq_in_mhz); dml_print("DML_DLG: %s: refclk_freq_in_mhz = %3.2f\n", __func__, refclk_freq_in_mhz); @@ -1073,7 +1066,6 @@ static void dml_rq_dlg_get_dlg_params( disp_dlg_regs->refcyc_per_htotal = (unsigned int) (ref_freq_to_pix_freq * (double) htotal * dml_pow(2, 8)); disp_dlg_regs->dlg_vblank_end = interlaced ? (vblank_end / 2) : vblank_end; // 15 bits - //set_prefetch_mode(mode_lib, cstate_en, pstate_en, ignore_viewport_pos, immediate_flip_support); min_ttu_vblank = get_min_ttu_vblank_in_us(mode_lib, e2e_pipe_param, num_pipes, pipe_idx); // From VBA dlg_vblank_start = interlaced ? (vblank_start / 2) : vblank_start; @@ -1725,9 +1717,6 @@ void dml314_rq_dlg_get_dlg_reg( &rq_param.dlg, &dlg_sys_param, cstate_en, - pstate_en, - vm_en, - ignore_viewport_pos, - immediate_flip_support); + pstate_en); dml_print("DML_DLG: Calculation for pipe[%d] end\n", pipe_idx); } diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn314/display_rq_dlg_calc_314.h b/drivers/gpu/drm/amd/display/dc/dml/dcn314/display_rq_dlg_calc_314.h index 49cb85d1056c..d2c1ba8b7ebf 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/dcn314/display_rq_dlg_calc_314.h +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn314/display_rq_dlg_calc_314.h @@ -62,9 +62,6 @@ void dml314_rq_dlg_get_dlg_reg(struct display_mode_lib *mode_lib, const unsigned int num_pipes, const unsigned int pipe_idx, const bool cstate_en, - const bool pstate_en, - const bool vm_en, - const bool ignore_viewport_pos, - const bool immediate_flip_support); + const bool pstate_en); #endif diff --git a/drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.h b/drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.h index 2bdd6ed22611..8a4b60a278b5 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.h +++ b/drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.h @@ -55,10 +55,7 @@ struct dml_funcs { const unsigned int num_pipes, const unsigned int pipe_idx, const bool cstate_en, - const bool pstate_en, - const bool vm_en, - const bool ignore_viewport_pos, - const bool immediate_flip_support); + const bool pstate_en); void (*rq_dlg_get_rq_reg)( struct display_mode_lib *mode_lib, display_rq_regs_st *rq_regs, diff --git a/drivers/gpu/drm/amd/display/dc/dml/dml_wrapper.c b/drivers/gpu/drm/amd/display/dc/dml/dml_wrapper.c index b4b51e51fc25..e39e2363ea0a 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/dml_wrapper.c +++ b/drivers/gpu/drm/amd/display/dc/dml/dml_wrapper.c @@ -1647,8 +1647,7 @@ static void dml_calculate_dlg_params( pipe_cnt, pipe_idx, cstate_en, - context->bw_ctx.bw.dcn.clk.p_state_change_support, - false, false, true); + context->bw_ctx.bw.dcn.clk.p_state_change_support); context->bw_ctx.dml.funcs.rq_dlg_get_rq_reg(&context->bw_ctx.dml, &context->res_ctx.pipe_ctx[i].rq_regs, -- 2.36.1