Skip to content

BACKPORT: Revert "drm/msm/dpu: try reserving the DSPP-less LM first" #809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
riteshk-quic merged 1 commit into from
Mar 27, 2026
+14 −38
Merged

BACKPORT: Revert "drm/msm/dpu: try reserving the DSPP-less LM first" #809

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 14 additions & 38 deletions drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,26 +350,28 @@ static bool _dpu_rm_check_lm_and_get_connected_blks(struct dpu_rm *rm,
return true;
}

static bool dpu_rm_find_lms(struct dpu_rm *rm,
struct dpu_global_state *global_state,
uint32_t crtc_id, bool skip_dspp,
struct msm_display_topology *topology,
int *lm_idx, int *pp_idx, int *dspp_idx)
static int _dpu_rm_reserve_lms(struct dpu_rm *rm,
struct dpu_global_state *global_state,
uint32_t crtc_id,
struct msm_display_topology *topology)

{
int lm_idx[MAX_BLOCKS];
int pp_idx[MAX_BLOCKS];
int dspp_idx[MAX_BLOCKS] = {0};
int i, lm_count = 0;

if (!topology->num_lm) {
DPU_ERROR("zero LMs in topology\n");
return -EINVAL;
}

/* Find a primary mixer */
for (i = 0; i < ARRAY_SIZE(rm->mixer_blks) &&
lm_count < topology->num_lm; i++) {
if (!rm->mixer_blks[i])
continue;

if (skip_dspp && to_dpu_hw_mixer(rm->mixer_blks[i])->cap->dspp) {
DPU_DEBUG("Skipping LM_%d, skipping LMs with DSPPs\n", i);
continue;
}

/*
* Reset lm_count to an even index. This will drop the previous
* primary mixer if failed to find its peer.
Expand Down Expand Up @@ -408,38 +410,12 @@ static bool dpu_rm_find_lms(struct dpu_rm *rm,
}
}

return lm_count == topology->num_lm;
}

static int _dpu_rm_reserve_lms(struct dpu_rm *rm,
struct dpu_global_state *global_state,
uint32_t crtc_id,
struct msm_display_topology *topology)

{
int lm_idx[MAX_BLOCKS];
int pp_idx[MAX_BLOCKS];
int dspp_idx[MAX_BLOCKS] = {0};
int i;
bool found;

if (!topology->num_lm) {
DPU_ERROR("zero LMs in topology\n");
return -EINVAL;
}

/* Try using non-DSPP LM blocks first */
found = dpu_rm_find_lms(rm, global_state, crtc_id, !topology->num_dspp,
topology, lm_idx, pp_idx, dspp_idx);
if (!found && !topology->num_dspp)
found = dpu_rm_find_lms(rm, global_state, crtc_id, false,
topology, lm_idx, pp_idx, dspp_idx);
if (!found) {
if (lm_count != topology->num_lm) {
DPU_DEBUG("unable to find appropriate mixers\n");
return -ENAVAIL;
}

for (i = 0; i < topology->num_lm; i++) {
for (i = 0; i < lm_count; i++) {
global_state->mixer_to_crtc_id[lm_idx[i]] = crtc_id;
global_state->pingpong_to_crtc_id[pp_idx[i]] = crtc_id;
global_state->dspp_to_crtc_id[dspp_idx[i]] =
Expand Down