diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0440-drm-amdgpu-do-not-store-bios_header_start-in-amdgpu_.patch')
-rw-r--r-- | common/recipes-kernel/linux/files/0440-drm-amdgpu-do-not-store-bios_header_start-in-amdgpu_.patch | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0440-drm-amdgpu-do-not-store-bios_header_start-in-amdgpu_.patch b/common/recipes-kernel/linux/files/0440-drm-amdgpu-do-not-store-bios_header_start-in-amdgpu_.patch new file mode 100644 index 00000000..a78f4a37 --- /dev/null +++ b/common/recipes-kernel/linux/files/0440-drm-amdgpu-do-not-store-bios_header_start-in-amdgpu_.patch @@ -0,0 +1,61 @@ +From 318d244b7d2acce4b4e85b9f4cc97534c69e2a64 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Nils=20Wallm=C3=A9nius?= <nils.wallmenius@gmail.com> +Date: Sat, 19 Mar 2016 16:12:13 +0100 +Subject: [PATCH 0440/1110] drm/amdgpu: do not store bios_header_start in + amdgpu_device +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +It is only used locally in amdgpu_get_bios + +Signed-off-by: Nils Wallménius <nils.wallmenius@gmail.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 8 ++++---- + 2 files changed, 4 insertions(+), 5 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +index 829e124..ce1638c 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +@@ -1929,7 +1929,6 @@ struct amdgpu_device { + /* BIOS */ + uint8_t *bios; + bool is_atom_bios; +- uint16_t bios_header_start; + struct amdgpu_bo *stollen_vga_memory; + uint32_t bios_scratch[AMDGPU_BIOS_NUM_SCRATCH]; + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c +index 80add22..99ca75b 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c +@@ -349,7 +349,7 @@ static inline bool amdgpu_acpi_vfct_bios(struct amdgpu_device *adev) + bool amdgpu_get_bios(struct amdgpu_device *adev) + { + bool r; +- uint16_t tmp; ++ uint16_t tmp, bios_header_start; + + r = amdgpu_atrm_get_bios(adev); + if (r == false) +@@ -383,11 +383,11 @@ bool amdgpu_get_bios(struct amdgpu_device *adev) + goto free_bios; + } + +- adev->bios_header_start = RBIOS16(0x48); +- if (!adev->bios_header_start) { ++ bios_header_start = RBIOS16(0x48); ++ if (!bios_header_start) { + goto free_bios; + } +- tmp = adev->bios_header_start + 4; ++ tmp = bios_header_start + 4; + if (!memcmp(adev->bios + tmp, "ATOM", 4) || + !memcmp(adev->bios + tmp, "MOTA", 4)) { + adev->is_atom_bios = true; +-- +2.7.4 + |