Skip to content

Commit

Permalink
drm/vc4: drv: Skip BO Backend Initialization on BCM2711
Browse files Browse the repository at this point in the history
On the BCM2711, we currently call the vc4_bo_cache_init() and
vc4_gem_init() functions. These functions initialize the BO and GEM
backends.

However, this code was initially created to accomodate the requirements
of the GPU on the older SoCs, while the BCM2711 has a separate driver
for it. So let's just skip these calls when we're on a newer hardware.

Reviewed-by: Melissa Wen <mwen@igalia.com>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Link: https://lore.kernel.org/r/20220610115149.964394-9-maxime@cerno.tech
  • Loading branch information
Maxime Ripard committed Jun 16, 2022
1 parent 2095848 commit 257add9
Showing 1 changed file with 11 additions and 7 deletions.
18 changes: 11 additions & 7 deletions drivers/gpu/drm/vc4/vc4_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -285,19 +285,23 @@ static int vc4_drm_bind(struct device *dev)
platform_set_drvdata(pdev, drm);
INIT_LIST_HEAD(&vc4->debugfs_list);

mutex_init(&vc4->bin_bo_lock);
if (!is_vc5) {
mutex_init(&vc4->bin_bo_lock);

ret = vc4_bo_cache_init(drm);
if (ret)
return ret;
ret = vc4_bo_cache_init(drm);
if (ret)
return ret;
}

ret = drmm_mode_config_init(drm);
if (ret)
return ret;

ret = vc4_gem_init(drm);
if (ret)
return ret;
if (!is_vc5) {
ret = vc4_gem_init(drm);
if (ret)
return ret;
}

node = of_find_compatible_node(NULL, NULL, "raspberrypi,bcm2835-firmware");
if (node) {
Expand Down

0 comments on commit 257add9

Please sign in to comment.