diff options
| author | Maxime Ripard <mripard@kernel.org> | 2024-06-14 09:55:46 +0200 |
|---|---|---|
| committer | Maxime Ripard <mripard@kernel.org> | 2024-06-14 09:55:46 +0200 |
| commit | 14731a640e5513bd514adcf35e96c84ad42f540d (patch) | |
| tree | ab909e6f1506c1d2cff57fbb86a1d6f295b1b413 /drivers/gpu/drm/xe/xe_pcode.c | |
| parent | 41f590e31c6c8b8a0a490b7c1ad2e57c20ec3d9b (diff) | |
| parent | f1909e859753c9bda87c6d2b82a7f832ef80aa2d (diff) | |
Merge drm/drm-fixes into drm-misc-fixes
Roll -rc3 and current drm/fixes in.
This will also unstuck our for-next branch.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/xe/xe_pcode.c')
| -rw-r--r-- | drivers/gpu/drm/xe/xe_pcode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/xe/xe_pcode.c b/drivers/gpu/drm/xe/xe_pcode.c index c010ef16fbf5..a5e7da8cf944 100644 --- a/drivers/gpu/drm/xe/xe_pcode.c +++ b/drivers/gpu/drm/xe/xe_pcode.c @@ -191,7 +191,7 @@ int xe_pcode_request(struct xe_gt *gt, u32 mbox, u32 request, drm_WARN_ON_ONCE(>_to_xe(gt)->drm, timeout_base_ms > 1); preempt_disable(); ret = pcode_try_request(gt, mbox, request, reply_mask, reply, &status, - true, timeout_base_ms * 1000, true); + true, 50 * 1000, true); preempt_enable(); out: |