drm/i915/opregion: let user specify override VBT via firmware load
Subsystems (2)
PATCH RESEND v3 1/1 drm/i915/opregion: let user specify override VBT via firmware load
Sometimes it would be most enlightening to debug systems by replacing the VBT to be used. For example, in the referenced bug the BIOS provides different VBT depending on the boot mode (UEFI vs. legacy). It would be interesting to try the failing boot mode with the VBT from the working boot, and see if that makes a difference.
Add a module parameter to load the VBT using the firmware loader, not unlike the EDID firmware mechanism.
As a starting point for experimenting, one can pick up the BIOS provided VBT from /sys/kernel/debug/dri/0/i915_opregion/i915_vbt.
v2: clarify firmware load return value check (Bob)
v3: kfree the loaded firmware blob
References: https://bugs.freedesktop.org/show_bug.cgi?id=97822#c83
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_params.c | 4 ++++ drivers/gpu/drm/i915/i915_params.h | 1 + drivers/gpu/drm/i915/intel_opregion.c | 45 +++++++++++++++++++++++++++++++++++ 4 files changed, 51 insertions(+)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -646,6 +646,7 @@ struct intel_opregion {u32 swsci_sbcb_sub_functions;struct opregion_asle *asle;void *rvda; +void *vbt_firmware;const void *vbt;u32 vbt_size;u32 *lid_state;
drivers/gpu/drm/i915/i915_params.c +4 -0
@@ -118,6 +118,10 @@ MODULE_PARM_DESC(vbt_sdvo_panel_type,module_param_named_unsafe (reset, i915.reset, int,0600 );MODULE_PARM_DESC (reset,"Attempt GPU resets (0=disabled, 1=full gpu reset, 2=engine reset [default])" ); +module_param_named_unsafe (vbt_firmware, i915.vbt_firmware, charp,0400 ); +MODULE_PARM_DESC (vbt_firmware, +"Load VBT from specified file under /lib/firmware" ); +#if IS_ENABLED (CONFIG_DRM_I915_CAPTURE_ERROR )module_param_named (error_capture, i915.error_capture, bool,0600 ); MODULE_PARM_DESC(error_capture,
drivers/gpu/drm/i915/i915_params.h +1 -0
@@ -28,6 +28,7 @@#include <linux/cache.h> /* for __read_mostly */ #define I915_PARAMS_FOR_EACH (func) \ + func(char *, vbt_firmware); \ func(int, modeset); \ func(int, panel_ignore_lid); \ func(int, semaphores); \
drivers/gpu/drm/i915/intel_opregion.c +45 -0
69 lines not on this page · raw message
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915/opregion: let user specify override VBT via firmware load (rev2)
== Series Details ==
== Series Details ==
Series: drm/i915/opregion: let user specify override VBT via firmware load (rev2)
URL : https://patchwork.freedesktop.org/series/25105/
State : success
== Summary ==
Series 25105v2 drm/i915/opregion: let user specify override VBT via firmware load
https://patchwork.freedesktop.org/api/1.0/series/25105/revisions/2/mbox/
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-b:
pass -> DMESG-WARN (fi-byt-n2820) fdo#101705fdo#101705 https://bugs.freedesktop.org/show_bug.cgi?id=101705
fi-bdw-5557u total:279 pass:268 dwarn:0 dfail:0 fail:0 skip:11 time:451s fi-bdw-gvtdvm total:279 pass:265 dwarn:0 dfail:0 fail:0 skip:14 time:441s fi-blb-e6850 total:279 pass:224 dwarn:1 dfail:0 fail:0 skip:54 time:358s fi-bsw-n3050 total:279 pass:243 dwarn:0 dfail:0 fail:0 skip:36 time:552s fi-bxt-j4205 total:279 pass:260 dwarn:0 dfail:0 fail:0 skip:19 time:524s fi-byt-j1900 total:279 pass:254 dwarn:1 dfail:0 fail:0 skip:24 time:525s fi-byt-n2820 total:279 pass:250 dwarn:1 dfail:0 fail:0 skip:28 time:519s fi-glk-2a total:279 pass:260 dwarn:0 dfail:0 fail:0 skip:19 time:609s fi-hsw-4770 total:279 pass:263 dwarn:0 dfail:0 fail:0 skip:16 time:444s fi-hsw-4770r total:279 pass:263 dwarn:0 dfail:0 fail:0 skip:16 time:423s fi-ilk-650 total:279 pass:229 dwarn:0 dfail:0 fail:0 skip:50 time:421s fi-ivb-3520m total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:506s fi-ivb-3770 total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:476s fi-kbl-7500u total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:471s fi-kbl-7560u total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:595s fi-kbl-r total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:599s fi-pnv-d510 total:279 pass:223 dwarn:1 dfail:0 fail:0 skip:55 time:527s fi-skl-6260u total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:470s fi-skl-6700k total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:475s fi-skl-6770hq total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:488s fi-skl-gvtdvm total:279 pass:266 dwarn:0 dfail:0 fail:0 skip:13 time:444s fi-skl-x1585l total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:515s fi-snb-2520m total:279 pass:251 dwarn:0 dfail:0 fail:0 skip:28 time:544s fi-snb-2600 total:279 pass:250 dwarn:0 dfail:0 fail:0 skip:29 time:404s
ada53b43f81fe618f3f0f1dfbd3dd776bb277323 drm-tip: 2017y-08m-16d-15h-18m-56s UTC integration manifest e3823ff65946 drm/i915/opregion: let user specify override VBT via firmware load
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5426/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 12 lines · Jani Nikula
Sometimes it would be most enlightening to debug systems by replacing the VBT to be used. For example, in the referenced bug the BIOS provides different VBT depending on the boot mode (UEFI vs. legacy). It would be interesting to try the failing boot mode with the VBT from the working boot, and see if that makes a difference.
Add a module parameter to load the VBT using the firmware loader, not unlike the EDID firmware mechanism.
As a starting point for experimenting, one can pick up the BIOS provided VBT from
/sys/kernel/debug/dri/0/i915_opregion/i915_vbt.
Quoted 7 lines
v2: clarify firmware load return value check (Bob)
v3: kfree the loaded firmware blob
References: https://bugs.freedesktop.org/show_bug.cgi?id=97822#c83
Reviewed-by Bob Paauwe <[email protected]>Signed-off-by Jani Nikula <[email protected]>
And pushed, with Daniel's additional irc ack.
BR,
Jani.
Quoted 122 lines
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_params.c | 4 ++++ drivers/gpu/drm/i915/i915_params.h | 1 + drivers/gpu/drm/i915/intel_opregion.c | 45 +++++++++++++++++++++++++++++++++++ 4 files changed, 51 insertions(+)drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -646,6 +646,7 @@ struct intel_opregion {u32 swsci_sbcb_sub_functions;struct opregion_asle *asle;void *rvda; +void *vbt_firmware;const void *vbt;u32 vbt_size;u32 *lid_state;drivers/gpu/drm/i915/i915_params.c +4
-0@@ -118,6 +118,10 @@ MODULE_PARM_DESC(vbt_sdvo_panel_type,module_param_named_unsafe (reset, i915.reset, int,0600 );MODULE_PARM_DESC (reset,"Attempt GPU resets (0=disabled, 1=full gpu reset, 2=engine reset [default])" ); +module_param_named_unsafe (vbt_firmware, i915.vbt_firmware, charp,0400 ); +MODULE_PARM_DESC (vbt_firmware, +"Load VBT from specified file under /lib/firmware" ); +#if IS_ENABLED (CONFIG_DRM_I915_CAPTURE_ERROR )module_param_named (error_capture, i915.error_capture, bool,0600 ); MODULE_PARM_DESC(error_capture,drivers/gpu/drm/i915/i915_params.h +1
-0@@ -28,6 +28,7 @@#include <linux/cache.h> /* for __read_mostly */ #define I915_PARAMS_FOR_EACH (func) \ + func(char *, vbt_firmware); \ func(int, modeset); \ func(int, panel_ignore_lid); \ func(int, semaphores); \drivers/gpu/drm/i915/intel_opregion.c +45
-0@@ -27,6 +27,7 @@#include <linux/acpi.h> #include <linux/dmi.h> +#include <linux/firmware.h> #include <acpi/video.h> #include <drm/drmP.h> @@ -829,6 +830,10 @@ void intel_opregion_unregister(struct drm_i915_private *dev_priv)memunmap (opregion->rvda); opregion->rvda =NULL ; } +if (opregion->vbt_firmware) { +kfree (opregion->vbt_firmware); + opregion->vbt_firmware =NULL ; + } opregion->header =NULL ; opregion->acpi =NULL ; opregion->swsci =NULL ;@@ -912,6 +917,43 @@ static const struct dmi_system_id intel_no_opregion_vbt[] = { { } }; +static int intel_load_vbt_firmware (struct drm_i915_private *dev_priv) +{ +struct intel_opregion *opregion = &dev_priv->opregion; +const struct firmware *fw =NULL ; +const char *name = i915.vbt_firmware; +int ret; + +if (!name || !*name) +return -ENOENT ; + + ret =request_firmware (&fw, name, &dev_priv->drm.pdev->dev); +if (ret) { +DRM_ERROR ("Requesting VBT firmware \"%s\" failed (%d)\n" , + name, ret); +return ret; + } + +if (intel_bios_is_valid_vbt (fw->data, fw->size)) { + opregion->vbt_firmware =kmemdup (fw->data, fw->size,GFP_KERNEL ); +if (opregion->vbt_firmware) { +DRM_DEBUG_KMS ("Found valid VBT firmware \"%s\"\n" , name); + opregion->vbt = opregion->vbt_firmware; + opregion->vbt_size = fw->size; + ret =0 ; + }else { + ret = -ENOMEM ; + } + }else { +DRM_DEBUG_KMS ("Invalid VBT firmware \"%s\"\n" , name); + ret = -EINVAL ; + } + +release_firmware (fw); + +return ret; +} +int intel_opregion_setup (struct drm_i915_private *dev_priv) {struct intel_opregion *opregion = &dev_priv->opregion;@@ -974,6 +1016,9 @@ int intel_opregion_setup(struct drm_i915_private *dev_priv)if (mboxes &MBOX_ASLE_EXT )DRM_DEBUG_DRIVER ("ASLE extension supported\n" ); +if (intel_load_vbt_firmware (dev_priv) ==0 ) + goto out; +if (dmi_check_system (intel_no_opregion_vbt)) goto out;
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx