Skip to content

Commit 885f7ba

Browse files
committed
drm/i915: Restore default setting for enable_guc again [FreeBSD]
Some recent GPUs require this to work (see #418). If we need to disable GuC for some GPUs, we can add them in `uc_expand_default_options()` in `drivers/gpu/drm/i915/gt/uc/intel_uc.c`. It will be better than disabling it for everyone, requiring some user to mess with an obscure setting in `/boot/loader.conf`. Sponsored by: The FreeBSD Foundation
1 parent ea5410f commit 885f7ba

2 files changed

Lines changed: 1 addition & 16 deletions

File tree

drivers/gpu/drm/i915/gt/uc/intel_uc.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,6 @@ static void uc_expand_default_options(struct intel_uc *uc)
4242
return;
4343
}
4444

45-
#ifndef __FreeBSD__
46-
/* FreeBSD FIXME */
47-
/* GuC is known to be broken so disable it for GEN12 for now */
48-
4945
/* Intermediate platforms are HuC authentication only */
5046
if (IS_ALDERLAKE_S(i915) && !IS_RAPTORLAKE_S(i915)) {
5147
i915->params.enable_guc = ENABLE_GUC_LOAD_HUC;
@@ -54,7 +50,6 @@ static void uc_expand_default_options(struct intel_uc *uc)
5450

5551
/* Default: enable HuC authentication and GuC submission */
5652
i915->params.enable_guc = ENABLE_GUC_LOAD_HUC | ENABLE_GUC_SUBMISSION;
57-
#endif
5853
}
5954

6055
/* Reset GuC providing us with fresh state for both GuC and HuC.

drivers/gpu/drm/i915/i915_params.h

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,9 @@ struct drm_printer;
4949
* mode: debugfs file permissions, one of {0400, 0600, 0}, use 0 to not create
5050
* debugfs file
5151
*/
52-
#ifdef __FreeBSD__
53-
/* Changes in default values in I915_PARAMS_FOR_EACH below:
54-
*
55-
* enable_guc: -1 -> 0
56-
* When the GuC is used, there is a great chance that the computer freezes
57-
* when it reboots or is powered off. The symptom is that the scree is
58-
* powered off at the time of reboot/shutdown, but the computer remains
59-
* powered on.
60-
*/
61-
#endif
6252
#define I915_PARAMS_FOR_EACH(param) \
6353
param(int, modeset, -1, 0400) \
64-
param(int, enable_guc, 0, 0400) \
54+
param(int, enable_guc, -1, 0400) \
6555
param(int, guc_log_level, -1, 0400) \
6656
param(char *, guc_firmware_path, NULL, 0400) \
6757
param(char *, huc_firmware_path, NULL, 0400) \

0 commit comments

Comments
 (0)