Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions drivers/gpu/drm/v3d/v3d_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ module_param_named(super_pages, super_pages, bool, 0400);
MODULE_PARM_DESC(super_pages, "Enable/Disable Super Pages support.");
#endif

bool debug_mmu;
module_param(debug_mmu, bool, 0644);
MODULE_PARM_DESC(debug_mmu, "Enable/Disable MMU error logging");

static int v3d_get_param_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv)
{
Expand Down
1 change: 1 addition & 0 deletions drivers/gpu/drm/v3d/v3d_drv.h
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,7 @@ int v3d_submit_cpu_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);

/* v3d_irq.c */
extern bool debug_mmu;
int v3d_irq_init(struct v3d_dev *v3d);
void v3d_irq_enable(struct v3d_dev *v3d);
void v3d_irq_disable(struct v3d_dev *v3d);
Expand Down
24 changes: 13 additions & 11 deletions drivers/gpu/drm/v3d/v3d_irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ v3d_hub_irq(int irq, void *arg)
"GMP",
};
const char *client = "?";
static int logged_error;
static bool logged_error;

V3D_WRITE(V3D_MMU_CTL, V3D_READ(V3D_MMU_CTL));

Expand All @@ -193,16 +193,18 @@ v3d_hub_irq(int irq, void *arg)
client = v3d41_axi_ids[axi_id];
}

if (!logged_error)
dev_err(v3d->drm.dev, "MMU error from client %s (%d) at 0x%llx%s%s%s\n",
client, axi_id, (long long)vio_addr,
((intsts & V3D_HUB_INT_MMU_WRV) ?
", write violation" : ""),
((intsts & V3D_HUB_INT_MMU_PTI) ?
", pte invalid" : ""),
((intsts & V3D_HUB_INT_MMU_CAP) ?
", cap exceeded" : ""));
logged_error = 1;
if (!logged_error || debug_mmu) {
dev_err(v3d->drm.dev, "MMU error from client %s (%d) at 0x%llx%s%s%s\n",
client, axi_id, (long long)vio_addr,
((intsts & V3D_HUB_INT_MMU_WRV) ?
", write violation" : ""),
((intsts & V3D_HUB_INT_MMU_PTI) ?
", pte invalid" : ""),
((intsts & V3D_HUB_INT_MMU_CAP) ?
", cap exceeded" : ""));
}
logged_error = true;

status = IRQ_HANDLED;
}

Expand Down