Skip to content

Commit 3045a4e

Browse files
committed
drm/i915/dp: Simplify eDP vs. DP compressed BPP computation
intel_edp_dsc_compute_pipe_bpp() matches now intel_dp_dsc_compute_pipe_bpp(), remove the former function. Reviewed-by: Vinod Govindapillai <vinod.govindapillai@intel.com> Signed-off-by: Imre Deak <imre.deak@intel.com> Link: https://patch.msgid.link/20251222153547.713360-20-imre.deak@intel.com
1 parent 2b60146 commit 3045a4e

1 file changed

Lines changed: 2 additions & 30 deletions

File tree

drivers/gpu/drm/i915/display/intel_dp.c

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2322,30 +2322,6 @@ static int intel_dp_dsc_compute_pipe_bpp(struct intel_dp *intel_dp,
23222322
return 0;
23232323
}
23242324

2325-
static int intel_edp_dsc_compute_pipe_bpp(struct intel_dp *intel_dp,
2326-
struct intel_crtc_state *pipe_config,
2327-
struct drm_connector_state *conn_state,
2328-
const struct link_config_limits *limits)
2329-
{
2330-
int pipe_bpp, forced_bpp;
2331-
int ret;
2332-
2333-
forced_bpp = intel_dp_force_dsc_pipe_bpp(intel_dp, limits);
2334-
if (forced_bpp)
2335-
pipe_bpp = forced_bpp;
2336-
else
2337-
pipe_bpp = limits->pipe.max_bpp;
2338-
2339-
ret = dsc_compute_compressed_bpp(intel_dp, pipe_config, conn_state,
2340-
limits, pipe_bpp);
2341-
if (ret)
2342-
return -EINVAL;
2343-
2344-
pipe_config->pipe_bpp = pipe_bpp;
2345-
2346-
return 0;
2347-
}
2348-
23492325
/*
23502326
* Return whether FEC must be enabled for 8b10b SST or MST links. On 128b132b
23512327
* links FEC is always enabled implicitly by the HW, so this function returns
@@ -2397,12 +2373,8 @@ int intel_dp_dsc_compute_config(struct intel_dp *intel_dp,
23972373
* figured out for DP MST DSC.
23982374
*/
23992375
if (!is_mst) {
2400-
if (intel_dp_is_edp(intel_dp))
2401-
ret = intel_edp_dsc_compute_pipe_bpp(intel_dp, pipe_config,
2402-
conn_state, limits);
2403-
else
2404-
ret = intel_dp_dsc_compute_pipe_bpp(intel_dp, pipe_config,
2405-
conn_state, limits);
2376+
ret = intel_dp_dsc_compute_pipe_bpp(intel_dp, pipe_config,
2377+
conn_state, limits);
24062378
if (ret) {
24072379
drm_dbg_kms(display->drm,
24082380
"No Valid pipe bpp for given mode ret = %d\n", ret);

0 commit comments

Comments
 (0)