* [PATCH] firmware/dmc/icl: Add MODULE_FIRMWARE()
@ 2018-09-05 19:50 Anusha Srivatsa
2018-09-05 20:39 ` ✗ Fi.CI.BAT: failure for " Patchwork
2018-09-05 23:10 ` [PATCH] " Rodrigo Vivi
0 siblings, 2 replies; 3+ messages in thread
From: Anusha Srivatsa @ 2018-09-05 19:50 UTC (permalink / raw)
To: intel-gfx
Add missing MODULE_FIRMWARE while loading DMC on Icelake.
Rebased on top of https://patchwork.freedesktop.org/patch/246153/
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
---
drivers/gpu/drm/i915/intel_csr.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c
index 4aa8f3d..d48186e 100644
--- a/drivers/gpu/drm/i915/intel_csr.c
+++ b/drivers/gpu/drm/i915/intel_csr.c
@@ -35,6 +35,7 @@
*/
#define I915_CSR_ICL "i915/icl_dmc_ver1_07.bin"
+MODULE_FIRMWARE(I915_CSR_ICL);
#define ICL_CSR_VERSION_REQUIRED CSR_VERSION(1, 7)
#define I915_CSR_GLK "i915/glk_dmc_ver1_04.bin"
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 3+ messages in thread
* ✗ Fi.CI.BAT: failure for firmware/dmc/icl: Add MODULE_FIRMWARE()
2018-09-05 19:50 [PATCH] firmware/dmc/icl: Add MODULE_FIRMWARE() Anusha Srivatsa
@ 2018-09-05 20:39 ` Patchwork
2018-09-05 23:10 ` [PATCH] " Rodrigo Vivi
1 sibling, 0 replies; 3+ messages in thread
From: Patchwork @ 2018-09-05 20:39 UTC (permalink / raw)
To: Anusha Srivatsa; +Cc: intel-gfx
== Series Details ==
Series: firmware/dmc/icl: Add MODULE_FIRMWARE()
URL : https://patchwork.freedesktop.org/series/49229/
State : failure
== Summary ==
Applying: firmware/dmc/icl: Add MODULE_FIRMWARE()
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/intel_csr.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_csr.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_csr.c
error: Failed to merge in the changes.
Patch failed at 0001 firmware/dmc/icl: Add MODULE_FIRMWARE()
Use 'git am --show-current-patch' to see the failed 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
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] firmware/dmc/icl: Add MODULE_FIRMWARE()
2018-09-05 19:50 [PATCH] firmware/dmc/icl: Add MODULE_FIRMWARE() Anusha Srivatsa
2018-09-05 20:39 ` ✗ Fi.CI.BAT: failure for " Patchwork
@ 2018-09-05 23:10 ` Rodrigo Vivi
1 sibling, 0 replies; 3+ messages in thread
From: Rodrigo Vivi @ 2018-09-05 23:10 UTC (permalink / raw)
To: Anusha Srivatsa; +Cc: intel-gfx
On Wed, Sep 05, 2018 at 12:50:35PM -0700, Anusha Srivatsa wrote:
> Add missing MODULE_FIRMWARE while loading DMC on Icelake.
>
> Rebased on top of https://patchwork.freedesktop.org/patch/246153/
What about a Fixes after the patch gets pushed?
so with message removed or replaced by a proper fixes
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
>
> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
> ---
> drivers/gpu/drm/i915/intel_csr.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c
> index 4aa8f3d..d48186e 100644
> --- a/drivers/gpu/drm/i915/intel_csr.c
> +++ b/drivers/gpu/drm/i915/intel_csr.c
> @@ -35,6 +35,7 @@
> */
>
> #define I915_CSR_ICL "i915/icl_dmc_ver1_07.bin"
> +MODULE_FIRMWARE(I915_CSR_ICL);
> #define ICL_CSR_VERSION_REQUIRED CSR_VERSION(1, 7)
>
> #define I915_CSR_GLK "i915/glk_dmc_ver1_04.bin"
> --
> 2.7.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-09-05 23:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-09-05 19:50 [PATCH] firmware/dmc/icl: Add MODULE_FIRMWARE() Anusha Srivatsa
2018-09-05 20:39 ` ✗ Fi.CI.BAT: failure for " Patchwork
2018-09-05 23:10 ` [PATCH] " Rodrigo Vivi
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.