drm/i915: Guc code reorg
Subsystems (2)
v2 cover drm/i915: Guc code reorg
Other pending series will try to fix current GuC code. Lets move some functions to dedicated files now to make place for these changes and preserve history.
v2: move guc files in one step (Joonas)
don't rename dev_priv (Joonas)
uc_init_mmio (Sagar)
Michal Wajdeczko (5):
drm/i915/uc: Drop unnecessary forward declaration drm/i915/uc: Move uC fw helper code into dedicated files drm/i915/huc: Move HuC declarations into dedicated header drm/i915/guc: Move Guc early init into own function drm/i915/guc: Move GuC declarations and functions into dedicated files
Sagar Arun Kamble (1):
drm/i915/uc: Create intel_uc_init_mmio
drivers/gpu/drm/i915/Makefile | 2 + drivers/gpu/drm/i915/i915_drv.c | 2 + drivers/gpu/drm/i915/i915_guc_submission.c | 94 --------- drivers/gpu/drm/i915/intel_guc.c | 262 +++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_guc.h | 178 +++++++++++++++++ drivers/gpu/drm/i915/intel_huc.h | 38 ++++ drivers/gpu/drm/i915/intel_uc.c | 301 +---------------------------- drivers/gpu/drm/i915/intel_uc.h | 229 +--------------------- drivers/gpu/drm/i915/intel_uc_fw.c | 178 +++++++++++++++++ drivers/gpu/drm/i915/intel_uc_fw.h | 95 +++++++++ 10 files changed, 766 insertions(+), 613 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_guc.c create mode 100644 drivers/gpu/drm/i915/intel_guc.h create mode 100644 drivers/gpu/drm/i915/intel_huc.h create mode 100644 drivers/gpu/drm/i915/intel_uc_fw.c create mode 100644 drivers/gpu/drm/i915/intel_uc_fw.h
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 1/6 drm/i915/uc: Drop unnecessary forward declaration
We don't need it here.
--- drivers/gpu/drm/i915/intel_uc.h | 2 -- 1 file changed, 2 deletions(-)
drivers/gpu/drm/i915/intel_uc.h +0 -2
@@ -30,8 +30,6 @@#include "intel_guc_ct.h" #include "i915_vma.h" -struct drm_i915_gem_request ; -/* * This structure primarily describes the GEM object shared with the GuC. * The specs sometimes refer to this object as a "GuC context", but we use
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 2/6 drm/i915/uc: Move uC fw helper code into dedicated files
In reply to Michal WajdeczkoThis is a prerequisite to unblock next steps.
--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/intel_uc.c | 159 +-------------------------------- drivers/gpu/drm/i915/intel_uc.h | 67 +------------- drivers/gpu/drm/i915/intel_uc_fw.c | 178 +++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_uc_fw.h | 95 ++++++++++++++++++++ 5 files changed, 279 insertions(+), 221 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_uc_fw.c create mode 100644 drivers/gpu/drm/i915/intel_uc_fw.h
drivers/gpu/drm/i915/Makefile +1 -0
@@ -59,6 +59,7 @@ i915-y += i915_cmd_parser.o \ # general-purpose microcontroller (GuC) support i915-y += intel_uc.o \ + intel_uc_fw.o \ intel_guc_ct.o \ intel_guc_log.o \ intel_guc_loader.o \
drivers/gpu/drm/i915/intel_uc.c +4 -155
177 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uc.h +1 -66
79 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uc_fw.c new file +178 -0
178 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uc_fw.h new file +95 -0
95 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 2/6] drm/i915/uc: Move uC fw helper code into dedicated files
Quoted 1 line · Michal Wajdeczko
This is a prerequisite to unblock next steps.
This is not a very good commit message when somebody is looking at this patch individually. Something along lines "To improve code separation, move uC firmware helper code into dedicated files."
Quoted 6 lines
Signed-off-by Michal Wajdeczko <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Chris Wilson <[email protected]>Cc Sagar Arun Kamble <[email protected]>Reviewed-by Sagar Arun Kamble <[email protected]>
<SNIP>
drivers/gpu/drm/i915/intel_uc.c void intel_uc_init_early(struct drm_i915_private *dev_priv) · line 106
Quoted 7 lines
void
intel_uc_init_fw(struct drm_i915_private *dev_priv){drivers/gpu/drm/i915/intel_uc.c +2
-2-fetch_uc_fw (dev_priv, &dev_priv->huc.fw); -fetch_uc_fw (dev_priv, &dev_priv->guc.fw); +i915_fetch_uc_fw (dev_priv, &dev_priv->huc.fw); +i915_fetch_uc_fw (dev_priv, &dev_priv->guc.fw); }
The microcontroller firmware most definitely is not a driver only construct, so just call the function intel_uc_fw_init for less confusion. We also validate and place in GTT the FW in addition to fetching it.
drivers/gpu/drm/i915/intel_uc.c void intel_uc_init_early(struct drm_i915_private *dev_priv) · line 112
Quoted 7 lines
void
intel_uc_fini_fw(struct drm_i915_private *dev_priv){drivers/gpu/drm/i915/intel_uc.c +2
-2-__intel_uc_fw_fini (&dev_priv->guc.fw); -__intel_uc_fw_fini (&dev_priv->huc.fw); +intel_uc_fw_fini (&dev_priv->guc.fw); +intel_uc_fw_fini (&dev_priv->huc.fw); }
And then this looks more symmetric, too.
When we have 'intel_uc_fw.h' for 'intel_uc_fw' object, I pretty much assume to only see intel_uc_fw_* functions in there. Also, please reoder the .h and .c so that init is first, and fini is after.
With those changes, this is;
Regards, Joonas
Signature · 7 lines
Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 3/6 drm/i915/uc: Create intel_uc_init_mmio
In reply to Michal WajdeczkoFrom: Sagar Arun Kamble <[email protected]>
This patch adds new function intel_uc_init_mmio which will initialize MMIO access related variables prior to uc load/init.
v2: Removed unnecessary export of guc_send_init_regs. Created intel_uc_init_mmio that currently wraps guc_init_send_regs. (Michal)
--- drivers/gpu/drm/i915/i915_drv.c | 2 ++ drivers/gpu/drm/i915/intel_uc.c | 7 +++++-- drivers/gpu/drm/i915/intel_uc.h | 1 + 3 files changed, 8 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +2 -0
@@ -1007,6 +1007,8 @@ static int i915_driver_init_mmio(struct drm_i915_private *dev_priv)intel_uncore_init (dev_priv); +intel_uc_init_mmio (dev_priv); + ret =intel_engines_init_mmio (dev_priv);if (ret) goto err_uncore;
drivers/gpu/drm/i915/intel_uc.c +5 -2
@@ -137,6 +137,11 @@ static void guc_init_send_regs(struct intel_guc *guc) guc->send_regs.fw_domains = fw_domains; } +void intel_uc_init_mmio (struct drm_i915_private *dev_priv) +{ +guc_init_send_regs (&dev_priv->guc); +} +static void guc_capture_load_err_log (struct intel_guc *guc) {if (!guc->log.vma || i915_modparams.guc_log_level <0 )
@@ -158,8 +163,6 @@ static int guc_enable_communication(struct intel_guc *guc) {struct drm_i915_private *dev_priv =guc_to_i915 (guc); -guc_init_send_regs (guc); -if (HAS_GUC_CT (dev_priv))return intel_guc_enable_ct (guc);
drivers/gpu/drm/i915/intel_uc.h +1 -0
@@ -137,6 +137,7 @@ struct intel_huc {/* intel_uc.c */ void intel_uc_sanitize_options (struct drm_i915_private *dev_priv);void intel_uc_init_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_hw (struct drm_i915_private *dev_priv);
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 3/6] drm/i915/uc: Create intel_uc_init_mmio
Quoted 5 lines · Michal Wajdeczko
From: Sagar Arun Kamble <[email protected]>
This patch adds new function
intel_uc_init_mmiowhich will initialize MMIO access related variables prior to uc load/init.
Quoted 7 lines
v2: Removed unnecessary export of
guc_send_init_regs. Createdintel_uc_init_mmiothat currently wrapsguc_init_send_regs. (Michal)Cc Michal Wajdeczko <[email protected]>Cc Michał Winiarski <[email protected]>Signed-off-by Sagar Arun Kamble <[email protected]>Signed-off-by Michal Wajdeczko <[email protected]>
Looks good to me.
Quoted 49 lines
--- drivers/gpu/drm/i915/i915_drv.c | 2 ++ drivers/gpu/drm/i915/intel_uc.c | 7 +++++-- drivers/gpu/drm/i915/intel_uc.h | 1 + 3 files changed, 8 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/i915_drv.c +2
-0@@ -1007,6 +1007,8 @@ static int i915_driver_init_mmio(struct drm_i915_private *dev_priv)intel_uncore_init (dev_priv); +intel_uc_init_mmio (dev_priv); + ret =intel_engines_init_mmio (dev_priv);if (ret) goto err_uncore;drivers/gpu/drm/i915/intel_uc.c +5
-2@@ -137,6 +137,11 @@ static void guc_init_send_regs(struct intel_guc *guc) guc->send_regs.fw_domains = fw_domains; } +void intel_uc_init_mmio (struct drm_i915_private *dev_priv) +{ +guc_init_send_regs (&dev_priv->guc); +} +static void guc_capture_load_err_log (struct intel_guc *guc) {if (!guc->log.vma || i915_modparams.guc_log_level <0 )@@ -158,8 +163,6 @@ static int guc_enable_communication(struct intel_guc *guc) {struct drm_i915_private *dev_priv =guc_to_i915 (guc); -guc_init_send_regs (guc); -if (HAS_GUC_CT (dev_priv))return intel_guc_enable_ct (guc);drivers/gpu/drm/i915/intel_uc.h +0
-0
drivers/gpu/drm/i915/intel_uc.h struct intel_huc { · line 143
Quoted 7 lines
drivers/gpu/drm/i915/intel_uc.h +1
-0@@ -137,6 +137,7 @@ struct intel_huc {/* intel_uc.c */ void intel_uc_sanitize_options (struct drm_i915_private *dev_priv);void intel_uc_init_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_hw (struct drm_i915_private *dev_priv);
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Joonas Lahtinen
maintainerRe: [PATCH v2 3/6] drm/i915/uc: Create intel_uc_init_mmio
Quoted 10 lines · Sagar Arun Kamble
Quoted 8 lines · Michal Wajdeczko
From: Sagar Arun Kamble <[email protected]>
This patch adds new function
intel_uc_init_mmiowhich will initialize MMIO access related variables prior to uc load/init.v2: Removed unnecessary export of
guc_send_init_regs. Createdintel_uc_init_mmiothat currently wrapsguc_init_send_regs. (Michal)
Quoted 7 lines
Quoted 4 lines
Cc Michal Wajdeczko <[email protected]>Cc Michał Winiarski <[email protected]>Signed-off-by Sagar Arun Kamble <[email protected]>Signed-off-by Michal Wajdeczko <[email protected]>Looks good to me.
Acking code written (even partially) by you would not be the thing to do :)
https://www.kernel.org/doc/html/v4.12/process/submitting-patches.html#when-to-use-acked-by-and-cc
It has your "From:" and S-o-b, so that should be enough, the chronological order here should be;
From: Sagar
...
v2 (Michal): ...
S-o-b: Sagar
Cc: Michal
Cc: Michał
S-o-b: Michal
This would show that Sagar originally wrote the patch, and Michael has made further modifications to the original.
Regards, Joonas
Signature · 7 lines
Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 3/6] drm/i915/uc: Create intel_uc_init_mmio
In reply to Michal WajdeczkoQuoted 12 lines · Michal Wajdeczko
From: Sagar Arun Kamble <[email protected]>
This patch adds new function
intel_uc_init_mmiowhich will initialize MMIO access related variables prior to uc load/init.v2: Removed unnecessary export of
guc_send_init_regs. Createdintel_uc_init_mmiothat currently wrapsguc_init_send_regs. (Michal)Cc Michal Wajdeczko <[email protected]>Cc Michał Winiarski <[email protected]>Signed-off-by Sagar Arun Kamble <[email protected]>Signed-off-by Michal Wajdeczko <[email protected]>
<SNIP>
drivers/gpu/drm/i915/intel_uc.c static void guc_init_send_regs(struct intel_guc *guc) · line 139
Quoted 5 lines
+++
b/drivers/gpu/drm/i915/intel_uc.cdrivers/gpu/drm/i915/intel_uc.c +0
-0@@ -137,6 +137,11 @@ static void guc_init_send_regs(struct intel_guc *guc) guc->send_regs.fw_domains = fw_domains; }
Please add kerneldoc.
Quoted 4 lines
drivers/gpu/drm/i915/intel_uc.c +4
-0+void intel_uc_init_mmio (struct drm_i915_private *dev_priv) +{ +guc_init_send_regs (&dev_priv->guc); +}
<SNIP>
drivers/gpu/drm/i915/intel_uc.h struct intel_huc { · line 137
Quoted 3 lines
+++
b/drivers/gpu/drm/i915/intel_uc.hdrivers/gpu/drm/i915/intel_uc.h +0
-0@@ -137,6 +137,7 @@ struct intel_huc {/* intel_uc.c */
I think this comment could have been dropped when moving to a separate file :)
drivers/gpu/drm/i915/intel_uc.h struct intel_huc { · line 143
Quoted 6 lines
drivers/gpu/drm/i915/intel_uc.h +1
-0void intel_uc_sanitize_options (struct drm_i915_private *dev_priv);void intel_uc_init_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_hw (struct drm_i915_private *dev_priv);
This should really be after init_mmio to clarify the calling order, so you may want to reorder this when doing the code motion. It should not be possible to cause whitespace or compilation issues, so it's OK.
With the kerneldoc, this is;
Regards, Joonas
Signature · 7 lines
Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 4/6 drm/i915/huc: Move HuC declarations into dedicated header
In reply to Michal WajdeczkoWe want to keep each uC specific code in separate files.
--- drivers/gpu/drm/i915/intel_huc.h | 38 ++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_uc.h | 13 +------------ 2 files changed, 39 insertions(+), 12 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_huc.h
drivers/gpu/drm/i915/intel_huc.h new file +38 -0
@@ -0,0 +1,38 @@ +/* +* Copyright © 2014-2017 Intel Corporation +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice (including the next +* paragraph) shall be included in all copies or substantial portions of the +* Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +* IN THE SOFTWARE. +* +*/ +#ifndef _INTEL_HUC_H_ +#define _INTEL_HUC_H_ + +struct intel_huc { +/* Generic uC firmware management */ +struct intel_uc_fw fw; + +/* HuC-specific additions */ +}; + +void intel_huc_select_fw (struct intel_huc *huc); +void intel_huc_init_hw (struct intel_huc *huc); +void intel_huc_auth (struct intel_huc *huc); + +#endif
drivers/gpu/drm/i915/intel_uc.h +1 -12
@@ -30,6 +30,7 @@#include "intel_ringbuffer.h" #include "intel_guc_ct.h" #include "i915_vma.h" +#include "intel_huc.h" /* * This structure primarily describes the GEM object shared with the GuC.
@@ -127,13 +128,6 @@ struct intel_guc {void (*notify)(struct intel_guc *guc); }; -struct intel_huc { -/* Generic uC firmware management */ -struct intel_uc_fw fw; - -/* HuC-specific additions */ -}; -/* intel_uc.c */ void intel_uc_sanitize_options (struct drm_i915_private *dev_priv);void intel_uc_init_early (struct drm_i915_private *dev_priv);
@@ -186,9 +180,4 @@ static inline u32 guc_ggtt_offset(struct i915_vma *vma) return offset; } -/* intel_huc.c */ -void intel_huc_select_fw (struct intel_huc *huc); -void intel_huc_init_hw (struct intel_huc *huc); -void intel_huc_auth (struct intel_huc *huc); -#endif
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 4/6] drm/i915/huc: Move HuC declarations into dedicated header
Quoted 7 lines · Michal Wajdeczko
We want to keep each uC specific code in separate files.
Signed-off-by Michal Wajdeczko <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Chris Wilson <[email protected]>Cc Sagar Arun Kamble <[email protected]>Reviewed-by Sagar Arun Kamble <[email protected]>
Regards, Joonas
Signature · 7 lines
Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 5/6 drm/i915/guc: Move Guc early init into own function
In reply to Michal WajdeczkoWe don't want to make aggregate uc functions to be too detailed. This will also make future patch easier.
--- drivers/gpu/drm/i915/intel_uc.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_uc.c +6 -3
@@ -88,10 +88,8 @@ static void gen8_guc_raise_irq(struct intel_guc *guc)I915_WRITE (GUC_SEND_INTERRUPT ,GUC_SEND_TRIGGER ); } -void intel_uc_init_early (struct drm_i915_private *dev_priv) +static void guc_init_early (struct intel_guc *guc) { -struct intel_guc *guc = &dev_priv->guc; -intel_guc_ct_init_early (&guc->ct);mutex_init (&guc->send_mutex);
@@ -99,6 +97,11 @@ void intel_uc_init_early(struct drm_i915_private *dev_priv) guc->notify = gen8_guc_raise_irq; } +void intel_uc_init_early (struct drm_i915_private *dev_priv) +{ +guc_init_early (&dev_priv->guc); +} +void intel_uc_init_fw (struct drm_i915_private *dev_priv) {i915_fetch_uc_fw (dev_priv, &dev_priv->huc.fw);
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 5/6] drm/i915/guc: Move Guc early init into own function
Quoted 5 lines · Michal Wajdeczko
We don't want to make aggregate uc functions to be too detailed. This will also make future patch easier.
Signed-off-by Michal Wajdeczko <[email protected]>Cc Sagar Arun Kamble <[email protected]>
Quoted 22 lines
--- drivers/gpu/drm/i915/intel_uc.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/intel_uc.c +1
-3@@ -88,10 +88,8 @@ static void gen8_guc_raise_irq(struct intel_guc *guc)I915_WRITE (GUC_SEND_INTERRUPT ,GUC_SEND_TRIGGER ); } -void intel_uc_init_early (struct drm_i915_private *dev_priv) +static void guc_init_early (struct intel_guc *guc) { -struct intel_guc *guc = &dev_priv->guc; -intel_guc_ct_init_early (&guc->ct);mutex_init (&guc->send_mutex);@@ -99,6 +97,11 @@ void intel_uc_init_early(struct drm_i915_private *dev_priv) guc->notify = gen8_guc_raise_irq;
drivers/gpu/drm/i915/intel_uc.c void intel_uc_init_early(struct drm_i915_private *dev_priv) · line 107
Quoted 10 lines
drivers/gpu/drm/i915/intel_uc.c +5
-0} +void intel_uc_init_early (struct drm_i915_private *dev_priv) +{ +guc_init_early (&dev_priv->guc); +} +void intel_uc_init_fw (struct drm_i915_private *dev_priv) {i915_fetch_uc_fw (dev_priv, &dev_priv->huc.fw);
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 6/6 drm/i915/guc: Move GuC declarations and functions into dedicated files
In reply to Michal WajdeczkoWe want to keep GuC specific code in separated files.
v2: move all functions in single patch (Joonas)
fix old checkpatch issues (Sagar)
--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_guc_submission.c | 94 ----------- drivers/gpu/drm/i915/intel_guc.c | 262 +++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_guc.h | 178 ++++++++++++++++++++ drivers/gpu/drm/i915/intel_uc.c | 146 +--------------- drivers/gpu/drm/i915/intel_uc.h | 146 +--------------- 6 files changed, 444 insertions(+), 383 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_guc.c create mode 100644 drivers/gpu/drm/i915/intel_guc.h
drivers/gpu/drm/i915/Makefile +1 -0
@@ -60,6 +60,7 @@ i915-y += i915_cmd_parser.o \ # general-purpose microcontroller (GuC) support i915-y += intel_uc.o \ intel_uc_fw.o \ + intel_guc.o \ intel_guc_ct.o \ intel_guc_log.o \ intel_guc_loader.o \
drivers/gpu/drm/i915/i915_guc_submission.c +0 -94
103 lines not on this page · raw message
drivers/gpu/drm/i915/intel_guc.c new file +262 -0
262 lines not on this page · raw message
drivers/gpu/drm/i915/intel_guc.h new file +178 -0
178 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uc.c +2 -144
171 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uc.h +1 -145
159 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 6/6] drm/i915/guc: Move GuC declarations and functions into dedicated files
Quoted 10 lines · Michal Wajdeczko
We want to keep GuC specific code in separated files.
v2: move all functions in single patch (Joonas)
fix old checkpatch issues (Sagar)Signed-off-by Michal Wajdeczko <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Chris Wilson <[email protected]>Cc Sagar Arun Kamble <[email protected]>Reviewed-by Sagar Arun Kamble <[email protected]> #1
Quoted 918 lines
--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_guc_submission.c | 94 ----------- drivers/gpu/drm/i915/intel_guc.c | 262 +++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_guc.h | 178 ++++++++++++++++++++ drivers/gpu/drm/i915/intel_uc.c | 146 +--------------- drivers/gpu/drm/i915/intel_uc.h | 146 +--------------- 6 files changed, 444 insertions(+), 383 deletions(-)create mode 100644
drivers/gpu/drm/i915/intel_guc.ccreate mode 100644drivers/gpu/drm/i915/intel_guc.hdrivers/gpu/drm/i915/Makefile +1
-0@@ -60,6 +60,7 @@ i915-y += i915_cmd_parser.o \ # general-purpose microcontroller (GuC) support i915-y += intel_uc.o \ intel_uc_fw.o \ + intel_guc.o \ intel_guc_ct.o \ intel_guc_log.o \ intel_guc_loader.o \drivers/gpu/drm/i915/i915_guc_submission.c +0
-94@@ -643,48 +643,6 @@ static void i915_guc_irq_handler(unsigned long data)* path of i915_guc_submit() above. */ -/** -* intel_guc_allocate_vma() - Allocate a GGTT VMA for GuC usage -* @guc: the guc -* @size: size of area to allocate (both virtual space and memory) -* -* This is a wrapper to create an object for use with the GuC. In order to -* use it inside the GuC, an object needs to be pinned lifetime, so we allocate -* both some backing storage and a range inside the Global GTT. We must pin -* it in the GGTT somewhere other than than [0, GUC_WOPCM_TOP) because that -* range is reserved inside GuC. -* -* Return: A i915_vma if successful, otherwise an ERR_PTR. -*/ -struct i915_vma *intel_guc_allocate_vma (struct intel_guc *guc,u32 size) -{ -struct drm_i915_private *dev_priv =guc_to_i915 (guc); -struct drm_i915_gem_object *obj; -struct i915_vma *vma; -int ret; - - obj =i915_gem_object_create (dev_priv, size); -if (IS_ERR (obj)) -return ERR_CAST (obj); - - vma =i915_vma_instance (obj, &dev_priv->ggtt.base,NULL ); -if (IS_ERR (vma)) - goto err; - - ret =i915_vma_pin (vma,0 ,PAGE_SIZE , -PIN_GLOBAL |PIN_OFFSET_BIAS |GUC_WOPCM_TOP ); -if (ret) { - vma =ERR_PTR (ret); - goto err; - } - -return vma; - -err: -i915_gem_object_put (obj); -return vma; -} -/* Check that a doorbell register is in the expected state */ static bool doorbell_ok (struct intel_guc *guc,u16 db_id) {@@ -1212,55 +1170,3 @@ void i915_guc_submission_disable(struct drm_i915_private *dev_priv)guc_client_free (guc->execbuf_client); guc->execbuf_client =NULL ; } - -/** -* intel_guc_suspend() - notify GuC entering suspend state -* @dev_priv: i915 device private -*/ -int intel_guc_suspend (struct drm_i915_private *dev_priv) -{ -struct intel_guc *guc = &dev_priv->guc; -struct i915_gem_context *ctx; -u32 data[3 ]; - -if (guc->fw.load_status !=INTEL_UC_FIRMWARE_SUCCESS ) -return 0 ; - -gen9_disable_guc_interrupts (dev_priv); - - ctx = dev_priv->kernel_context; - - data[0 ] =INTEL_GUC_ACTION_ENTER_S_STATE ; -/* any value greater than GUC_POWER_D0 */ - data[1 ] =GUC_POWER_D1 ; -/* first page is shared data with GuC */ - data[2 ] =guc_ggtt_offset (ctx->engine[RCS ].state) +LRC_GUCSHR_PN *PAGE_SIZE ; - -return intel_guc_send (guc, data,ARRAY_SIZE (data)); -} - -/** -* intel_guc_resume() - notify GuC resuming from suspend state -* @dev_priv: i915 device private -*/ -int intel_guc_resume (struct drm_i915_private *dev_priv) -{ -struct intel_guc *guc = &dev_priv->guc; -struct i915_gem_context *ctx; -u32 data[3 ]; - -if (guc->fw.load_status !=INTEL_UC_FIRMWARE_SUCCESS ) -return 0 ; - -if (i915_modparams.guc_log_level >=0 ) -gen9_enable_guc_interrupts (dev_priv); - - ctx = dev_priv->kernel_context; - - data[0 ] =INTEL_GUC_ACTION_EXIT_S_STATE ; - data[1 ] =GUC_POWER_D0 ; -/* first page is shared data with GuC */ - data[2 ] =guc_ggtt_offset (ctx->engine[RCS ].state) +LRC_GUCSHR_PN *PAGE_SIZE ; - -return intel_guc_send (guc, data,ARRAY_SIZE (data)); -}drivers/gpu/drm/i915/intel_guc.c new file +262
-0@@ -0,0 +1,262 @@ +/* +* Copyright © 2014-2017 Intel Corporation +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice (including the next +* paragraph) shall be included in all copies or substantial portions of the +* Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +* IN THE SOFTWARE. +* +*/ +#include "i915_drv.h" + +static void gen8_guc_raise_irq (struct intel_guc *guc) +{ +struct drm_i915_private *dev_priv =guc_to_i915 (guc); + +I915_WRITE (GUC_SEND_INTERRUPT ,GUC_SEND_TRIGGER ); +} + +static inline i915_reg_t guc_send_reg (struct intel_guc *guc,u32 i) +{ +GEM_BUG_ON (!guc->send_regs.base); +GEM_BUG_ON (!guc->send_regs.count); +GEM_BUG_ON (i >= guc->send_regs.count); + +return _MMIO (guc->send_regs.base +4 * i); +} + +void intel_guc_init_send_regs (struct intel_guc *guc) +{ +struct drm_i915_private *dev_priv =guc_to_i915 (guc); +enum forcewake_domains fw_domains =0 ; +unsigned int i; + + guc->send_regs.base =i915_mmio_reg_offset (SOFT_SCRATCH (0 )); + guc->send_regs.count =SOFT_SCRATCH_COUNT -1 ; + +for (i =0 ; i < guc->send_regs.count; i++) { + fw_domains |=intel_uncore_forcewake_for_reg (dev_priv, +guc_send_reg (guc, i), +FW_REG_READ |FW_REG_WRITE ); + } + guc->send_regs.fw_domains = fw_domains; +} + +void intel_guc_init_early (struct intel_guc *guc) +{ +intel_guc_ct_init_early (&guc->ct); + +mutex_init (&guc->send_mutex); + guc->send = intel_guc_send_nop; + guc->notify = gen8_guc_raise_irq; +} + +int intel_guc_send_nop (struct intel_guc *guc,const u32 *action,u32 len) +{ +WARN (1 ,"Unexpected send: action=%#x\n" , *action); +return -ENODEV ; +} + +/* +* This function implements the MMIO based host to GuC interface. +*/ +int intel_guc_send_mmio (struct intel_guc *guc,const u32 *action,u32 len) +{ +struct drm_i915_private *dev_priv =guc_to_i915 (guc); +u32 status; +int i; +int ret; + +GEM_BUG_ON (!len); +GEM_BUG_ON (len > guc->send_regs.count); + +/* If CT is available, we expect to use MMIO only during init/fini */ +GEM_BUG_ON (HAS_GUC_CT (dev_priv) && + *action !=INTEL_GUC_ACTION_REGISTER_COMMAND_TRANSPORT_BUFFER && + *action !=INTEL_GUC_ACTION_DEREGISTER_COMMAND_TRANSPORT_BUFFER ); + +mutex_lock (&guc->send_mutex); +intel_uncore_forcewake_get (dev_priv, guc->send_regs.fw_domains); + +for (i =0 ; i < len; i++) +I915_WRITE (guc_send_reg (guc, i), action[i]); + +POSTING_READ (guc_send_reg (guc, i -1 )); + +intel_guc_notify (guc); + +/* +* No GuC command should ever take longer than 10ms. +* Fast commands should still complete in 10us. +*/ + ret =__intel_wait_for_register_fw (dev_priv, +guc_send_reg (guc,0 ), +INTEL_GUC_RECV_MASK , +INTEL_GUC_RECV_MASK , +10 ,10 , &status); +if (status !=INTEL_GUC_STATUS_SUCCESS ) { +/* +* Either the GuC explicitly returned an error (which +* we convert to -EIO here) or no response at all was +* received within the timeout limit (-ETIMEDOUT) +*/ +if (ret != -ETIMEDOUT ) + ret = -EIO ; + +DRM_WARN ("INTEL_GUC_SEND: Action 0x%X failed;" +" ret=%d status=0x%08X response=0x%08X\n" , + action[0 ], ret, status,I915_READ (SOFT_SCRATCH (15 ))); + } + +intel_uncore_forcewake_put (dev_priv, guc->send_regs.fw_domains); +mutex_unlock (&guc->send_mutex); + +return ret; +} + +int intel_guc_sample_forcewake (struct intel_guc *guc) +{ +struct drm_i915_private *dev_priv =guc_to_i915 (guc); +u32 action[2 ]; + + action[0 ] =INTEL_GUC_ACTION_SAMPLE_FORCEWAKE ; +/* WaRsDisableCoarsePowerGating:skl,bxt */ +if (!intel_enable_rc6 () ||NEEDS_WaRsDisableCoarsePowerGating (dev_priv)) + action[1 ] =0 ; +else +/* bit 0 and 1 are for Render and Media domain separately */ + action[1 ] =GUC_FORCEWAKE_RENDER |GUC_FORCEWAKE_MEDIA ; + +return intel_guc_send (guc, action,ARRAY_SIZE (action)); +} + +/** +* intel_guc_auth_huc() - Send action to GuC to authenticate HuC ucode +* @guc: intel_guc structure +* @rsa_offset: rsa offset w.r.t ggtt base of huc vma +* +* Triggers a HuC firmware authentication request to the GuC via intel_guc_send +* INTEL_GUC_ACTION_AUTHENTICATE_HUC interface. This function is invoked by +* intel_huc_auth(). +* +* Return: non-zero code on error +*/ +int intel_guc_auth_huc (struct intel_guc *guc,u32 rsa_offset) +{ +u32 action[] = { +INTEL_GUC_ACTION_AUTHENTICATE_HUC , + rsa_offset + }; + +return intel_guc_send (guc, action,ARRAY_SIZE (action)); +} + +/** +* intel_guc_suspend() - notify GuC entering suspend state +* @dev_priv: i915 device private +*/ +int intel_guc_suspend (struct drm_i915_private *dev_priv) +{ +struct intel_guc *guc = &dev_priv->guc; +struct i915_gem_context *ctx; +u32 data[3 ]; + +if (guc->fw.load_status !=INTEL_UC_FIRMWARE_SUCCESS ) +return 0 ; + +gen9_disable_guc_interrupts (dev_priv); + + ctx = dev_priv->kernel_context; + + data[0 ] =INTEL_GUC_ACTION_ENTER_S_STATE ; +/* any value greater than GUC_POWER_D0 */ + data[1 ] =GUC_POWER_D1 ; +/* first page is shared data with GuC */ + data[2 ] =guc_ggtt_offset (ctx->engine[RCS ].state) + +LRC_GUCSHR_PN *PAGE_SIZE ; + +return intel_guc_send (guc, data,ARRAY_SIZE (data)); +} + +/** +* intel_guc_resume() - notify GuC resuming from suspend state +* @dev_priv: i915 device private +*/ +int intel_guc_resume (struct drm_i915_private *dev_priv) +{ +struct intel_guc *guc = &dev_priv->guc; +struct i915_gem_context *ctx; +u32 data[3 ]; + +if (guc->fw.load_status !=INTEL_UC_FIRMWARE_SUCCESS ) +return 0 ; + +if (i915_modparams.guc_log_level >=0 ) +gen9_enable_guc_interrupts (dev_priv); + + ctx = dev_priv->kernel_context; + + data[0 ] =INTEL_GUC_ACTION_EXIT_S_STATE ; + data[1 ] =GUC_POWER_D0 ; +/* first page is shared data with GuC */ + data[2 ] =guc_ggtt_offset (ctx->engine[RCS ].state) + +LRC_GUCSHR_PN *PAGE_SIZE ; + +return intel_guc_send (guc, data,ARRAY_SIZE (data)); +} + +/** +* intel_guc_allocate_vma() - Allocate a GGTT VMA for GuC usage +* @guc: the guc +* @size: size of area to allocate (both virtual space and memory) +* +* This is a wrapper to create an object for use with the GuC. In order to +* use it inside the GuC, an object needs to be pinned lifetime, so we allocate +* both some backing storage and a range inside the Global GTT. We must pin +* it in the GGTT somewhere other than than [0, GUC_WOPCM_TOP) because that +* range is reserved inside GuC. +* +* Return: A i915_vma if successful, otherwise an ERR_PTR. +*/ +struct i915_vma *intel_guc_allocate_vma (struct intel_guc *guc,u32 size) +{ +struct drm_i915_private *dev_priv =guc_to_i915 (guc); +struct drm_i915_gem_object *obj; +struct i915_vma *vma; +int ret; + + obj =i915_gem_object_create (dev_priv, size); +if (IS_ERR (obj)) +return ERR_CAST (obj); + + vma =i915_vma_instance (obj, &dev_priv->ggtt.base,NULL ); +if (IS_ERR (vma)) + goto err; + + ret =i915_vma_pin (vma,0 ,PAGE_SIZE , +PIN_GLOBAL |PIN_OFFSET_BIAS |GUC_WOPCM_TOP ); +if (ret) { + vma =ERR_PTR (ret); + goto err; + } + +return vma; + +err: +i915_gem_object_put (obj); +return vma; +}drivers/gpu/drm/i915/intel_guc.h new file +178
-0@@ -0,0 +1,178 @@ +/* +* Copyright © 2014-2017 Intel Corporation +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice (including the next +* paragraph) shall be included in all copies or substantial portions of the +* Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +* IN THE SOFTWARE. +* +*/ +#ifndef _INTEL_GUC_H_ +#define _INTEL_GUC_H_ + +#include "intel_guc_fwif.h" +#include "intel_guc_ct.h" +#include "i915_guc_reg.h" +#include "i915_vma.h" + +/* +* This structure primarily describes the GEM object shared with the GuC. +* The specs sometimes refer to this object as a "GuC context", but we use +* the term "client" to avoid confusion with hardware contexts. This +* GEM object is held for the entire lifetime of our interaction with +* the GuC, being allocated before the GuC is loaded with its firmware. +* Because there's no way to update the address used by the GuC after +* initialisation, the shared object must stay pinned into the GGTT as +* long as the GuC is in use. We also keep the first page (only) mapped +* into kernel address space, as it includes shared data that must be +* updated on every request submission. +* +* The single GEM object described here is actually made up of several +* separate areas, as far as the GuC is concerned. The first page (kept +* kmap'd) includes the "process descriptor" which holds sequence data for +* the doorbell, and one cacheline which actually *is* the doorbell; a +* write to this will "ring the doorbell" (i.e. send an interrupt to the +* GuC). The subsequent pages of the client object constitute the work +* queue (a circular array of work items), again described in the process +* descriptor. Work queue pages are mapped momentarily as required. +*/ +struct i915_guc_client { +struct i915_vma *vma; +void *vaddr; +struct i915_gem_context *owner; +struct intel_guc *guc; + +uint32_t engines;/* bitmap of (host) engine ids */ +uint32_t priority; +u32 stage_id; +uint32_t proc_desc_offset; + +u16 doorbell_id; +unsigned long doorbell_offset; + +spinlock_t wq_lock; +/* Per-engine counts of GuC submissions */ +uint64_t submissions[I915_NUM_ENGINES ]; +}; + +struct intel_guc_log { +uint32_t flags; +struct i915_vma *vma; +/* The runtime stuff gets created only when GuC logging gets enabled */ +struct { +void *buf_addr; +struct workqueue_struct *flush_wq; +struct work_struct flush_work; +struct rchan *relay_chan; + } runtime; +/* logging related stats */ +u32 capture_miss_count; +u32 flush_interrupt_count; +u32 prev_overflow_count[GUC_MAX_LOG_BUFFER ]; +u32 total_overflow_count[GUC_MAX_LOG_BUFFER ]; +u32 flush_count[GUC_MAX_LOG_BUFFER ]; +}; + +struct intel_guc { +struct intel_uc_fw fw; +struct intel_guc_log log; +struct intel_guc_ct ct; + +/* Log snapshot if GuC errors during load */ +struct drm_i915_gem_object *load_err_log; + +/* intel_guc_recv interrupt related state */ +bool interrupts_enabled; + +struct i915_vma *ads_vma; +struct i915_vma *stage_desc_pool; +void *stage_desc_pool_vaddr; +struct ida stage_ids; + +struct i915_guc_client *execbuf_client; + + DECLARE_BITMAP(doorbell_bitmap, GUC_NUM_DOORBELLS); +uint32_t db_cacheline;/* Cyclic counter mod pagesize */ + +/* GuC's FW specific registers used in MMIO send */ +struct { +u32 base; +unsigned int count; +enum forcewake_domains fw_domains; + } send_regs; + +/* To serialize the intel_guc_send actions */ +struct mutex send_mutex; + +/* GuC's FW specific send function */ +int (*send)(struct intel_guc *guc,const u32 *data,u32 len); + +/* GuC's FW specific notify function */ +void (*notify)(struct intel_guc *guc); +}; + +static +inline int intel_guc_send (struct intel_guc *guc,const u32 *action,u32 len) +{ +return guc->send (guc, action, len); +} + +static inline void intel_guc_notify (struct intel_guc *guc) +{ + guc->notify (guc); +} + +static inline u32 guc_ggtt_offset (struct i915_vma *vma) +{ +u32 offset =i915_ggtt_offset (vma); + +GEM_BUG_ON (offset <GUC_WOPCM_TOP ); +GEM_BUG_ON (range_overflows_t (u64, offset, vma->size,GUC_GGTT_TOP )); + +return offset; +} + +/* intel_guc.c */ +void intel_guc_init_early (struct intel_guc *guc); +void intel_guc_init_send_regs (struct intel_guc *guc); +int intel_guc_send_nop (struct intel_guc *guc,const u32 *action,u32 len); +int intel_guc_send_mmio (struct intel_guc *guc,const u32 *action,u32 len); +int intel_guc_sample_forcewake (struct intel_guc *guc); +int intel_guc_auth_huc (struct intel_guc *guc,u32 rsa_offset); +int intel_guc_suspend (struct drm_i915_private *dev_priv); +int intel_guc_resume (struct drm_i915_private *dev_priv); +struct i915_vma *intel_guc_allocate_vma (struct intel_guc *guc,u32 size); + +/* intel_guc_loader.c */ +int intel_guc_select_fw (struct intel_guc *guc); +int intel_guc_init_hw (struct intel_guc *guc); +u32 intel_guc_wopcm_size (struct drm_i915_private *dev_priv); + +/* i915_guc_submission.c */ +int i915_guc_submission_init (struct drm_i915_private *dev_priv); +int i915_guc_submission_enable (struct drm_i915_private *dev_priv); +void i915_guc_submission_disable (struct drm_i915_private *dev_priv); +void i915_guc_submission_fini (struct drm_i915_private *dev_priv); + +/* intel_guc_log.c */ +int intel_guc_log_create (struct intel_guc *guc); +void intel_guc_log_destroy (struct intel_guc *guc); +int i915_guc_log_control (struct drm_i915_private *dev_priv,u64 control_val); +void i915_guc_log_register (struct drm_i915_private *dev_priv); +void i915_guc_log_unregister (struct drm_i915_private *dev_priv); + +#endif drivers/gpu/drm/i915/intel_uc.c +2
-144@@ -81,25 +81,9 @@ void intel_uc_sanitize_options(struct drm_i915_private *dev_priv) i915_modparams.enable_guc_submission =HAS_GUC_SCHED (dev_priv); } -static void gen8_guc_raise_irq (struct intel_guc *guc) -{ -struct drm_i915_private *dev_priv =guc_to_i915 (guc); - -I915_WRITE (GUC_SEND_INTERRUPT ,GUC_SEND_TRIGGER ); -} - -static void guc_init_early (struct intel_guc *guc) -{ -intel_guc_ct_init_early (&guc->ct); - -mutex_init (&guc->send_mutex); - guc->send = intel_guc_send_nop; - guc->notify = gen8_guc_raise_irq; -} -void intel_uc_init_early (struct drm_i915_private *dev_priv) { -guc_init_early (&dev_priv->guc); +intel_guc_init_early (&dev_priv->guc); }void intel_uc_init_fw (struct drm_i915_private *dev_priv)@@ -114,35 +98,9 @@ void intel_uc_fini_fw(struct drm_i915_private *dev_priv)intel_uc_fw_fini (&dev_priv->huc.fw); } -static inline i915_reg_t guc_send_reg (struct intel_guc *guc,u32 i) -{ -GEM_BUG_ON (!guc->send_regs.base); -GEM_BUG_ON (!guc->send_regs.count); -GEM_BUG_ON (i >= guc->send_regs.count); - -return _MMIO (guc->send_regs.base +4 * i); -} - -static void guc_init_send_regs (struct intel_guc *guc) -{ -struct drm_i915_private *dev_priv =guc_to_i915 (guc); -enum forcewake_domains fw_domains =0 ; -unsigned int i; - - guc->send_regs.base =i915_mmio_reg_offset (SOFT_SCRATCH (0 )); - guc->send_regs.count =SOFT_SCRATCH_COUNT -1 ; - -for (i =0 ; i < guc->send_regs.count; i++) { - fw_domains |=intel_uncore_forcewake_for_reg (dev_priv, -guc_send_reg (guc, i), -FW_REG_READ |FW_REG_WRITE ); - } - guc->send_regs.fw_domains = fw_domains; -} -void intel_uc_init_mmio (struct drm_i915_private *dev_priv) { -guc_init_send_regs (&dev_priv->guc); +intel_guc_init_send_regs (&dev_priv->guc); }static void guc_capture_load_err_log (struct intel_guc *guc)@@ -183,27 +141,6 @@ static void guc_disable_communication(struct intel_guc *guc) guc->send = intel_guc_send_nop; } -/** -* intel_guc_auth_huc() - Send action to GuC to authenticate HuC ucode -* @guc: intel_guc structure -* @rsa_offset: rsa offset w.r.t ggtt base of huc vma -* -* Triggers a HuC firmware authentication request to the GuC via intel_guc_send -* INTEL_GUC_ACTION_AUTHENTICATE_HUC interface. This function is invoked by -* intel_huc_auth(). -* -* Return: non-zero code on error -*/ -int intel_guc_auth_huc (struct intel_guc *guc,u32 rsa_offset) -{ -u32 action[] = { -INTEL_GUC_ACTION_AUTHENTICATE_HUC , - rsa_offset - }; - -return intel_guc_send (guc, action,ARRAY_SIZE (action)); -} -int intel_uc_init_hw (struct drm_i915_private *dev_priv) {struct intel_guc *guc = &dev_priv->guc;@@ -335,82 +272,3 @@ void intel_uc_fini_hw(struct drm_i915_private *dev_priv)i915_ggtt_disable_guc (dev_priv); } - -int intel_guc_send_nop (struct intel_guc *guc,const u32 *action,u32 len) -{ -WARN (1 ,"Unexpected send: action=%#x\n" , *action); -return -ENODEV ; -} - -/* -* This function implements the MMIO based host to GuC interface. -*/ -int intel_guc_send_mmio (struct intel_guc *guc,const u32 *action,u32 len) -{ -struct drm_i915_private *dev_priv =guc_to_i915 (guc); -u32 status; -int i; -int ret; - -GEM_BUG_ON (!len); -GEM_BUG_ON (len > guc->send_regs.count); - -/* If CT is available, we expect to use MMIO only during init/fini */ -GEM_BUG_ON (HAS_GUC_CT (dev_priv) && - *action !=INTEL_GUC_ACTION_REGISTER_COMMAND_TRANSPORT_BUFFER && - *action !=INTEL_GUC_ACTION_DEREGISTER_COMMAND_TRANSPORT_BUFFER ); - -mutex_lock (&guc->send_mutex); -intel_uncore_forcewake_get (dev_priv, guc->send_regs.fw_domains); - -for (i =0 ; i < len; i++) -I915_WRITE (guc_send_reg (guc, i), action[i]); - -POSTING_READ (guc_send_reg (guc, i -1 )); - -intel_guc_notify (guc); - -/* -* No GuC command should ever take longer than 10ms. -* Fast commands should still complete in 10us. -*/ - ret =__intel_wait_for_register_fw (dev_priv, -guc_send_reg (guc,0 ), -INTEL_GUC_RECV_MASK , -INTEL_GUC_RECV_MASK , -10 ,10 , &status); -if (status !=INTEL_GUC_STATUS_SUCCESS ) { -/* -* Either the GuC explicitly returned an error (which -* we convert to -EIO here) or no response at all was -* received within the timeout limit (-ETIMEDOUT) -*/ -if (ret != -ETIMEDOUT ) - ret = -EIO ; - -DRM_WARN ("INTEL_GUC_SEND: Action 0x%X failed;" -" ret=%d status=0x%08X response=0x%08X\n" , - action[0 ], ret, status,I915_READ (SOFT_SCRATCH (15 ))); - } - -intel_uncore_forcewake_put (dev_priv, guc->send_regs.fw_domains); -mutex_unlock (&guc->send_mutex); - -return ret; -} - -int intel_guc_sample_forcewake (struct intel_guc *guc) -{ -struct drm_i915_private *dev_priv =guc_to_i915 (guc); -u32 action[2 ]; - - action[0 ] =INTEL_GUC_ACTION_SAMPLE_FORCEWAKE ; -/* WaRsDisableCoarsePowerGating:skl,bxt */ -if (!intel_enable_rc6 () ||NEEDS_WaRsDisableCoarsePowerGating (dev_priv)) - action[1 ] =0 ; -else -/* bit 0 and 1 are for Render and Media domain separately */ - action[1 ] =GUC_FORCEWAKE_RENDER |GUC_FORCEWAKE_MEDIA ; - -return intel_guc_send (guc, action,ARRAY_SIZE (action)); -}drivers/gpu/drm/i915/intel_uc.h +1
-137@@ -25,110 +25,9 @@#define _INTEL_UC_H_#include "intel_uc_fw.h" -#include "intel_guc_fwif.h" -#include "i915_guc_reg.h" -#include "intel_ringbuffer.h" -#include "intel_guc_ct.h" -#include "i915_vma.h" +#include "intel_guc.h" #include "intel_huc.h" -/* -* This structure primarily describes the GEM object shared with the GuC. -* The specs sometimes refer to this object as a "GuC context", but we use -* the term "client" to avoid confusion with hardware contexts. This -* GEM object is held for the entire lifetime of our interaction with -* the GuC, being allocated before the GuC is loaded with its firmware. -* Because there's no way to update the address used by the GuC after -* initialisation, the shared object must stay pinned into the GGTT as -* long as the GuC is in use. We also keep the first page (only) mapped -* into kernel address space, as it includes shared data that must be -* updated on every request submission. -* -* The single GEM object described here is actually made up of several -* separate areas, as far as the GuC is concerned. The first page (kept -* kmap'd) includes the "process descriptor" which holds sequence data for -* the doorbell, and one cacheline which actually *is* the doorbell; a -* write to this will "ring the doorbell" (i.e. send an interrupt to the -* GuC). The subsequent pages of the client object constitute the work -* queue (a circular array of work items), again described in the process -* descriptor. Work queue pages are mapped momentarily as required. -*/ -struct i915_guc_client { -struct i915_vma *vma; -void *vaddr; -struct i915_gem_context *owner; -struct intel_guc *guc; - -uint32_t engines;/* bitmap of (host) engine ids */ -uint32_t priority; -u32 stage_id; -uint32_t proc_desc_offset; - -u16 doorbell_id; -unsigned long doorbell_offset; - -spinlock_t wq_lock; -/* Per-engine counts of GuC submissions */ -uint64_t submissions[I915_NUM_ENGINES ]; -}; - -struct intel_guc_log { -uint32_t flags; -struct i915_vma *vma; -/* The runtime stuff gets created only when GuC logging gets enabled */ -struct { -void *buf_addr; -struct workqueue_struct *flush_wq; -struct work_struct flush_work; -struct rchan *relay_chan; - } runtime; -/* logging related stats */ -u32 capture_miss_count; -u32 flush_interrupt_count; -u32 prev_overflow_count[GUC_MAX_LOG_BUFFER ]; -u32 total_overflow_count[GUC_MAX_LOG_BUFFER ]; -u32 flush_count[GUC_MAX_LOG_BUFFER ]; -}; - -struct intel_guc { -struct intel_uc_fw fw; -struct intel_guc_log log; -struct intel_guc_ct ct; - -/* Log snapshot if GuC errors during load */ -struct drm_i915_gem_object *load_err_log; - -/* intel_guc_recv interrupt related state */ -bool interrupts_enabled; - -struct i915_vma *ads_vma; -struct i915_vma *stage_desc_pool; -void *stage_desc_pool_vaddr; -struct ida stage_ids; - -struct i915_guc_client *execbuf_client; - - DECLARE_BITMAP(doorbell_bitmap, GUC_NUM_DOORBELLS); -uint32_t db_cacheline;/* Cyclic counter mod pagesize */ - -/* GuC's FW specific registers used in MMIO send */ -struct { -u32 base; -unsigned int count; -enum forcewake_domains fw_domains; - } send_regs; - -/* To serialize the intel_guc_send actions */ -struct mutex send_mutex; - -/* GuC's FW specific send function */ -int (*send)(struct intel_guc *guc,const u32 *data,u32 len); - -/* GuC's FW specific notify function */ -void (*notify)(struct intel_guc *guc); -}; - -/* intel_uc.c */ void intel_uc_sanitize_options (struct drm_i915_private *dev_priv);void intel_uc_init_early (struct drm_i915_private *dev_priv);void intel_uc_init_mmio (struct drm_i915_private *dev_priv);@@ -136,48 +35,5 @@ 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_hw (struct drm_i915_private *dev_priv);void intel_uc_fini_hw (struct drm_i915_private *dev_priv); -int intel_guc_sample_forcewake (struct intel_guc *guc); -int intel_guc_send_nop (struct intel_guc *guc,const u32 *action,u32 len); -int intel_guc_send_mmio (struct intel_guc *guc,const u32 *action,u32 len); -int intel_guc_auth_huc (struct intel_guc *guc,u32 rsa_offset); - -static inline int intel_guc_send (struct intel_guc *guc,const u32 *action,u32 len) -{ -return guc->send (guc, action, len); -} - -static inline void intel_guc_notify (struct intel_guc *guc) -{ - guc->notify (guc); -} - -/* intel_guc_loader.c */ -int intel_guc_select_fw (struct intel_guc *guc); -int intel_guc_init_hw (struct intel_guc *guc); -int intel_guc_suspend (struct drm_i915_private *dev_priv); -int intel_guc_resume (struct drm_i915_private *dev_priv); -u32 intel_guc_wopcm_size (struct drm_i915_private *dev_priv); - -/* i915_guc_submission.c */ -int i915_guc_submission_init (struct drm_i915_private *dev_priv); -int i915_guc_submission_enable (struct drm_i915_private *dev_priv); -void i915_guc_submission_disable (struct drm_i915_private *dev_priv); -void i915_guc_submission_fini (struct drm_i915_private *dev_priv); -struct i915_vma *intel_guc_allocate_vma (struct intel_guc *guc,u32 size); - -/* intel_guc_log.c */ -int intel_guc_log_create (struct intel_guc *guc); -void intel_guc_log_destroy (struct intel_guc *guc); -int i915_guc_log_control (struct drm_i915_private *dev_priv,u64 control_val); -void i915_guc_log_register (struct drm_i915_private *dev_priv); -void i915_guc_log_unregister (struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/intel_uc.h void intel_uc_init_fw(struct drm_i915_private *dev_priv); · line 39
Quoted 10 lines
drivers/gpu/drm/i915/intel_uc.h +0
-8- -static inline u32 guc_ggtt_offset (struct i915_vma *vma) -{ -u32 offset =i915_ggtt_offset (vma); -GEM_BUG_ON (offset <GUC_WOPCM_TOP ); -GEM_BUG_ON (range_overflows_t (u64, offset, vma->size,GUC_GGTT_TOP )); -return offset; -}#endif
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Joonas Lahtinen
maintainerRe: [PATCH v2 6/6] drm/i915/guc: Move GuC declarations and functions into dedicated files
In reply to Michal WajdeczkoQuoted 10 lines · Michal Wajdeczko
We want to keep GuC specific code in separated files.
v2: move all functions in single patch (Joonas)
fix old checkpatch issues (Sagar)Signed-off-by Michal Wajdeczko <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Chris Wilson <[email protected]>Cc Sagar Arun Kamble <[email protected]>Reviewed-by Sagar Arun Kamble <[email protected]> #1
<SNIP>
Quoted 15 lines
+++
b/drivers/gpu/drm/i915/intel_guc.cdrivers/gpu/drm/i915/intel_guc.c new file +13
-0@@ -0,0 +1,262 @@ +/* +* Copyright © 2014-2017 Intel Corporation +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice (including the next +* paragraph) shall be included in all copies or substantial portions of the +* Software.
drivers/gpu/drm/i915/intel_guc.c line 23
Quoted 10 lines
drivers/gpu/drm/i915/intel_guc.c new file +10
-0+* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +* IN THE SOFTWARE. +* +*/
We do want to include "intel_guc.h" first and then other headers. After all, all this effort is to get rid of i915_drv.h eventually so that inter-file dependencies are called out more explicitly.
Quoted 2 lines
(quoted diff) +2
-0+#include "i915_drv.h" +
<SNIP>
Quoted 10 lines
drivers/gpu/drm/i915/intel_guc.h new file +10
-0+static +inline int intel_guc_send (struct intel_guc *guc,const u32 *action,u32 len) +{ +return guc->send (guc, action, len); +} + +static inline void intel_guc_notify (struct intel_guc *guc) +{ + guc->notify (guc); +}
drivers/gpu/drm/i915/intel_guc.h line 147
Quoted 10 lines
drivers/gpu/drm/i915/intel_guc.h new file +10
-0+ +static inline u32 guc_ggtt_offset (struct i915_vma *vma) +{ +u32 offset =i915_ggtt_offset (vma); + +GEM_BUG_ON (offset <GUC_WOPCM_TOP ); +GEM_BUG_ON (range_overflows_t (u64, offset, vma->size,GUC_GGTT_TOP )); + +return offset; +}
Have these inline functions in their natural spots below. Them being inline or not is bound to change.
drivers/gpu/drm/i915/intel_guc.h line 149
Quoted 2 lines
drivers/gpu/drm/i915/intel_guc.h new file +2
-0+ +/* intel_guc.c */
This should be obvious, comment can be dropped.
drivers/gpu/drm/i915/intel_guc.h line 160
Quoted 11 lines
drivers/gpu/drm/i915/intel_guc.h new file +11
-0+void intel_guc_init_early (struct intel_guc *guc); +void intel_guc_init_send_regs (struct intel_guc *guc); +int intel_guc_send_nop (struct intel_guc *guc,const u32 *action,u32 len); +int intel_guc_send_mmio (struct intel_guc *guc,const u32 *action,u32 len); +int intel_guc_sample_forcewake (struct intel_guc *guc); +int intel_guc_auth_huc (struct intel_guc *guc,u32 rsa_offset); +int intel_guc_suspend (struct drm_i915_private *dev_priv); +int intel_guc_resume (struct drm_i915_private *dev_priv); +struct i915_vma *intel_guc_allocate_vma (struct intel_guc *guc,u32 size); + +/* intel_guc_loader.c */
These belong to intel_guc.c, so this comment can be dropped.
drivers/gpu/drm/i915/intel_guc.h line 162
Quoted 2 lines
drivers/gpu/drm/i915/intel_guc.h new file +2
-0+int intel_guc_select_fw (struct intel_guc *guc); +int intel_guc_init_hw (struct intel_guc *guc);
This goes under init_early at least, init_send_regs seems overly specific and is not it like guc_init_mmio? Could be renamed later.
drivers/gpu/drm/i915/intel_guc.h line 165
Quoted 3 lines
drivers/gpu/drm/i915/intel_guc.h new file +3
-0+u32 intel_guc_wopcm_size (struct drm_i915_private *dev_priv); + +/* i915_guc_submission.c */
A separate header for these.
drivers/gpu/drm/i915/intel_guc.h line 171
Quoted 6 lines
drivers/gpu/drm/i915/intel_guc.h new file +6
-0+int i915_guc_submission_init (struct drm_i915_private *dev_priv); +int i915_guc_submission_enable (struct drm_i915_private *dev_priv); +void i915_guc_submission_disable (struct drm_i915_private *dev_priv); +void i915_guc_submission_fini (struct drm_i915_private *dev_priv); + +/* intel_guc_log.c */
Ditto.
drivers/gpu/drm/i915/intel_guc.h line 178
Quoted 7 lines
drivers/gpu/drm/i915/intel_guc.h new file +7
-0+int intel_guc_log_create (struct intel_guc *guc); +void intel_guc_log_destroy (struct intel_guc *guc); +int i915_guc_log_control (struct drm_i915_private *dev_priv,u64 control_val); +void i915_guc_log_register (struct drm_i915_private *dev_priv); +void i915_guc_log_unregister (struct drm_i915_private *dev_priv); + +#endif
Regards, Joonas
Signature · 7 lines
Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915: Guc code reorg
In reply to Michal Wajdeczko== Series Details ==
== Series Details ==
Series: drm/i915: Guc code reorg
URL : https://patchwork.freedesktop.org/series/31266/
State : failure
== Summary ==
Series 31266v1 drm/i915: Guc code reorg
https://patchwork.freedesktop.org/api/1.0/series/31266/revisions/1/mbox/
Test gem_ctx_switch:
Subgroup basic-default:
pass -> INCOMPLETE (fi-cnl-y)
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-b:
pass -> FAIL (fi-cfl-s) fdo#102673fdo#102673 https://bugs.freedesktop.org/show_bug.cgi?id=102673
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:457s fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:475s fi-blb-e6850 total:289 pass:224 dwarn:1 dfail:0 fail:0 skip:64 time:392s fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:564s fi-bwr-2160 total:289 pass:184 dwarn:0 dfail:0 fail:0 skip:105 time:287s fi-bxt-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:528s fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:529s fi-byt-j1900 total:289 pass:254 dwarn:1 dfail:0 fail:0 skip:34 time:539s fi-byt-n2820 total:289 pass:250 dwarn:1 dfail:0 fail:0 skip:38 time:535s fi-cfl-s total:289 pass:255 dwarn:1 dfail:0 fail:1 skip:32 time:547s fi-cnl-y total:31 pass:21 dwarn:0 dfail:0 fail:0 skip:9 fi-elk-e7500 total:289 pass:230 dwarn:0 dfail:0 fail:0 skip:59 time:440s fi-glk-1 total:289 pass:257 dwarn:3 dfail:0 fail:0 skip:29 time:592s fi-hsw-4770 total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:442s fi-hsw-4770r total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:422s fi-ilk-650 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:462s fi-ivb-3520m total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:500s fi-ivb-3770 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:488s fi-kbl-7500u total:289 pass:264 dwarn:1 dfail:0 fail:0 skip:24 time:506s fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:578s fi-kbl-7567u total:289 pass:265 dwarn:4 dfail:0 fail:0 skip:20 time:491s fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:590s fi-pnv-d510 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:658s fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:480s fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:525s fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:523s fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:473s fi-snb-2520m total:289 pass:251 dwarn:0 dfail:0 fail:0 skip:38 time:582s fi-snb-2600 total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:442s
2f14e319a2fd0125bcb06b00095afa6cab5134bd drm-tip: 2017y-10m-02d-09h-23m-23s UTC integration manifest 5865a7ce87af drm/i915/guc: Move GuC declarations and functions into dedicated files 324ea799d3a0 drm/i915/guc: Move Guc early init into own functionb4dba4d4e843 drm/i915/huc: Move HuC declarations into dedicated headeraa0e401af78b drm/i915/uc: Create intel_uc_init_mmio1569c70765ba drm/i915/uc: Move uC fw helper code into dedicated files1d29ef25f7af drm/i915/uc: Drop unnecessary forward declaration
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5870/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx