diff options
author | Maxime Ripard <mripard@kernel.org> | 2024-02-26 17:23:00 +0300 |
---|---|---|
committer | Maxime Ripard <mripard@kernel.org> | 2024-02-26 17:23:00 +0300 |
commit | 2f910859724b53f1cd3579246e3d9bebb16d78b8 (patch) | |
tree | 75cd2329b7e737865bf28ea734a2e0649c02a5bf /drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | |
parent | 86bf8cfda6d2a6720fa2e6e676c98f0882c9d3d7 (diff) | |
parent | 72fa02fdf83306c52bc1eede28359e3fa32a151a (diff) | |
download | linux-2f910859724b53f1cd3579246e3d9bebb16d78b8.tar.xz |
Merge drm/drm-fixes into drm-misc-fixes
Sima needs a more recent release to apply a patch.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c index 08916538a615..8db880244324 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c @@ -221,8 +221,23 @@ static struct attribute *amdgpu_vram_mgr_attributes[] = { NULL }; +static umode_t amdgpu_vram_attrs_is_visible(struct kobject *kobj, + struct attribute *attr, int i) +{ + struct device *dev = kobj_to_dev(kobj); + struct drm_device *ddev = dev_get_drvdata(dev); + struct amdgpu_device *adev = drm_to_adev(ddev); + + if (attr == &dev_attr_mem_info_vram_vendor.attr && + !adev->gmc.vram_vendor) + return 0; + + return attr->mode; +} + const struct attribute_group amdgpu_vram_mgr_attr_group = { - .attrs = amdgpu_vram_mgr_attributes + .attrs = amdgpu_vram_mgr_attributes, + .is_visible = amdgpu_vram_attrs_is_visible }; /** |