drm/amd/amdgpu: stored bios_size
Subsystems (3)
PATCH 1/2 drm/amd/amdgpu: stored bios_size
From: Evan Quan <[email protected]>
It's necessary if we want to export vbios image out.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 6 ++++++ 2 files changed, 7 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -0
@@ -1330,6 +1330,7 @@ struct amdgpu_device {/* BIOS */ uint8_t *bios; +uint32_t bios_size;bool is_atom_bios;struct amdgpu_bo *stollen_vga_memory;uint32_t bios_scratch[AMDGPU_BIOS_NUM_SCRATCH ];
drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c +6 -0
@@ -74,6 +74,7 @@ static bool igp_read_bios_from_vram(struct amdgpu_device *adev)iounmap (bios);return false; } + adev->bios_size = size;memcpy_fromio (adev->bios, bios, size);iounmap (bios);return true;
@@ -103,6 +104,7 @@ bool amdgpu_read_bios(struct amdgpu_device *adev)pci_unmap_rom (adev->pdev, bios);return false; } + adev->bios_size = size;memcpy_fromio (adev->bios, bios, size);pci_unmap_rom (adev->pdev, bios);return true;
@@ -135,6 +137,7 @@ static bool amdgpu_read_bios_from_rom(struct amdgpu_device *adev)DRM_ERROR ("no memory to allocate for BIOS\n" );return false; } + adev->bios_size = len;/* read complete BIOS */ return amdgpu_asic_read_bios_from_rom (adev, adev->bios, len);
@@ -159,6 +162,7 @@ static bool amdgpu_read_platform_bios(struct amdgpu_device *adev)if (adev->bios ==NULL ) {return false; } + adev->bios_size = size;return true; }
@@ -273,6 +277,7 @@ static bool amdgpu_atrm_get_bios(struct amdgpu_device *adev)kfree (adev->bios); return false; } + adev->bios_size = size;return true; }#else
@@ -334,6 +339,7 @@ static bool amdgpu_acpi_vfct_bios(struct amdgpu_device *adev) } adev->bios =kmemdup (&vbios->VbiosContent, vhdr->ImageLength,GFP_KERNEL ); + adev->bios_size = vhdr->ImageLength; ret = !!adev->bios; out_unmap:
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1481138544-32505-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org
PATCH 2/2 drm/amd/amdgpu: export vbios information (v2)
From: Evan Quan <[email protected]>
Allows userspace components to fetch information from the vbios image.
v2: agd: fix warning
--- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 26 ++++++++++++++++++++++++++ include/uapi/drm/amdgpu_drm.h | 11 +++++++++++ 2 files changed, 37 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +26 -0
@@ -544,6 +544,32 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_filereturn copy_to_user (out, &vce_clk_table,min ((size_t )size,sizeof (vce_clk_table))) ? -EFAULT :0 ; } +case AMDGPU_INFO_VBIOS : { +uint32_t bios_size = adev->bios_size; + +switch (info->vbios_info.type) { +case AMDGPU_INFO_VBIOS_SIZE : +return copy_to_user (out, &bios_size, +min ((size_t )size,sizeof (bios_size))) + ? -EFAULT :0 ; +case AMDGPU_INFO_VBIOS_IMAGE : { +uint8_t *bios; +uint32_t bios_offset = info->vbios_info.offset; + +if (bios_offset >= bios_size) +return -EINVAL ; + + bios = adev->bios + bios_offset; +return copy_to_user (out, bios, +min ((size_t )size, (size_t )(bios_size - bios_offset))) + ? -EFAULT :0 ; + } +default : +DRM_DEBUG_KMS ("Invalid request %d\n" , + info->vbios_info.type); +return -EINVAL ; + } + }default :DRM_DEBUG_KMS ("Invalid request %d\n" , info->query);return -EINVAL ;
include/uapi/drm/amdgpu_drm.h +11 -0
@@ -522,6 +522,12 @@ struct drm_amdgpu_cs_chunk_data {#define AMDGPU_INFO_MEMORY 0x19/* Query vce clock table */ #define AMDGPU_INFO_VCE_CLOCK_TABLE 0x1A +/* Query vbios related information */ +#define AMDGPU_INFO_VBIOS 0x1B +/* Subquery id: Query vbios size */ +#define AMDGPU_INFO_VBIOS_SIZE 0x1 +/* Subquery id: Query vbios image */ +#define AMDGPU_INFO_VBIOS_IMAGE 0x2#define AMDGPU_INFO_MMR_SE_INDEX_SHIFT 0#define AMDGPU_INFO_MMR_SE_INDEX_MASK 0xff
@@ -580,6 +586,11 @@ struct drm_amdgpu_info { } read_mmr_reg;struct drm_amdgpu_query_fw query_fw; + +struct { +__u32 type; +__u32 offset; + } vbios_info; }; };
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
1&2 are Reviewed-by: Edward O'Callaghan <[email protected]>
Quoted 71 lines · Alex Deucher
From: Evan Quan <[email protected]>
It's necessary if we want to export vbios image out.
Signed-off-by Evan Quan <[email protected]>Reviewed-by Alex Deucher <[email protected]>Reviewed-by Christian Koenig <[email protected]>Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 6 ++++++ 2 files changed, 7 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu.h +1
-0@@ -1330,6 +1330,7 @@ struct amdgpu_device {/* BIOS */ uint8_t *bios; +uint32_t bios_size;bool is_atom_bios;struct amdgpu_bo *stollen_vga_memory;uint32_t bios_scratch[AMDGPU_BIOS_NUM_SCRATCH ];drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c +5
-0@@ -74,6 +74,7 @@ static bool igp_read_bios_from_vram(struct amdgpu_device *adev)iounmap (bios);return false; } + adev->bios_size = size;memcpy_fromio (adev->bios, bios, size);iounmap (bios);return true;@@ -103,6 +104,7 @@ bool amdgpu_read_bios(struct amdgpu_device *adev)pci_unmap_rom (adev->pdev, bios);return false; } + adev->bios_size = size;memcpy_fromio (adev->bios, bios, size);pci_unmap_rom (adev->pdev, bios);return true;@@ -135,6 +137,7 @@ static bool amdgpu_read_bios_from_rom(struct amdgpu_device *adev)DRM_ERROR ("no memory to allocate for BIOS\n" );return false; } + adev->bios_size = len;/* read complete BIOS */ return amdgpu_asic_read_bios_from_rom (adev, adev->bios, len);@@ -159,6 +162,7 @@ static bool amdgpu_read_platform_bios(struct amdgpu_device *adev)if (adev->bios ==NULL ) {return false; } + adev->bios_size = size;return true; }@@ -273,6 +277,7 @@ static bool amdgpu_atrm_get_bios(struct amdgpu_device *adev)kfree (adev->bios); return false; } + adev->bios_size = size;return true; }#else
drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c static bool amdgpu_acpi_vfct_bios(struct amdgpu_device *adev) · line 345
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c +1
-0@@ -334,6 +339,7 @@ static bool amdgpu_acpi_vfct_bios(struct amdgpu_device *adev) } adev->bios =kmemdup (&vbios->VbiosContent, vhdr->ImageLength,GFP_KERNEL ); + adev->bios_size = vhdr->ImageLength; ret = !!adev->bios; out_unmap:
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx