aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/files/0108-drm-amdgpu-rename-fiji_smumgr.h-to-fiji_smum.h.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/files/0108-drm-amdgpu-rename-fiji_smumgr.h-to-fiji_smum.h.patch')
-rw-r--r--common/recipes-kernel/linux/files/0108-drm-amdgpu-rename-fiji_smumgr.h-to-fiji_smum.h.patch145
1 files changed, 145 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0108-drm-amdgpu-rename-fiji_smumgr.h-to-fiji_smum.h.patch b/common/recipes-kernel/linux/files/0108-drm-amdgpu-rename-fiji_smumgr.h-to-fiji_smum.h.patch
new file mode 100644
index 00000000..b302713e
--- /dev/null
+++ b/common/recipes-kernel/linux/files/0108-drm-amdgpu-rename-fiji_smumgr.h-to-fiji_smum.h.patch
@@ -0,0 +1,145 @@
+From 83ba8f33769d81ed8790936bd8fb55b23742eb92 Mon Sep 17 00:00:00 2001
+From: Jammy Zhou <Jammy.Zhou@amd.com>
+Date: Wed, 21 Oct 2015 17:18:10 +0800
+Subject: [PATCH 0108/1110] drm/amdgpu: rename fiji_smumgr.h to fiji_smum.h
+
+This conflicts with fiji_smumgr.h from powerplay
+in DKMS environment
+
+Signed-off-by: Jammy Zhou <Jammy.Zhou@amd.com>
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Jordan Lazare <Jordan.Lazare@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/fiji_dpm.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/fiji_smc.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/fiji_smum.h | 42 ++++++++++++++++++++++++++++++++
+ drivers/gpu/drm/amd/amdgpu/fiji_smumgr.h | 42 --------------------------------
+ 4 files changed, 44 insertions(+), 44 deletions(-)
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/fiji_smum.h
+ delete mode 100644 drivers/gpu/drm/amd/amdgpu/fiji_smumgr.h
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/fiji_dpm.c b/drivers/gpu/drm/amd/amdgpu/fiji_dpm.c
+index 8f9845d..4b0e45a 100644
+--- a/drivers/gpu/drm/amd/amdgpu/fiji_dpm.c
++++ b/drivers/gpu/drm/amd/amdgpu/fiji_dpm.c
+@@ -24,7 +24,7 @@
+ #include <linux/firmware.h>
+ #include "drmP.h"
+ #include "amdgpu.h"
+-#include "fiji_smumgr.h"
++#include "fiji_smum.h"
+
+ MODULE_FIRMWARE("amdgpu/fiji_smc.bin");
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/fiji_smc.c b/drivers/gpu/drm/amd/amdgpu/fiji_smc.c
+index bda1249..e35340a 100644
+--- a/drivers/gpu/drm/amd/amdgpu/fiji_smc.c
++++ b/drivers/gpu/drm/amd/amdgpu/fiji_smc.c
+@@ -25,7 +25,7 @@
+ #include "drmP.h"
+ #include "amdgpu.h"
+ #include "fiji_ppsmc.h"
+-#include "fiji_smumgr.h"
++#include "fiji_smum.h"
+ #include "smu_ucode_xfer_vi.h"
+ #include "amdgpu_ucode.h"
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/fiji_smum.h b/drivers/gpu/drm/amd/amdgpu/fiji_smum.h
+new file mode 100644
+index 0000000..1cef03d
+--- /dev/null
++++ b/drivers/gpu/drm/amd/amdgpu/fiji_smum.h
+@@ -0,0 +1,42 @@
++/*
++ * Copyright 2014 Advanced Micro Devices, Inc.
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a
++ * copy of this software and associated documentation files (the "Software"),
++ * to deal in the Software without restriction, including without limitation
++ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
++ * and/or sell copies of the Software, and to permit persons to whom the
++ * Software is furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
++ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
++ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
++ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++ * OTHER DEALINGS IN THE SOFTWARE.
++ *
++ */
++
++#ifndef FIJI_SMUMGR_H
++#define FIJI_SMUMGR_H
++
++#include "fiji_ppsmc.h"
++
++int fiji_smu_init(struct amdgpu_device *adev);
++int fiji_smu_fini(struct amdgpu_device *adev);
++int fiji_smu_start(struct amdgpu_device *adev);
++
++struct fiji_smu_private_data
++{
++ uint8_t *header;
++ uint32_t smu_buffer_addr_high;
++ uint32_t smu_buffer_addr_low;
++ uint32_t header_addr_high;
++ uint32_t header_addr_low;
++};
++
++#endif
+diff --git a/drivers/gpu/drm/amd/amdgpu/fiji_smumgr.h b/drivers/gpu/drm/amd/amdgpu/fiji_smumgr.h
+deleted file mode 100644
+index 1cef03d..0000000
+--- a/drivers/gpu/drm/amd/amdgpu/fiji_smumgr.h
++++ /dev/null
+@@ -1,42 +0,0 @@
+-/*
+- * Copyright 2014 Advanced Micro Devices, Inc.
+- *
+- * Permission is hereby granted, free of charge, to any person obtaining a
+- * copy of this software and associated documentation files (the "Software"),
+- * to deal in the Software without restriction, including without limitation
+- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+- * and/or sell copies of the Software, and to permit persons to whom the
+- * Software is furnished to do so, subject to the following conditions:
+- *
+- * The above copyright notice and this permission notice shall be included in
+- * all copies or substantial portions of the Software.
+- *
+- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+- * OTHER DEALINGS IN THE SOFTWARE.
+- *
+- */
+-
+-#ifndef FIJI_SMUMGR_H
+-#define FIJI_SMUMGR_H
+-
+-#include "fiji_ppsmc.h"
+-
+-int fiji_smu_init(struct amdgpu_device *adev);
+-int fiji_smu_fini(struct amdgpu_device *adev);
+-int fiji_smu_start(struct amdgpu_device *adev);
+-
+-struct fiji_smu_private_data
+-{
+- uint8_t *header;
+- uint32_t smu_buffer_addr_high;
+- uint32_t smu_buffer_addr_low;
+- uint32_t header_addr_high;
+- uint32_t header_addr_low;
+-};
+-
+-#endif
+--
+2.7.4
+