Skip to content

drivers: gpu: drm: msm: disp: dpu1: add fallback for single layer mix… #513

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

Closed
nascs wants to merge 1 commit into from
+31 −3
Closed

drivers: gpu: drm: msm: disp: dpu1: add fallback for single layer mix… #513

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
34 changes: 31 additions & 3 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 @@ -361,13 +361,20 @@ static int _dpu_rm_reserve_lms(struct dpu_rm *rm,
int lm_idx[MAX_BLOCKS];
int pp_idx[MAX_BLOCKS];
int dspp_idx[MAX_BLOCKS] = {0};
int i, lm_count = 0;
int i, j, lm_count = 0;
int total_available = 0;

if (!topology->num_lm) {
DPU_ERROR("invalid number of lm: %d\n", topology->num_lm);
return -EINVAL;
}

/* Count available mixers */
for (i = 0; i < ARRAY_SIZE(rm->mixer_blks); i++) {
if (rm->mixer_blks[i])
total_available++;
}

/* Find a primary mixer */
for (i = 0; i < ARRAY_SIZE(rm->mixer_blks) &&
lm_count < topology->num_lm; i++) {
Expand Down Expand Up @@ -409,7 +416,8 @@ static int _dpu_rm_reserve_lms(struct dpu_rm *rm,
}

if (lm_count != topology->num_lm) {
DPU_DEBUG("unable to find appropriate mixers\n");
DPU_ERROR("unable to find appropriate mixers (found %d, needed %d)\n",
lm_count, topology->num_lm);
return -ENAVAIL;
}

Expand Down Expand Up @@ -670,13 +678,33 @@ static int _dpu_rm_make_reservation(
struct msm_display_topology *topology)
{
int ret;
int orig_num_lm = topology->num_lm;
bool fallback_used = false;

/* First try with requested number of layer mixers */
ret = _dpu_rm_reserve_lms(rm, global_state, crtc_id, topology);
if (ret) {

/* If that fails and more than 1 LM was requested, try with just 1 LM */
if (ret && (orig_num_lm > 1)) {
DPU_DEBUG("Falling back to single layer mixer for crtc_id=%u\n", crtc_id);
topology->num_lm = 1;
fallback_used = true;
ret = _dpu_rm_reserve_lms(rm, global_state, crtc_id, topology);
if (ret) {
topology->num_lm = orig_num_lm;
DPU_ERROR("unable to find appropriate mixers, even with fallback\n");
return ret;
}
} else if (ret) {
DPU_ERROR("unable to find appropriate mixers\n");
return ret;
}

/* Only restore original value if we didn't use fallback */
if (!fallback_used) {
topology->num_lm = orig_num_lm;
}

if (topology->cwb_enabled) {
ret = _dpu_rm_reserve_cwb_mux_and_pingpongs(rm, global_state,
crtc_id, topology);
Expand Down