Skip to content

KMS stale dlist alloc changes #5684

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
merged 6 commits into from
Nov 6, 2023
Merged

KMS stale dlist alloc changes #5684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
93d446c
drm/vc4: Correct logic on stopping an HVS channel
6by9 Oct 26, 2023
d255a4b
drm/vc4: Drop WARN for HVS FIFOs not being empty
6by9 Oct 26, 2023
0e4fbc1
drm/vc4: Free all stale dlists if channel is disabled
6by9 Oct 26, 2023
f8f3842
drm/vc4: Add hvs_dlist_allocs debugfs function.
6by9 Oct 27, 2023
24faf9e
drm/vc4: Log the size of the dlist allocation that was attempted
6by9 Oct 31, 2023
1636550
Merge branch 'rpi-6.1.y' into rpi-6.1.y-2712
6by9 Nov 6, 2023
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
2 changes: 2 additions & 0 deletions drivers/gpu/drm/vc4/vc4_crtc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,6 +660,8 @@ static void vc4_crtc_atomic_disable(struct drm_crtc *crtc,

vc4_crtc_disable(crtc, encoder, state, old_vc4_state->assigned_channel);

vc4_hvs_atomic_disable(crtc, state);

/*
* Make sure we issue a vblank event after disabling the CRTC if
* someone was waiting it.
Expand Down
79 changes: 66 additions & 13 deletions drivers/gpu/drm/vc4/vc4_hvs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,36 @@ static int vc5_hvs_debugfs_gamma(struct seq_file *m, void *data)
return 0;
}

static int vc4_hvs_debugfs_dlist_allocs(struct seq_file *m, void *data)
{
struct drm_info_node *node = m->private;
struct drm_device *dev = node->minor->dev;
struct vc4_dev *vc4 = to_vc4_dev(dev);
struct vc4_hvs *hvs = vc4->hvs;
struct drm_printer p = drm_seq_file_printer(m);
struct vc4_hvs_dlist_allocation *cur, *next;
struct drm_mm_node *mm_node;
unsigned long flags;

spin_lock_irqsave(&hvs->mm_lock, flags);

drm_printf(&p, "Allocated nodes:\n");
list_for_each_entry(mm_node, drm_mm_nodes(&hvs->dlist_mm), node_list) {
drm_printf(&p, "node [%08llx + %08llx]\n", mm_node->start, mm_node->size);
}

drm_printf(&p, "Stale nodes:\n");
list_for_each_entry_safe(cur, next, &hvs->stale_dlist_entries, node) {
drm_printf(&p, "node [%08llx + %08llx] channel %u frcnt %u\n",
cur->mm_node.start, cur->mm_node.size, cur->channel,
cur->target_frame_count);
}

spin_unlock_irqrestore(&hvs->mm_lock, flags);

return 0;
}

/* The filter kernel is composed of dwords each containing 3 9-bit
* signed integers packed next to each other.
*/
Expand Down Expand Up @@ -629,7 +659,8 @@ vc4_hvs_alloc_dlist_entry(struct vc4_hvs *hvs,
dlist_count);
spin_unlock_irqrestore(&hvs->mm_lock, flags);
if (ret) {
drm_err(dev, "Failed to allocate DLIST entry: %d\n", ret);
drm_err(dev, "Failed to allocate DLIST entry. Requested size=%zu. ret=%d\n",
dlist_count, ret);
return ERR_PTR(ret);
}

Expand Down Expand Up @@ -697,7 +728,8 @@ static void vc4_hvs_schedule_dlist_sweep(struct vc4_hvs *hvs,
if (!list_empty(&hvs->stale_dlist_entries))
queue_work(system_unbound_wq, &hvs->free_dlist_work);

vc4_hvs_irq_clear_eof(hvs, channel);
if (list_empty(&hvs->stale_dlist_entries))
vc4_hvs_irq_clear_eof(hvs, channel);

spin_unlock_irqrestore(&hvs->mm_lock, flags);
}
Expand All @@ -712,6 +744,27 @@ static bool vc4_hvs_frcnt_lte(u8 cnt1, u8 cnt2)
return (s8)((cnt1 << 2) - (cnt2 << 2)) <= 0;
}

bool vc4_hvs_check_channel_active(struct vc4_hvs *hvs, unsigned int fifo)
{
struct vc4_dev *vc4 = hvs->vc4;
struct drm_device *drm = &vc4->base;
bool enabled = false;
int idx;

WARN_ON_ONCE(vc4->gen > VC4_GEN_6);

if (!drm_dev_enter(drm, &idx))
return 0;

if (vc4->gen >= VC4_GEN_6)
enabled = HVS_READ(SCALER6_DISPX_CTRL0(fifo)) & SCALER6_DISPX_CTRL0_ENB;
else
enabled = HVS_READ(SCALER_DISPCTRLX(fifo)) & SCALER_DISPCTRLX_ENABLE;

drm_dev_exit(idx);
return enabled;
}

/*
* Some atomic commits (legacy cursor updates, mostly) will not wait for
* the next vblank and will just return once the commit has been pushed
Expand Down Expand Up @@ -746,7 +799,8 @@ static void vc4_hvs_dlist_free_work(struct work_struct *work)
u8 frcnt;

frcnt = vc4_hvs_get_fifo_frame_count(hvs, cur->channel);
if (!vc4_hvs_frcnt_lte(cur->target_frame_count, frcnt))
if (vc4_hvs_check_channel_active(hvs, cur->channel) &&
!vc4_hvs_frcnt_lte(cur->target_frame_count, frcnt))
continue;

vc4_hvs_free_dlist_entry_locked(hvs, cur);
Expand Down Expand Up @@ -992,13 +1046,11 @@ static void __vc4_hvs_stop_channel(struct vc4_hvs *hvs, unsigned int chan)
if (!drm_dev_enter(drm, &idx))
return;

if (HVS_READ(SCALER_DISPCTRLX(chan)) & SCALER_DISPCTRLX_ENABLE)
if (!(HVS_READ(SCALER_DISPCTRLX(chan)) & SCALER_DISPCTRLX_ENABLE))
goto out;

HVS_WRITE(SCALER_DISPCTRLX(chan),
HVS_READ(SCALER_DISPCTRLX(chan)) | SCALER_DISPCTRLX_RESET);
HVS_WRITE(SCALER_DISPCTRLX(chan),
HVS_READ(SCALER_DISPCTRLX(chan)) & ~SCALER_DISPCTRLX_ENABLE);
HVS_WRITE(SCALER_DISPCTRLX(chan), SCALER_DISPCTRLX_RESET);
HVS_WRITE(SCALER_DISPCTRLX(chan), 0);

/* Once we leave, the scaler should be disabled and its fifo empty. */
WARN_ON_ONCE(HVS_READ(SCALER_DISPCTRLX(chan)) & SCALER_DISPCTRLX_RESET);
Expand All @@ -1007,10 +1059,6 @@ static void __vc4_hvs_stop_channel(struct vc4_hvs *hvs, unsigned int chan)
SCALER_DISPSTATX_MODE) !=
SCALER_DISPSTATX_MODE_DISABLED);

WARN_ON_ONCE((HVS_READ(SCALER_DISPSTATX(chan)) &
(SCALER_DISPSTATX_FULL | SCALER_DISPSTATX_EMPTY)) !=
SCALER_DISPSTATX_EMPTY);

out:
drm_dev_exit(idx);
}
Expand All @@ -1026,7 +1074,7 @@ static void __vc6_hvs_stop_channel(struct vc4_hvs *hvs, unsigned int chan)
if (!drm_dev_enter(drm, &idx))
return;

if (HVS_READ(SCALER6_DISPX_CTRL0(chan)) & SCALER6_DISPX_CTRL0_ENB)
if (!(HVS_READ(SCALER6_DISPX_CTRL0(chan)) & SCALER6_DISPX_CTRL0_ENB))
goto out;

HVS_WRITE(SCALER6_DISPX_CTRL0(chan),
Expand Down Expand Up @@ -1585,6 +1633,11 @@ int vc4_hvs_debugfs_init(struct drm_minor *minor)
if (ret)
return ret;

ret = vc4_debugfs_add_file(minor, "hvs_dlist_allocs",
vc4_hvs_debugfs_dlist_allocs, NULL);
if (ret)
return ret;

ret = vc4_debugfs_add_regset32(minor, "hvs_regs",
&hvs->regset);
if (ret)
Expand Down