drm/amdgpu: enable separate timeout setting for every ring type
Subsystems (2)
PATCH 1/1 drm/amdgpu: enable separate timeout setting for every ring type
Every ring type can have its own timeout setting.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 7 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 17 +++-- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 82 ++++++++++++++++++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 35 +++++++-- drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 2 +- 5 files changed, 124 insertions(+), 19 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +6 -1
@@ -118,7 +118,6 @@ extern int amdgpu_disp_priority;extern int amdgpu_hw_i2c;extern int amdgpu_pcie_gen2;extern int amdgpu_msi; -extern int amdgpu_lockup_timeout;extern int amdgpu_dpm;extern int amdgpu_fw_load_type;extern int amdgpu_aspm;
@@ -428,6 +427,7 @@ struct amdgpu_fpriv { };int amdgpu_file_to_fpriv (struct file *filp,struct amdgpu_fpriv **fpriv); +int amdgpu_device_get_job_timeout (struct amdgpu_device *adev);int amdgpu_ib_get (struct amdgpu_device *adev,struct amdgpu_vm *vm,unsigned size,struct amdgpu_ib *ib);
@@ -1001,6 +1001,11 @@ struct amdgpu_device {struct work_struct xgmi_reset_work;bool in_baco_reset; + +long gfx_timeout; +long sdma_timeout; +long video_timeout; +long compute_timeout; };static inline struct amdgpu_device *amdgpu_ttm_adev (struct ttm_bo_device *bdev)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +12 -5
@@ -912,8 +912,10 @@ static void amdgpu_device_check_smu_prv_buffer_size(struct amdgpu_device *adev)* Validates certain module parameters and updates * the associated values used by the driver (all asics). */ -static void amdgpu_device_check_arguments (struct amdgpu_device *adev) +static int amdgpu_device_check_arguments (struct amdgpu_device *adev) { +int ret =0 ; +if (amdgpu_sched_jobs <4 ) {dev_warn (adev->dev,"sched jobs (%d) must be at least 4\n" , amdgpu_sched_jobs);
@@ -958,13 +960,16 @@ static void amdgpu_device_check_arguments(struct amdgpu_device *adev) amdgpu_vram_page_split =1024 ; } -if (amdgpu_lockup_timeout ==0 ) { -dev_warn (adev->dev,"lockup_timeout msut be > 0, adjusting to 10000\n" ); - amdgpu_lockup_timeout =10000 ; + ret =amdgpu_device_get_job_timeout (adev); +if (ret) { +dev_err (adev->dev,"invalid job timeout setting\n" ); +return ret; } adev->firmware.load_type =amdgpu_ucode_get_load_type (adev, amdgpu_fw_load_type); amdgpu_direct_gma_size =min (amdgpu_direct_gma_size,96 ); + +return ret; }/**
@@ -2468,7 +2473,9 @@ int amdgpu_device_init(struct amdgpu_device *adev,mutex_init (&adev->lock_reset);mutex_init (&adev->virt.dpm_mutex); -amdgpu_device_check_arguments (adev); + ret =amdgpu_device_check_arguments (adev); +if (ret) +return ret;spin_lock_init (&adev->mmio_idx_lock);spin_lock_init (&adev->smc_idx_lock);
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +76 -6
107 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +29 -6
@@ -436,9 +436,13 @@ int amdgpu_fence_driver_start_ring(struct amdgpu_ring *ring,int amdgpu_fence_driver_init_ring (struct amdgpu_ring *ring,unsigned num_hw_submission) { +struct amdgpu_device *adev = ring->adev;long timeout;int r; +if (!adev) +return -EINVAL ; +/* Check that num_hw_submission is a power of two */ if ((num_hw_submission & (num_hw_submission -1 )) !=0 )return -EINVAL ;
@@ -465,12 +469,31 @@ int amdgpu_fence_driver_init_ring(struct amdgpu_ring *ring,/* No need to setup the GPU scheduler for KIQ ring */ if (ring->funcs->type !=AMDGPU_RING_TYPE_KIQ ) { -/* for non-sriov case, no timeout enforce on compute ring */ -if ((ring->funcs->type ==AMDGPU_RING_TYPE_COMPUTE ) - && !amdgpu_sriov_vf (ring->adev)) - timeout =MAX_SCHEDULE_TIMEOUT ; -else - timeout =msecs_to_jiffies (amdgpu_lockup_timeout); +switch (ring->funcs->type) { +case AMDGPU_RING_TYPE_GFX : + timeout = adev->gfx_timeout; +break ; +case AMDGPU_RING_TYPE_COMPUTE : +/* +* For non-sriov case, no timeout enforce +* on compute ring at default. Unless user +* specifies a timeout for compute ring. +* +* For sriov case, always use the timeout +* as gfx ring +*/ +if (!amdgpu_sriov_vf (ring->adev)) + timeout = adev->compute_timeout; +else + timeout = adev->gfx_timeout; +break ; +case AMDGPU_RING_TYPE_SDMA : + timeout = adev->sdma_timeout; +break ; +default : + timeout = adev->video_timeout; +break ; + } r = drm_sched_init(&ring->sched, &amdgpu_sched_ops, num_hw_submission, amdgpu_job_hang_limit,
drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c +1 -1
@@ -343,7 +343,7 @@ static void xgpu_ai_mailbox_flr_work(struct work_struct *work)/* Trigger recovery for world switch failure if no TDR */ if (amdgpu_device_should_recover_gpu (adev) - && amdgpu_lockup_timeout ==MAX_SCHEDULE_TIMEOUT ) + && adev->sdma_timeout ==MAX_SCHEDULE_TIMEOUT )amdgpu_device_gpu_recover (adev,NULL ); }
Signature · 6 lines
2.21.0 _______________________________________________ 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): [email protected]
Am 29.04.19 um 10:57 schrieb Evan Quan:
Quoted 96 lines
Every ring type can have its own timeout setting.
Change-Id I992f224f36bb33acd560162bffd2c3e987840a7eSigned-off-by Evan Quan <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 7 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 17 +++-- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 82 ++++++++++++++++++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 35 +++++++-- drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 2 +- 5 files changed, 124 insertions(+), 19 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu.h +6
-1@@ -118,7 +118,6 @@ extern int amdgpu_disp_priority;extern int amdgpu_hw_i2c;extern int amdgpu_pcie_gen2;extern int amdgpu_msi; -extern int amdgpu_lockup_timeout;extern int amdgpu_dpm;extern int amdgpu_fw_load_type;extern int amdgpu_aspm;@@ -428,6 +427,7 @@ struct amdgpu_fpriv { };int amdgpu_file_to_fpriv (struct file *filp,struct amdgpu_fpriv **fpriv); +int amdgpu_device_get_job_timeout (struct amdgpu_device *adev);int amdgpu_ib_get (struct amdgpu_device *adev,struct amdgpu_vm *vm,unsigned size,struct amdgpu_ib *ib);@@ -1001,6 +1001,11 @@ struct amdgpu_device {struct work_struct xgmi_reset_work;bool in_baco_reset; + +long gfx_timeout; +long sdma_timeout; +long video_timeout; +long compute_timeout; };static inline struct amdgpu_device *amdgpu_ttm_adev (struct ttm_bo_device *bdev)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +12
-5@@ -912,8 +912,10 @@ static void amdgpu_device_check_smu_prv_buffer_size(struct amdgpu_device *adev)* Validates certain module parameters and updates * the associated values used by the driver (all asics). */ -static void amdgpu_device_check_arguments (struct amdgpu_device *adev) +static int amdgpu_device_check_arguments (struct amdgpu_device *adev) { +int ret =0 ; +if (amdgpu_sched_jobs <4 ) {dev_warn (adev->dev,"sched jobs (%d) must be at least 4\n" , amdgpu_sched_jobs);@@ -958,13 +960,16 @@ static void amdgpu_device_check_arguments(struct amdgpu_device *adev) amdgpu_vram_page_split =1024 ; } -if (amdgpu_lockup_timeout ==0 ) { -dev_warn (adev->dev,"lockup_timeout msut be > 0, adjusting to 10000\n" ); - amdgpu_lockup_timeout =10000 ; + ret =amdgpu_device_get_job_timeout (adev); +if (ret) { +dev_err (adev->dev,"invalid job timeout setting\n" ); +return ret; } adev->firmware.load_type =amdgpu_ucode_get_load_type (adev, amdgpu_fw_load_type); amdgpu_direct_gma_size =min (amdgpu_direct_gma_size,96 ); + +return ret; }/** @@ -2468,7 +2473,9 @@ int amdgpu_device_init(struct amdgpu_device *adev,mutex_init (&adev->lock_reset);mutex_init (&adev->virt.dpm_mutex); -amdgpu_device_check_arguments (adev); + ret =amdgpu_device_check_arguments (adev); +if (ret) +return ret;spin_lock_init (&adev->mmio_idx_lock);spin_lock_init (&adev->smc_idx_lock);drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +0
-0
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c line 86
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +1
-0@@ -83,6 +83,8 @@#define AMDGPU_VERSION "19.10.9.418" +#define MAX_PARAM_LENGTH 256
This needs a better name, especially but an AMDGPU_ prefix in front of it.
Quoted 61 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +33
-6+int amdgpu_vram_limit =0 ;int amdgpu_vis_vram_limit =0 ;int amdgpu_gart_size =-1 ;/* auto */ @@ -95,7 +97,7 @@ int amdgpu_disp_priority = 0;int amdgpu_hw_i2c =0 ;int amdgpu_pcie_gen2 =-1 ;int amdgpu_msi =-1 ; -int amdgpu_lockup_timeout =10000 ; +char amdgpu_lockup_timeout[MAX_PARAM_LENGTH ];int amdgpu_dpm =-1 ;int amdgpu_fw_load_type =-1 ;int amdgpu_aspm =-1 ;@@ -232,12 +234,20 @@ MODULE_PARM_DESC(msi, "MSI support (1 = enable, 0 = disable, -1 = auto)");module_param_named (msi, amdgpu_msi, int,0444 );/** -* DOC: lockup_timeout (int) -* Set GPU scheduler timeout value in ms. Value 0 is invalidated, will be adjusted to 10000. -* Negative values mean 'infinite timeout' (MAX_JIFFY_OFFSET). The default is 10000. +* DOC: lockup_timeout (string) +* Set GPU scheduler timeout value in ms. +* +* The format is non-compute[.gfx.sdma.video][:compute]. +* With no "non-compute[.gfx.sdma.video]" timeout specified, the default timeout for non-compute_job is 10000. +* The "non-compute" timeout setting applys to all non compute IPs(gfx, sdma and video). Unless +* the timeout for this IP is specified separately(by "[.gfx.sdma.video]"). +* +* With no "[:compute]" timeout specified, there will be no timeout enforced on compute jobs. +* Otherwise, the timeout for compute jobs is set as specified. */ -MODULE_PARM_DESC (lockup_timeout,"GPU lockup timeout in ms > 0 (default 10000)" ); -module_param_named (lockup_timeout, amdgpu_lockup_timeout, int,0444 ); +MODULE_PARM_DESC (lockup_timeout,"GPU lockup timeout in ms (default: 10000 for non-compute jobs and no timeout for compute jobs), " +"format is non-compute[.gfx.sdma.video][:compute]" ); +module_param_string (lockup_timeout, amdgpu_lockup_timeout,sizeof (amdgpu_lockup_timeout),0444 );/** * DOC: dpm (int) @@ -1307,6 +1317,66 @@ int amdgpu_file_to_fpriv(struct file *filp, struct amdgpu_fpriv **fpriv)return 0 ; } +int amdgpu_device_get_job_timeout (struct amdgpu_device *adev) +{ +char *input = amdgpu_lockup_timeout; +char *non_compute_setting =NULL ; +char *timeout_setting =NULL ; +int index =0 ; +int ret =0 ; + +/* Default timeout for non compute job is 10000 */ + adev->gfx_timeout = + adev->sdma_timeout = + adev->video_timeout =10000 ; +/* Enforce no timeout on compute job at default */ + adev->compute_timeout =MAX_SCHEDULE_TIMEOUT ; + +if (strnlen (input,MAX_PARAM_LENGTH )) { + non_compute_setting =strsep (&input,":" ); +if (input) {
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c int amdgpu_file_to_fpriv(struct file *filp, struct amdgpu_fpriv **fpriv) · line 1347
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +10
-0+ ret =kstrtol (input,0 , &(adev->compute_timeout)); +if (ret) +return ret; + } + +while ((timeout_setting =strsep (&non_compute_setting,"." )) && +strnlen (timeout_setting,MAX_PARAM_LENGTH )) { +switch (index) { +case 0 : + ret =kstrtol (timeout_setting,0 , &adev->gfx_timeout);
Maybe move the kstrtol call outside of the switch.
That would de-duplicate error handling quite a bit.
Christian.
Quoted 96 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +32
-0+if (ret) +return ret; + + adev->sdma_timeout = + adev->video_timeout = + adev->gfx_timeout; +break ; +case 1 : + ret =kstrtol (timeout_setting,0 , &adev->gfx_timeout); +if (ret) +return ret; +break ; +case 2 : + ret =kstrtol (timeout_setting,0 , &adev->sdma_timeout); +if (ret) +return ret; +break ; +case 3 : + ret =kstrtol (timeout_setting,0 , &adev->video_timeout); +if (ret) +return ret; +break ; +default : +break ; + } + index++; + } + } + +return ret; +} + static bool amdgpu_get_crtc_scanout_position(struct drm_device *dev, unsigned int pipe, bool in_vblank_irq, int *vpos, int *hpos,drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +29
-6@@ -436,9 +436,13 @@ int amdgpu_fence_driver_start_ring(struct amdgpu_ring *ring,int amdgpu_fence_driver_init_ring (struct amdgpu_ring *ring,unsigned num_hw_submission) { +struct amdgpu_device *adev = ring->adev;long timeout;int r; +if (!adev) +return -EINVAL ; +/* Check that num_hw_submission is a power of two */ if ((num_hw_submission & (num_hw_submission -1 )) !=0 )return -EINVAL ;@@ -465,12 +469,31 @@ int amdgpu_fence_driver_init_ring(struct amdgpu_ring *ring,/* No need to setup the GPU scheduler for KIQ ring */ if (ring->funcs->type !=AMDGPU_RING_TYPE_KIQ ) { -/* for non-sriov case, no timeout enforce on compute ring */ -if ((ring->funcs->type ==AMDGPU_RING_TYPE_COMPUTE ) - && !amdgpu_sriov_vf (ring->adev)) - timeout =MAX_SCHEDULE_TIMEOUT ; -else - timeout =msecs_to_jiffies (amdgpu_lockup_timeout); +switch (ring->funcs->type) { +case AMDGPU_RING_TYPE_GFX : + timeout = adev->gfx_timeout; +break ; +case AMDGPU_RING_TYPE_COMPUTE : +/* +* For non-sriov case, no timeout enforce +* on compute ring at default. Unless user +* specifies a timeout for compute ring. +* +* For sriov case, always use the timeout +* as gfx ring +*/ +if (!amdgpu_sriov_vf (ring->adev)) + timeout = adev->compute_timeout; +else + timeout = adev->gfx_timeout; +break ; +case AMDGPU_RING_TYPE_SDMA : + timeout = adev->sdma_timeout; +break ; +default : + timeout = adev->video_timeout; +break ; + } r = drm_sched_init(&ring->sched, &amdgpu_sched_ops, num_hw_submission, amdgpu_job_hang_limit,drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c +0
-0
drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c static void xgpu_ai_mailbox_flr_work(struct work_struct *work) · line 349
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c +1
-1@@ -343,7 +343,7 @@ static void xgpu_ai_mailbox_flr_work(struct work_struct *work)/* Trigger recovery for world switch failure if no TDR */ if (amdgpu_device_should_recover_gpu (adev) - && amdgpu_lockup_timeout ==MAX_SCHEDULE_TIMEOUT ) + && adev->sdma_timeout ==MAX_SCHEDULE_TIMEOUT )amdgpu_device_gpu_recover (adev,NULL ); }
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 4 lines · Evan Quan
Every ring type can have its own timeout setting.
Change-Id I992f224f36bb33acd560162bffd2c3e987840a7eSigned-off-by Evan Quan <[email protected]>
This is going in a good direction, but there are still some minor/cosmetic issues.
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c static void amdgpu_device_check_arguments(struct amdgpu_device *adev) · line 967
Quoted 12 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +4
-3@@ -958,13 +960,16 @@ static void amdgpu_device_check_arguments(struct amdgpu_device *adev) amdgpu_vram_page_split =1024 ; } -if (amdgpu_lockup_timeout ==0 ) { -dev_warn (adev->dev,"lockup_timeout msut be > 0, adjusting to 10000\n" ); - amdgpu_lockup_timeout =10000 ; + ret =amdgpu_device_get_job_timeout (adev); +if (ret) { +dev_err (adev->dev,"invalid job timeout setting\n" ); +return ret; }
The error message should still explicitly mention lockup_timeout, or it may not be clear to the user what it's about. E.g. "Invalid lockup_timeout parameter syntax".
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +0
-0@@ -232,12 +234,20 @@ MODULE_PARM_DESC(msi, "MSI support (1 = enable, 0 = disable, -1 = auto)");module_param_named (msi, amdgpu_msi, int,0444 );/**
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c MODULE_PARM_DESC(msi, "MSI support (1 = enable, 0 = disable, -1 = auto)"); · line 243
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +7
-3-* DOC: lockup_timeout (int) -* Set GPU scheduler timeout value in ms. Value 0 is invalidated, will be adjusted to 10000. -* Negative values mean 'infinite timeout' (MAX_JIFFY_OFFSET). The default is 10000. +* DOC: lockup_timeout (string) +* Set GPU scheduler timeout value in ms. +* +* The format is non-compute[.gfx.sdma.video][:compute]. +* With no "non-compute[.gfx.sdma.video]" timeout specified, the default timeout for non-compute_job is 10000. +* The "non-compute" timeout setting applys to all non compute IPs(gfx, sdma and video). Unless +* the timeout for this IP is specified separately(by "[.gfx.sdma.video]").
A dot is a bit weird as a separator, comma (or maybe semicolon) would be better.
Also, instead of requiring a general non-compute value (which is unused if all 3 engine specific values are specified) before the engine specific ones, how about: If only one non-compute value is specified, it applies to all non-compute engines. If multiple values are specified, the first one is for GFX, second one for SDMA, third one for video.
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +2
-0@@ -1307,6 +1317,66 @@ int amdgpu_file_to_fpriv(struct file *filp, struct amdgpu_fpriv **fpriv)return 0 ; } +int amdgpu_device_get_job_timeout (struct amdgpu_device *adev) +{
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c int amdgpu_file_to_fpriv(struct file *filp, struct amdgpu_fpriv **fpriv) · line 1331
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +10
-0+char *input = amdgpu_lockup_timeout; +char *non_compute_setting =NULL ; +char *timeout_setting =NULL ; +int index =0 ; +int ret =0 ; + +/* Default timeout for non compute job is 10000 */ + adev->gfx_timeout = + adev->sdma_timeout = + adev->video_timeout =10000 ;
This is a bit weird formatting. :) Maybe it can be one or two lines, otherwise the second continuation line should have the same indentation as the first one.
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c int amdgpu_file_to_fpriv(struct file *filp, struct amdgpu_fpriv **fpriv) · line 1332
Quoted 1 line
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +1
-0+/* Enforce no timeout on compute job at default */
"by default" (same in amdgpu_fence_driver_init_ring).
Signature · 6 lines
Earthling Michel Dänzer | https://www.amd.com Libre software enthusiast | Mesa and X developer _______________________________________________ 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): 74c1715e-cd43-7c16-6e8c-29a085d23317-otUistvHUpPR7s880joybQ@public.gmane.org
Thanks for reviewing. Will update them in V2.
Regards,
Evan
Quoted 93 lines
-----Original Message-----
From: Michel Dänzer <[email protected]>
Sent: Monday, April 29, 2019 6:17 PM
To: Quan, Evan <[email protected]>
Cc: [email protected]; Deucher, Alexander <[email protected]>; Lou, Wentao <[email protected]>; Koenig, Christian <[email protected]>
Subject: Re: [PATCH] drm/amdgpu: enable separate timeout setting for every ring typeQuoted 4 lines · Evan Quan
Every ring type can have its own timeout setting.
Change-Id I992f224f36bb33acd560162bffd2c3e987840a7eSigned-off-by Evan Quan <[email protected]>This is going in a good direction, but there are still some minor/cosmetic issues.
Review static void
Quoted 1 line
(quoted diff) +0
-0@@ -958,13 +960,16 @@ static void
amdgpu_device_check_arguments(struct amdgpu_device *adev)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c static void amdgpu_device_check_arguments(struct amdgpu_device *adev)
Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-2amdgpu_vram_page_split =1024 ; } -if (amdgpu_lockup_timeout ==0 ) { - dev_warn(adev->dev, "lockup_timeout msut be > 0,adjusting to 10000\n");
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c static void amdgpu_device_check_arguments(struct amdgpu_device *adev) · line 967
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +4
-1- amdgpu_lockup_timeout =10000 ; + ret =amdgpu_device_get_job_timeout (adev); +if (ret) { +dev_err (adev->dev,"invalid job timeout setting\n" ); +return ret; }The error message should still explicitly mention
lockup_timeout, or it may not be clear to the user what it's about. E.g. "Invalidlockup_timeoutparameter syntax".Review MODULE_PARM_DESC(msi, "MSI support (1 =
Quoted 1 line
(quoted diff) +0
-0@@ -232,12 +234,20 @@ MODULE_PARM_DESC(msi, "MSI support (1 =enable,
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c MODULE_PARM_DESC(msi, "MSI support (1 = enable, 0 = disable, -1 = auto)");
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +0
-20 = disable, -1 = auto)"); module_param_named(msi, amdgpu_msi, int, 0444);/** -* DOC: lockup_timeout (int) -* Set GPU scheduler timeout value in ms. Value 0 is invalidated, will be adjusted to 10000.
Review MODULE_PARM_DESC(msi, "MSI support (1 = · line 238
Quoted 1 line
(quoted diff) +0
-1- * Negative values mean 'infinite timeout' (MAX_JIFFY_OFFSET). Thedefault is 10000.
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c MODULE_PARM_DESC(msi, "MSI support (1 = enable, 0 = disable, -1 = auto)");
Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +5
-0+* DOC: lockup_timeout (string) +* Set GPU scheduler timeout value in ms. +* +* The format is non-compute[.gfx.sdma.video][:compute]. +* With no "non-compute[.gfx.sdma.video]" timeout specified, the default timeout for non-compute_job is 10000.
Review MODULE_PARM_DESC(msi, "MSI support (1 = · line 245
Quoted 3 lines
(quoted diff) +3
-0+ * The "non-compute" timeout setting applys to all non compute + IPs(gfx, sdma and video). Unless + * the timeout for this IP is specified separately(by "[.gfx.sdma.video]").A dot is a bit weird as a separator, comma (or maybe semicolon) would be better.
Also, instead of requiring a general non-compute value (which is unused if all 3 engine specific values are specified) before the engine specific ones, how
about: If only one non-compute value is specified, it applies to all non- compute engines. If multiple values are specified, the first one is for GFX, second one for SDMA, third one for video.Review int amdgpu_file_to_fpriv(struct file *filp, struct
Quoted 1 line
(quoted diff) +0
-0@@ -1307,6 +1317,66 @@ int amdgpu_file_to_fpriv(struct file *filp, struct
amdgpu_fpriv**fpriv)Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +1
-0return 0 ; } +int amdgpu_device_get_job_timeout (struct amdgpu_device *adev) {drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c int amdgpu_file_to_fpriv(struct file *filp, struct amdgpu_fpriv **fpriv) · line 1331
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +10
-0+char *input = amdgpu_lockup_timeout; +char *non_compute_setting =NULL ; +char *timeout_setting =NULL ; +int index =0 ; +int ret =0 ; + +/* Default timeout for non compute job is 10000 */ + adev->gfx_timeout = + adev->sdma_timeout = + adev->video_timeout =10000 ;This is a bit weird formatting. :) Maybe it can be one or two lines, otherwise the second continuation line should have the same indentation as the first one.
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c int amdgpu_file_to_fpriv(struct file *filp, struct amdgpu_fpriv **fpriv) · line 1332
Quoted 1 line
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +1
-0+/* Enforce no timeout on compute job at default */ "by default" (same in
amdgpu_fence_driver_init_ring).--
Earthling Michel Dänzer | https://www.amd.com
Libre software enthusiast | Mesa and X developer
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx