Commit 7ae5ab44 authored by Stanislav Lisovskiy's avatar Stanislav Lisovskiy

drm/i915: Extract drm_dp_atomic_find_vcpi_slots cycle to separate function

We would be using almost same code to loop through bpps while calling
drm_dp_atomic_find_vcpi_slots - lets remove this duplication by
introducing a new function intel_dp_mst_find_vcpi_slots_for_bpp

v2: Fix pbn_div calculation - shouldn't matter if its DSC or not.
Reviewed-by: default avatarVinod Govindapillai <vinod.govindapillai@intel.com>
Signed-off-by: default avatarStanislav Lisovskiy <stanislav.lisovskiy@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220905085744.29637-4-stanislav.lisovskiy@intel.com
parent c6266862
...@@ -44,10 +44,14 @@ ...@@ -44,10 +44,14 @@
#include "intel_hotplug.h" #include "intel_hotplug.h"
#include "skl_scaler.h" #include "skl_scaler.h"
static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder, static int intel_dp_mst_find_vcpi_slots_for_bpp(struct intel_encoder *encoder,
struct intel_crtc_state *crtc_state, struct intel_crtc_state *crtc_state,
int max_bpp,
int min_bpp,
struct link_config_limits *limits,
struct drm_connector_state *conn_state, struct drm_connector_state *conn_state,
struct link_config_limits *limits) int step,
bool dsc)
{ {
struct drm_atomic_state *state = crtc_state->uapi.state; struct drm_atomic_state *state = crtc_state->uapi.state;
struct intel_dp_mst_encoder *intel_mst = enc_to_mst(encoder); struct intel_dp_mst_encoder *intel_mst = enc_to_mst(encoder);
...@@ -57,28 +61,31 @@ static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder, ...@@ -57,28 +61,31 @@ static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder,
struct drm_i915_private *i915 = to_i915(connector->base.dev); struct drm_i915_private *i915 = to_i915(connector->base.dev);
const struct drm_display_mode *adjusted_mode = const struct drm_display_mode *adjusted_mode =
&crtc_state->hw.adjusted_mode; &crtc_state->hw.adjusted_mode;
bool constant_n = drm_dp_has_quirk(&intel_dp->desc, DP_DPCD_QUIRK_CONSTANT_N);
int bpp, slots = -EINVAL; int bpp, slots = -EINVAL;
int ret = 0; int ret = 0;
int pbn_div;
crtc_state->lane_count = limits->max_lane_count; crtc_state->lane_count = limits->max_lane_count;
crtc_state->port_clock = limits->max_rate; crtc_state->port_clock = limits->max_rate;
for (bpp = limits->max_bpp; bpp >= limits->min_bpp; bpp -= 2 * 3) { pbn_div = drm_dp_get_vc_payload_bw(&intel_dp->mst_mgr,
crtc_state->port_clock,
crtc_state->lane_count);
for (bpp = max_bpp; bpp >= min_bpp; bpp -= step) {
crtc_state->pipe_bpp = bpp; crtc_state->pipe_bpp = bpp;
crtc_state->pbn = drm_dp_calc_pbn_mode(adjusted_mode->crtc_clock, crtc_state->pbn = drm_dp_calc_pbn_mode(adjusted_mode->crtc_clock,
crtc_state->pipe_bpp, dsc ? bpp << 4 : crtc_state->pipe_bpp,
false); dsc);
slots = drm_dp_atomic_find_vcpi_slots(state, &intel_dp->mst_mgr, slots = drm_dp_atomic_find_vcpi_slots(state, &intel_dp->mst_mgr,
connector->port, connector->port,
crtc_state->pbn, crtc_state->pbn,
drm_dp_get_vc_payload_bw(&intel_dp->mst_mgr, pbn_div);
crtc_state->port_clock,
crtc_state->lane_count));
if (slots == -EDEADLK) if (slots == -EDEADLK)
return slots; return slots;
if (slots >= 0) { if (slots >= 0) {
ret = drm_dp_mst_atomic_check(state); ret = drm_dp_mst_atomic_check(state);
/* /*
...@@ -94,11 +101,32 @@ static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder, ...@@ -94,11 +101,32 @@ static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder,
if (ret && slots >= 0) if (ret && slots >= 0)
slots = ret; slots = ret;
if (slots < 0) { if (slots < 0)
drm_dbg_kms(&i915->drm, "failed finding vcpi slots:%d\n", drm_dbg_kms(&i915->drm, "failed finding vcpi slots:%d\n",
slots); slots);
return slots;
}
static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder,
struct intel_crtc_state *crtc_state,
struct drm_connector_state *conn_state,
struct link_config_limits *limits)
{
const struct drm_display_mode *adjusted_mode =
&crtc_state->hw.adjusted_mode;
struct intel_dp_mst_encoder *intel_mst = enc_to_mst(encoder);
struct intel_dp *intel_dp = &intel_mst->primary->dp;
bool constant_n = drm_dp_has_quirk(&intel_dp->desc, DP_DPCD_QUIRK_CONSTANT_N);
int slots = -EINVAL;
slots = intel_dp_mst_find_vcpi_slots_for_bpp(encoder, crtc_state, limits->max_bpp,
limits->min_bpp, limits,
conn_state, 2 * 3, false);
if (slots < 0)
return slots; return slots;
}
intel_link_compute_m_n(crtc_state->pipe_bpp, intel_link_compute_m_n(crtc_state->pipe_bpp,
crtc_state->lane_count, crtc_state->lane_count,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment