drm/i915: Reorder early initialization
Subsystems (2)
PATCH 1/3 drm/i915: Reorder early initialization
In upcoming patch, we want to perform more actions in early initialization of the uC. This reordering will help resolve new dependencies that will be introduced by future patch.
--- drivers/gpu/drm/i915/i915_drv.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +8 -9
@@ -919,17 +919,21 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv,mutex_init (&dev_priv->wm.wm_mutex);mutex_init (&dev_priv->pps_mutex); -intel_wopcm_init_early (&dev_priv->wopcm); -intel_uc_init_early (dev_priv);i915_memcpy_init_early (dev_priv); ret =i915_workqueues_init (dev_priv);if (ret <0 ) goto err_engines; + ret =i915_gem_load_init (dev_priv); +if (ret <0 ) + goto err_workqueues; +/* This must be called before any calls to HAS_PCH_* */ intel_detect_pch (dev_priv); +intel_wopcm_init_early (&dev_priv->wopcm); +intel_uc_init_early (dev_priv);intel_pm_setup (dev_priv);intel_init_dpio (dev_priv);intel_power_domains_init (dev_priv);
@@ -938,18 +942,13 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv,intel_init_display_hooks (dev_priv);intel_init_clock_gating_hooks (dev_priv);intel_init_audio_hooks (dev_priv); - ret =i915_gem_load_init (dev_priv); -if (ret <0 ) - goto err_irq; -intel_display_crc_init (dev_priv);intel_detect_preproduction_hw (dev_priv);return 0 ; -err_irq: -intel_irq_fini (dev_priv); +err_workqueues:i915_workqueues_cleanup (dev_priv); err_engines:i915_engines_cleanup (dev_priv);
@@ -962,8 +961,8 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv,*/ static void i915_driver_cleanup_early (struct drm_i915_private *dev_priv) { -i915_gem_load_cleanup (dev_priv);intel_irq_fini (dev_priv); +i915_gem_load_cleanup (dev_priv);i915_workqueues_cleanup (dev_priv);i915_engines_cleanup (dev_priv); }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/3 drm/i915/uc: Fetch uC firmware in init_early
We were fetching uC firmwares in separate uc_init_fw step, while there is no reason why we can't fetch them during init_early. This will also simplify upcoming patches, as size of the firmware may be used for register initialization.
--- drivers/gpu/drm/i915/i915_drv.c | 8 ++------ drivers/gpu/drm/i915/intel_guc_fw.c | 5 ++--- drivers/gpu/drm/i915/intel_huc_fw.c | 5 ++--- drivers/gpu/drm/i915/intel_uc.c | 37 ++++++++++++++++++------------------- drivers/gpu/drm/i915/intel_uc.h | 3 +-- 5 files changed, 25 insertions(+), 33 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +2 -6
@@ -692,11 +692,9 @@ static int i915_load_modeset_init(struct drm_device *dev)if (ret) goto cleanup_irq; -intel_uc_init_fw (dev_priv); - ret =i915_gem_init (dev_priv);if (ret) - goto cleanup_uc; + goto cleanup_irq;intel_setup_overlay (dev_priv);
@@ -716,8 +714,6 @@ static int i915_load_modeset_init(struct drm_device *dev)if (i915_gem_suspend (dev_priv))DRM_ERROR ("failed to idle hardware; continuing to unload!\n" );i915_gem_fini (dev_priv); -cleanup_uc: -intel_uc_fini_fw (dev_priv); cleanup_irq:drm_irq_uninstall (dev);intel_teardown_gmbus (dev_priv);
@@ -962,6 +958,7 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv,static void i915_driver_cleanup_early (struct drm_i915_private *dev_priv) {intel_irq_fini (dev_priv); +intel_uc_cleanup_early (dev_priv);i915_gem_load_cleanup (dev_priv);i915_workqueues_cleanup (dev_priv);i915_engines_cleanup (dev_priv);
@@ -1457,7 +1454,6 @@ void i915_driver_unload(struct drm_device *dev)i915_reset_error_state (dev_priv);i915_gem_fini (dev_priv); -intel_uc_fini_fw (dev_priv);intel_fbc_cleanup_cfb (dev_priv);intel_power_domains_fini (dev_priv);
drivers/gpu/drm/i915/intel_guc_fw.c +2 -3
@@ -275,9 +275,8 @@ static int guc_fw_xfer(struct intel_uc_fw *guc_fw, struct i915_vma *vma)* Called from intel_uc_init_hw() during driver load, resume from sleep and * after a GPU reset. * -* The firmware image should have already been fetched into memory by the -* earlier call to intel_uc_init_fw(), so here we need to only check that -* fetch succeeded, and then transfer the image to the h/w. +* The firmware image should have already been fetched into memory, so only +* check that fetch succeeded, and then transfer the image to the h/w. * * Return: non-zero code on error */
drivers/gpu/drm/i915/intel_huc_fw.c +2 -3
@@ -155,9 +155,8 @@ static int huc_fw_xfer(struct intel_uc_fw *huc_fw, struct i915_vma *vma)* Called from intel_uc_init_hw() during driver load, resume from sleep and * after a GPU reset. Note that HuC must be loaded before GuC. * -* The firmware image should have already been fetched into memory by the -* earlier call to intel_uc_init_fw(), so here we need to only check that -* fetch succeeded, and then transfer the image to the h/w. +* The firmware image should have already been fetched into memory, so only +* check that fetch succeeded, and then transfer the image to the h/w. * * Return: non-zero code on error */
drivers/gpu/drm/i915/intel_uc.c +18 -19
@@ -162,36 +162,35 @@ static void sanitize_options_early(struct drm_i915_private *dev_priv)GEM_BUG_ON (i915_modparams.guc_log_level <0 ); } -void intel_uc_init_early (struct drm_i915_private *dev_priv) +void intel_uc_init_early (struct drm_i915_private *i915) { -intel_guc_init_early (&dev_priv->guc); -intel_huc_init_early (&dev_priv->huc); +struct intel_guc *guc = &i915->guc; +struct intel_huc *huc = &i915->huc; -sanitize_options_early (dev_priv); -} +intel_guc_init_early (guc); +intel_huc_init_early (huc); -void intel_uc_init_fw (struct drm_i915_private *dev_priv) -{ -if (!USES_GUC (dev_priv)) -return ; +sanitize_options_early (i915); -if (USES_HUC (dev_priv)) -intel_uc_fw_fetch (dev_priv, &dev_priv->huc.fw); +if (USES_GUC (i915)) +intel_uc_fw_fetch (i915, &guc->fw); -intel_uc_fw_fetch (dev_priv, &dev_priv->guc.fw); +if (USES_HUC (i915)) +intel_uc_fw_fetch (i915, &huc->fw); } -void intel_uc_fini_fw (struct drm_i915_private *dev_priv) +void intel_uc_cleanup_early (struct drm_i915_private *i915) { -if (!USES_GUC (dev_priv)) -return ; +struct intel_guc *guc = &i915->guc; +struct intel_huc *huc = &i915->huc; -intel_uc_fw_fini (&dev_priv->guc.fw); +if (USES_HUC (i915)) +intel_uc_fw_fini (&huc->fw); -if (USES_HUC (dev_priv)) -intel_uc_fw_fini (&dev_priv->huc.fw); +if (USES_GUC (i915)) +intel_uc_fw_fini (&guc->fw); -guc_free_load_err_log (&dev_priv->guc); +guc_free_load_err_log (guc); }/**
drivers/gpu/drm/i915/intel_uc.h +1 -2
@@ -29,9 +29,8 @@#include "i915_params.h" void intel_uc_init_early (struct drm_i915_private *dev_priv); +void intel_uc_cleanup_early (struct drm_i915_private *dev_priv);void intel_uc_init_mmio (struct drm_i915_private *dev_priv); -void intel_uc_init_fw (struct drm_i915_private *dev_priv); -void intel_uc_fini_fw (struct drm_i915_private *dev_priv);int intel_uc_init_misc (struct drm_i915_private *dev_priv);void intel_uc_fini_misc (struct drm_i915_private *dev_priv);void intel_uc_sanitize (struct drm_i915_private *dev_priv);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/3] drm/i915/uc: Fetch uC firmware in init_early
Quoting Michal Wajdeczko (2018-03-22 20:36:58)
Quoted 10 lines
We were fetching uC firmwares in separate
uc_init_fwstep, while there is no reason why we can't fetch them duringinit_early. This will also simplify upcoming patches, as size of the firmware may be used for register initialization.Signed-off-by Michal Wajdeczko <[email protected]>Cc Michal Winiarski <[email protected]>Cc Sagar Arun Kamble <[email protected]>Cc Chris Wilson <[email protected]>Cc Joonas Lahtinen <[email protected]>
Looked ok, didn't spot you sneaking in any major changes (who would do that???)
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/3 HAX: Enable GuC for CI
In reply to Michal Wajdeczko--- drivers/gpu/drm/i915/i915_params.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_params.h +1 -1
@@ -47,7 +47,7 @@ param(int, disable_power_well, -1) \ param(int, enable_ips, 1) \ param(int, invert_brightness, 0) \ - param(int, enable_guc, 0) \ + param(int, enable_guc, -1) \ param(int, guc_log_level, -1) \ param(char *, guc_firmware_path, NULL) \param (char *, huc_firmware_path, NULL) \
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Michal Wajdeczko (2018-03-22 20:36:57)
Quoted 21 lines
In upcoming patch, we want to perform more actions in early initialization of the uC. This reordering will help resolve new dependencies that will be introduced by future patch.
Signed-off-by Michal Wajdeczko <[email protected]>Cc Chris Wilson <[email protected]>Cc Tvrtko Ursulin <[email protected]>Cc Joonas Lahtinen <[email protected]>--- drivers/gpu/drm/i915/i915_drv.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)drivers/gpu/drm/i915/i915_drv.c +0
-1@@ -919,17 +919,21 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv,mutex_init (&dev_priv->wm.wm_mutex);mutex_init (&dev_priv->pps_mutex); -intel_wopcm_init_early (&dev_priv->wopcm);
drivers/gpu/drm/i915/i915_drv.c static int i915_driver_init_early(struct drm_i915_private *dev_priv, · line 930
Quoted 10 lines
drivers/gpu/drm/i915/i915_drv.c +3
-1-intel_uc_init_early (dev_priv);i915_memcpy_init_early (dev_priv); ret =i915_workqueues_init (dev_priv);if (ret <0 ) goto err_engines; + ret =i915_gem_load_init (dev_priv); +if (ret <0 ) + goto err_workqueues;
Scary. But really misnamed. I was thinking this was i915_gem_init(), could you rename this i915_gem_init_early() to indicate that all it is doing is the early allocations and nothing HW related.
Quoted 29 lines
drivers/gpu/drm/i915/i915_drv.c +3
-6/* This must be called before any calls to HAS_PCH_* */ intel_detect_pch (dev_priv); +intel_wopcm_init_early (&dev_priv->wopcm); +intel_uc_init_early (dev_priv);intel_pm_setup (dev_priv);intel_init_dpio (dev_priv);intel_power_domains_init (dev_priv);@@ -938,18 +942,13 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv,intel_init_display_hooks (dev_priv);intel_init_clock_gating_hooks (dev_priv);intel_init_audio_hooks (dev_priv); - ret =i915_gem_load_init (dev_priv); -if (ret <0 ) - goto err_irq; -intel_display_crc_init (dev_priv);intel_detect_preproduction_hw (dev_priv);return 0 ; -err_irq: -intel_irq_fini (dev_priv); +err_workqueues:i915_workqueues_cleanup (dev_priv); err_engines:i915_engines_cleanup (dev_priv);
drivers/gpu/drm/i915/i915_drv.c static int i915_driver_init_early(struct drm_i915_private *dev_priv, · line 965
Quoted 6 lines
drivers/gpu/drm/i915/i915_drv.c +1
-1@@ -962,8 +961,8 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv,*/ static void i915_driver_cleanup_early (struct drm_i915_private *dev_priv) { -i915_gem_load_cleanup (dev_priv);intel_irq_fini (dev_priv); +i915_gem_load_cleanup (dev_priv);
Ok, onion preserved.
drivers/gpu/drm/i915/i915_drv.c static int i915_driver_init_early(struct drm_i915_private *dev_priv, · line 967
Quoted 2 lines
drivers/gpu/drm/i915/i915_drv.c +0
-0i915_workqueues_cleanup (dev_priv);i915_engines_cleanup (dev_priv);
* mutters about dead code.
Code reordering looks fine,
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 1 line · Chris Wilson
Quoting Michal Wajdeczko (2018-03-22 20:36:57)
/snip/
Quoted 11 lines
drivers/gpu/drm/i915/i915_drv.c static int i915_driver_init_early(struct · line 967
Quoted 9 lines
drivers/gpu/drm/i915/i915_drv.c +1
-1@@ -962,8 +961,8 @@ static int i915_driver_init_early(structdrm_i915_private *dev_priv, */ static void i915_driver_cleanup_early (struct drm_i915_private *dev_priv) { -i915_gem_load_cleanup (dev_priv);intel_irq_fini (dev_priv); +i915_gem_load_cleanup (dev_priv);Ok, onion preserved.
For symmetry, I'll also rename this to i915_gem_cleanup_early
/m
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 1/3 drm/i915: Reorder early initialization
In reply to Michal WajdeczkoIn upcoming patch, we want to perform more actions in early initialization of the uC. This reordering will help resolve new dependencies that will be introduced by future patch.
v2: s/i915_gem_load_init/i915_gem_init_early (Chris)
--- drivers/gpu/drm/i915/i915_drv.c | 17 ++++++++--------- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/i915_gem.c | 3 +-- 3 files changed, 10 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +8 -9
@@ -919,17 +919,21 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv,mutex_init (&dev_priv->wm.wm_mutex);mutex_init (&dev_priv->pps_mutex); -intel_wopcm_init_early (&dev_priv->wopcm); -intel_uc_init_early (dev_priv);i915_memcpy_init_early (dev_priv); ret =i915_workqueues_init (dev_priv);if (ret <0 ) goto err_engines; + ret =i915_gem_init_early (dev_priv); +if (ret <0 ) + goto err_workqueues; +/* This must be called before any calls to HAS_PCH_* */ intel_detect_pch (dev_priv); +intel_wopcm_init_early (&dev_priv->wopcm); +intel_uc_init_early (dev_priv);intel_pm_setup (dev_priv);intel_init_dpio (dev_priv);intel_power_domains_init (dev_priv);
@@ -938,18 +942,13 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv,intel_init_display_hooks (dev_priv);intel_init_clock_gating_hooks (dev_priv);intel_init_audio_hooks (dev_priv); - ret =i915_gem_load_init (dev_priv); -if (ret <0 ) - goto err_irq; -intel_display_crc_init (dev_priv);intel_detect_preproduction_hw (dev_priv);return 0 ; -err_irq: -intel_irq_fini (dev_priv); +err_workqueues:i915_workqueues_cleanup (dev_priv); err_engines:i915_engines_cleanup (dev_priv);
@@ -962,8 +961,8 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv,*/ static void i915_driver_cleanup_early (struct drm_i915_private *dev_priv) { -i915_gem_load_cleanup (dev_priv);intel_irq_fini (dev_priv); +i915_gem_load_cleanup (dev_priv);i915_workqueues_cleanup (dev_priv);i915_engines_cleanup (dev_priv); }
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -2869,7 +2869,7 @@ int i915_gem_get_aperture_ioctl(struct drm_device *dev, void *data,int i915_gem_wait_ioctl (struct drm_device *dev,void *data,struct drm_file *file_priv);void i915_gem_sanitize (struct drm_i915_private *i915); -int i915_gem_load_init (struct drm_i915_private *dev_priv); +int i915_gem_init_early (struct drm_i915_private *dev_priv);void i915_gem_load_cleanup (struct drm_i915_private *dev_priv);void i915_gem_load_init_fences (struct drm_i915_private *dev_priv);int i915_gem_freeze (struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/i915_gem.c +1 -2
@@ -5502,8 +5502,7 @@ static void i915_gem_init__mm(struct drm_i915_private *i915)INIT_WORK (&i915->mm.free_work, __i915_gem_free_work); } -int -i915_gem_load_init (struct drm_i915_private *dev_priv) +int i915_gem_init_early (struct drm_i915_private *dev_priv) {int err = -ENOMEM ;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 2/3 drm/i915/uc: Fetch uC firmware in init_early
We were fetching uC firmwares in separate uc_init_fw step, while there is no reason why we can't fetch them during init_early. This will also simplify upcoming patches, as size of the firmware may be used for register initialization.
--- drivers/gpu/drm/i915/i915_drv.c | 8 ++------ drivers/gpu/drm/i915/intel_guc_fw.c | 5 ++--- drivers/gpu/drm/i915/intel_huc_fw.c | 5 ++--- drivers/gpu/drm/i915/intel_uc.c | 37 ++++++++++++++++++------------------- drivers/gpu/drm/i915/intel_uc.h | 3 +-- 5 files changed, 25 insertions(+), 33 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +2 -6
@@ -692,11 +692,9 @@ static int i915_load_modeset_init(struct drm_device *dev)if (ret) goto cleanup_irq; -intel_uc_init_fw (dev_priv); - ret =i915_gem_init (dev_priv);if (ret) - goto cleanup_uc; + goto cleanup_irq;intel_setup_overlay (dev_priv);
@@ -716,8 +714,6 @@ static int i915_load_modeset_init(struct drm_device *dev)if (i915_gem_suspend (dev_priv))DRM_ERROR ("failed to idle hardware; continuing to unload!\n" );i915_gem_fini (dev_priv); -cleanup_uc: -intel_uc_fini_fw (dev_priv); cleanup_irq:drm_irq_uninstall (dev);intel_teardown_gmbus (dev_priv);
@@ -962,6 +958,7 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv,static void i915_driver_cleanup_early (struct drm_i915_private *dev_priv) {intel_irq_fini (dev_priv); +intel_uc_cleanup_early (dev_priv);i915_gem_load_cleanup (dev_priv);i915_workqueues_cleanup (dev_priv);i915_engines_cleanup (dev_priv);
@@ -1457,7 +1454,6 @@ void i915_driver_unload(struct drm_device *dev)i915_reset_error_state (dev_priv);i915_gem_fini (dev_priv); -intel_uc_fini_fw (dev_priv);intel_fbc_cleanup_cfb (dev_priv);intel_power_domains_fini (dev_priv);
drivers/gpu/drm/i915/intel_guc_fw.c +2 -3
@@ -275,9 +275,8 @@ static int guc_fw_xfer(struct intel_uc_fw *guc_fw, struct i915_vma *vma)* Called from intel_uc_init_hw() during driver load, resume from sleep and * after a GPU reset. * -* The firmware image should have already been fetched into memory by the -* earlier call to intel_uc_init_fw(), so here we need to only check that -* fetch succeeded, and then transfer the image to the h/w. +* The firmware image should have already been fetched into memory, so only +* check that fetch succeeded, and then transfer the image to the h/w. * * Return: non-zero code on error */
drivers/gpu/drm/i915/intel_huc_fw.c +2 -3
@@ -155,9 +155,8 @@ static int huc_fw_xfer(struct intel_uc_fw *huc_fw, struct i915_vma *vma)* Called from intel_uc_init_hw() during driver load, resume from sleep and * after a GPU reset. Note that HuC must be loaded before GuC. * -* The firmware image should have already been fetched into memory by the -* earlier call to intel_uc_init_fw(), so here we need to only check that -* fetch succeeded, and then transfer the image to the h/w. +* The firmware image should have already been fetched into memory, so only +* check that fetch succeeded, and then transfer the image to the h/w. * * Return: non-zero code on error */
drivers/gpu/drm/i915/intel_uc.c +18 -19
@@ -162,36 +162,35 @@ static void sanitize_options_early(struct drm_i915_private *dev_priv)GEM_BUG_ON (i915_modparams.guc_log_level <0 ); } -void intel_uc_init_early (struct drm_i915_private *dev_priv) +void intel_uc_init_early (struct drm_i915_private *i915) { -intel_guc_init_early (&dev_priv->guc); -intel_huc_init_early (&dev_priv->huc); +struct intel_guc *guc = &i915->guc; +struct intel_huc *huc = &i915->huc; -sanitize_options_early (dev_priv); -} +intel_guc_init_early (guc); +intel_huc_init_early (huc); -void intel_uc_init_fw (struct drm_i915_private *dev_priv) -{ -if (!USES_GUC (dev_priv)) -return ; +sanitize_options_early (i915); -if (USES_HUC (dev_priv)) -intel_uc_fw_fetch (dev_priv, &dev_priv->huc.fw); +if (USES_GUC (i915)) +intel_uc_fw_fetch (i915, &guc->fw); -intel_uc_fw_fetch (dev_priv, &dev_priv->guc.fw); +if (USES_HUC (i915)) +intel_uc_fw_fetch (i915, &huc->fw); } -void intel_uc_fini_fw (struct drm_i915_private *dev_priv) +void intel_uc_cleanup_early (struct drm_i915_private *i915) { -if (!USES_GUC (dev_priv)) -return ; +struct intel_guc *guc = &i915->guc; +struct intel_huc *huc = &i915->huc; -intel_uc_fw_fini (&dev_priv->guc.fw); +if (USES_HUC (i915)) +intel_uc_fw_fini (&huc->fw); -if (USES_HUC (dev_priv)) -intel_uc_fw_fini (&dev_priv->huc.fw); +if (USES_GUC (i915)) +intel_uc_fw_fini (&guc->fw); -guc_free_load_err_log (&dev_priv->guc); +guc_free_load_err_log (guc); }/**
drivers/gpu/drm/i915/intel_uc.h +1 -2
@@ -29,9 +29,8 @@#include "i915_params.h" void intel_uc_init_early (struct drm_i915_private *dev_priv); +void intel_uc_cleanup_early (struct drm_i915_private *dev_priv);void intel_uc_init_mmio (struct drm_i915_private *dev_priv); -void intel_uc_init_fw (struct drm_i915_private *dev_priv); -void intel_uc_fini_fw (struct drm_i915_private *dev_priv);int intel_uc_init_misc (struct drm_i915_private *dev_priv);void intel_uc_fini_misc (struct drm_i915_private *dev_priv);void intel_uc_sanitize (struct drm_i915_private *dev_priv);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 3/3 HAX: Enable GuC for CI
In reply to Michal Wajdeczko--- drivers/gpu/drm/i915/i915_params.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_params.h +1 -1
@@ -47,7 +47,7 @@ param(int, disable_power_well, -1) \ param(int, enable_ips, 1) \ param(int, invert_brightness, 0) \ - param(int, enable_guc, 0) \ + param(int, enable_guc, -1) \ param(int, guc_log_level, -1) \ param(char *, guc_firmware_path, NULL) \param (char *, huc_firmware_path, NULL) \
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for series starting with [v2,3/3] HAX: Enable GuC for CI (rev4)
In reply to Michal Wajdeczko== Series Details ==
== Series Details ==
Series: series starting with [v2,3/3] HAX: Enable GuC for CI (rev4)
URL : https://patchwork.freedesktop.org/series/40516/
State : failure
== Summary ==
Applying: HAX: Enable GuC for CI
Applying: drm/i915/uc: Fetch uC firmware in init_early
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/i915_drv.c
Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/i915_drv.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.c Patch failed at 0002 drm/i915/uc: Fetch uC firmware in init_early The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Fi.CI.BAT: failure for series starting with [v2,3/3] HAX: Enable GuC for CI (rev4)
Quoting Patchwork (2018-03-22 21:52:05)
Quoted 8 lines
== Series Details ==
Series: series starting with [v2,3/3] HAX: Enable GuC for CI (rev4)
URL : https://patchwork.freedesktop.org/series/40516/
State : failure== Summary ==
Quoted 13 lines
Applying: HAX: Enable GuC for CI
Applying: drm/i915/uc: Fetch uC firmware ininit_early
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
Mdrivers/gpu/drm/i915/i915_drv.c
Falling back to patching base and 3-way merge... Auto-mergingdrivers/gpu/drm/i915/i915_drv.c
CONFLICT (content): Merge conflict indrivers/gpu/drm/i915/i915_drv.cPatch failed at 0002 drm/i915/uc: Fetch uC firmware ininit_earlyThe copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort".
Send it afresh, pw got confused by the reply with a different series length.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx