diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3739-drm-amdgpu-fix-ras-parameter-descriptions.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3739-drm-amdgpu-fix-ras-parameter-descriptions.patch | 90 |
1 files changed, 90 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3739-drm-amdgpu-fix-ras-parameter-descriptions.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3739-drm-amdgpu-fix-ras-parameter-descriptions.patch new file mode 100644 index 00000000..ccc5360b --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3739-drm-amdgpu-fix-ras-parameter-descriptions.patch @@ -0,0 +1,90 @@ +From fa640b07a935631c88d0f6abe773890c0e08d913 Mon Sep 17 00:00:00 2001 +From: Evan Quan <evan.quan@amd.com> +Date: Thu, 7 Mar 2019 14:46:38 +0800 +Subject: [PATCH 3739/4256] drm/amdgpu: fix ras parameter descriptions + +The descriptions of modinfo wrongly show two parameters +for each feature(see below). This patch can fix this +incorrect outputs. + +parm: amdgpu_ras_enable:Enable RAS features on the GPU (0 = disable, 1 = enable, -1 = auto (default)) +parm: ras_enable:int +parm: amdgpu_ras_mask:Mask of RAS features to enable (default 0xffffffff), only valid when ras_enable == 1 +parm: ras_mask:uint + +Signed-off-by: Evan Quan <evan.quan@amd.com> +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +Reviewed-by: xinhui pan <xinhui.pan@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 8 +++--- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c.rej | 30 +++++++++++++++++++++ + 2 files changed, 34 insertions(+), 4 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c.rej + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +index 3aa7c136d2c3..511fd4649796 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +@@ -529,18 +529,18 @@ MODULE_PARM_DESC(emu_mode, "Emulation mode, (1 = enable, 0 = disable)"); + module_param_named(emu_mode, amdgpu_emu_mode, int, 0444); + + /* +- * DOC: amdgpu_ras_enable (int) ++ * DOC: ras_enable (int) + * Enable RAS features on the GPU (0 = disable, 1 = enable, -1 = auto (default)) + */ +-MODULE_PARM_DESC(amdgpu_ras_enable, "Enable RAS features on the GPU (0 = disable, 1 = enable, -1 = auto (default))"); ++MODULE_PARM_DESC(ras_enable, "Enable RAS features on the GPU (0 = disable, 1 = enable, -1 = auto (default))"); + module_param_named(ras_enable, amdgpu_ras_enable, int, 0444); + + /** +- * DOC: amdgpu_ras_mask (uint) ++ * DOC: ras_mask (uint) + * Mask of RAS features to enable (default 0xffffffff), only valid when ras_enable == 1 + * See the flags in drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h + */ +-MODULE_PARM_DESC(amdgpu_ras_mask, "Mask of RAS features to enable (default 0xffffffff), only valid when ras_enable == 1"); ++MODULE_PARM_DESC(ras_mask, "Mask of RAS features to enable (default 0xffffffff), only valid when ras_enable == 1"); + module_param_named(ras_mask, amdgpu_ras_mask, uint, 0444); + + /** +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c.rej b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c.rej +new file mode 100644 +index 000000000000..98377b949f17 +--- /dev/null ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c.rej +@@ -0,0 +1,30 @@ ++--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++++ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c ++@@ -527,22 +527,21 @@ module_param_named(gpu_recovery, amdgpu_gpu_recovery, int, 0444); ++ MODULE_PARM_DESC(emu_mode, "Emulation mode, (1 = enable, 0 = disable)"); ++ module_param_named(emu_mode, amdgpu_emu_mode, int, 0444); ++ ++-/* ++- * DOC: amdgpu_ras_enable (int) +++/** +++ * DOC: ras_enable (int) ++ * Enable RAS features on the GPU (0 = disable, 1 = enable, -1 = auto (default)) ++ */ ++-MODULE_PARM_DESC(amdgpu_ras_enable, "Enable RAS features on the GPU (0 = disable, 1 = enable, -1 = auto (default))"); +++MODULE_PARM_DESC(ras_enable, "Enable RAS features on the GPU (0 = disable, 1 = enable, -1 = auto (default))"); ++ module_param_named(ras_enable, amdgpu_ras_enable, int, 0444); ++ ++ /** ++- * DOC: amdgpu_ras_mask (uint) +++ * DOC: ras_mask (uint) ++ * Mask of RAS features to enable (default 0xffffffff), only valid when ras_enable == 1 ++ * See the flags in drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h ++ */ ++-MODULE_PARM_DESC(amdgpu_ras_mask, "Mask of RAS features to enable (default 0xffffffff), only valid when ras_enable == 1"); +++MODULE_PARM_DESC(ras_mask, "Mask of RAS features to enable (default 0xffffffff), only valid when ras_enable == 1"); ++ module_param_named(ras_mask, amdgpu_ras_mask, uint, 0444); ++ ++- ++ /** ++ * DOC: si_support (int) ++ * Set SI support driver. This parameter works after set config CONFIG_DRM_AMDGPU_SI. For SI asic, when radeon driver is enabled, +-- +2.17.1 + |