raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-08 02:49:48 +00:00
Code Issues Projects Releases Wiki Activity

Revert "drm/vc4: hvs: Print error if we fail an allocation"

Browse Source 
This reverts commit 582e6e60fc.
This commit is contained in:
Dave Stevenson
2024-12-02 16:51:45 +00:00
parent 68c7de3e9c
commit 0807a70b66
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/vc4/vc4_hvs.c
View File

@@ -441,8 +441,6 @@ vc4_hvs_alloc_dlist_entry(struct vc4_hvs *hvs,
unsigned int channel, unsigned int channel,
size_t dlist_count) size_t dlist_count)
{ {
struct vc4_dev *vc4 = hvs->vc4;
struct drm_device *dev = &vc4->base;
struct vc4_hvs_dlist_allocation *alloc; struct vc4_hvs_dlist_allocation *alloc;
unsigned long flags; unsigned long flags;
int ret; int ret;
@@ -460,10 +458,8 @@ vc4_hvs_alloc_dlist_entry(struct vc4_hvs *hvs,
ret = drm_mm_insert_node(&hvs->dlist_mm, &alloc->mm_node, ret = drm_mm_insert_node(&hvs->dlist_mm, &alloc->mm_node,
dlist_count); dlist_count);
spin_unlock_irqrestore(&hvs->mm_lock, flags); spin_unlock_irqrestore(&hvs->mm_lock, flags);
if (ret) { if (ret)
drm_err(dev, "Failed to allocate DLIST entry: %d\n", ret);
return ERR_PTR(ret); return ERR_PTR(ret);
}
alloc->channel = channel; alloc->channel = channel;

7
drivers/gpu/drm/vc4/vc4_plane.c
View File

@@ -733,8 +733,7 @@ static void vc4_plane_calc_load(struct drm_plane_state *state)
static int vc4_plane_allocate_lbm(struct drm_plane_state *state) static int vc4_plane_allocate_lbm(struct drm_plane_state *state)
{ {
struct drm_device *drm = state->plane->dev; struct vc4_dev *vc4 = to_vc4_dev(state->plane->dev);
struct vc4_dev *vc4 = to_vc4_dev(drm);
struct vc4_plane_state *vc4_state = to_vc4_plane_state(state); struct vc4_plane_state *vc4_state = to_vc4_plane_state(state);
unsigned long irqflags; unsigned long irqflags;
u32 lbm_size; u32 lbm_size;
@@ -760,10 +759,8 @@ static int vc4_plane_allocate_lbm(struct drm_plane_state *state)
0, 0); 0, 0);
spin_unlock_irqrestore(&vc4->hvs->mm_lock, irqflags); spin_unlock_irqrestore(&vc4->hvs->mm_lock, irqflags);
if (ret) { if (ret)
drm_err(drm, "Failed to allocate LBM entry: %d\n", ret);
return ret; return ret;
}
} else { } else {
WARN_ON_ONCE(lbm_size != vc4_state->lbm.size); WARN_ON_ONCE(lbm_size != vc4_state->lbm.size);
} }