mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-15 23:41:35 -04:00
drm/msm: Use of_reserved_mem_region_to_resource() for "memory-region"
Use the newly added of_reserved_mem_region_to_resource() function to handle "memory-region" properties. The original code did not set 'zap_available' to false if of_address_to_resource() failed which seems like an oversight. Signed-off-by: Rob Herring (Arm) <robh@kernel.org> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> Patchwork: https://patchwork.freedesktop.org/patch/662275/ Link: https://lore.kernel.org/r/20250703183442.2073717-1-robh@kernel.org [DB: dropped part related to VRAM, no longer applicable] Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
This commit is contained in:
committed by
Dmitry Baryshkov
parent
f3b649d7a5
commit
fb53e8f09f
@@ -10,7 +10,7 @@
|
||||
#include <linux/interconnect.h>
|
||||
#include <linux/firmware/qcom/qcom_scm.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/of_address.h>
|
||||
#include <linux/of_reserved_mem.h>
|
||||
#include <linux/pm_opp.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/soc/qcom/mdt_loader.h>
|
||||
@@ -33,7 +33,7 @@ static int zap_shader_load_mdt(struct msm_gpu *gpu, const char *fwname,
|
||||
struct device *dev = &gpu->pdev->dev;
|
||||
const struct firmware *fw;
|
||||
const char *signed_fwname = NULL;
|
||||
struct device_node *np, *mem_np;
|
||||
struct device_node *np;
|
||||
struct resource r;
|
||||
phys_addr_t mem_phys;
|
||||
ssize_t mem_size;
|
||||
@@ -51,18 +51,11 @@ static int zap_shader_load_mdt(struct msm_gpu *gpu, const char *fwname,
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
mem_np = of_parse_phandle(np, "memory-region", 0);
|
||||
of_node_put(np);
|
||||
if (!mem_np) {
|
||||
ret = of_reserved_mem_region_to_resource(np, 0, &r);
|
||||
if (ret) {
|
||||
zap_available = false;
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
ret = of_address_to_resource(mem_np, 0, &r);
|
||||
of_node_put(mem_np);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
}
|
||||
mem_phys = r.start;
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user