drm/i915: Guc code reorg
Subsystems (2)
v3 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)
v3: more dedicated headers (Joonas)
Michal Wajdeczko (8):
drm/i915: Make intel_uncore.h header self-contained 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 log declarations into dedicated header drm/i915/guc: Move GuC submission declarations into dedicated header drm/i915/guc: Move GuC core definitions 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_debugfs.c | 1 + drivers/gpu/drm/i915/i915_drv.c | 2 + drivers/gpu/drm/i915/i915_guc_submission.c | 101 +--------- drivers/gpu/drm/i915/i915_guc_submission.h | 79 ++++++++ drivers/gpu/drm/i915/intel_guc.c | 264 ++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_guc.h | 110 ++++++++++ drivers/gpu/drm/i915/intel_guc_log.c | 1 + drivers/gpu/drm/i915/intel_guc_log.h | 57 ++++++ drivers/gpu/drm/i915/intel_huc.h | 39 ++++ drivers/gpu/drm/i915/intel_uc.c | 310 ++--------------------------- drivers/gpu/drm/i915/intel_uc.h | 228 +-------------------- drivers/gpu/drm/i915/intel_uc_fw.c | 179 +++++++++++++++++ drivers/gpu/drm/i915/intel_uc_fw.h | 98 +++++++++ drivers/gpu/drm/i915/intel_uncore.h | 6 + 15 files changed, 861 insertions(+), 616 deletions(-) create mode 100644 drivers/gpu/drm/i915/i915_guc_submission.h 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_guc_log.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 v3 1/9 drm/i915: Make intel_uncore.h header self-contained
We're trying to resolve inter-header dependencies.
--- drivers/gpu/drm/i915/intel_uncore.h | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/i915/intel_uncore.h +6 -0
@@ -25,6 +25,12 @@#ifndef __INTEL_UNCORE_H__#define __INTEL_UNCORE_H__ +#include <linux/spinlock.h> +#include <linux/notifier.h> +#include <linux/hrtimer.h> + +#include "i915_reg.h" +struct drm_i915_private ; enum forcewake_domain_id {
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 1/9] drm/i915: Make intel_uncore.h header self-contained
Quoting Michal Wajdeczko (2017-10-03 17:35:59)
Quoted 14 lines
We're trying to resolve inter-header dependencies.
Signed-off-by Michal Wajdeczko <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Chris Wilson <[email protected]>--- drivers/gpu/drm/i915/intel_uncore.h | 6 ++++++ 1 file changed, 6 insertions(+)drivers/gpu/drm/i915/intel_uncore.h +0
-0
drivers/gpu/drm/i915/intel_uncore.h line 32
Quoted 8 lines
drivers/gpu/drm/i915/intel_uncore.h +5
-0@@ -25,6 +25,12 @@#ifndef __INTEL_UNCORE_H__#define __INTEL_UNCORE_H__ +#include <linux/spinlock.h> +#include <linux/notifier.h> +#include <linux/hrtimer.h> + +#include "i915_reg.h"
Hmm, what do we pull in directly? Something like i915_mmio_offset()?
In my head I have i915_reg.h == unwieldy list of register defines and nothing more.
Looks sensible but if it's only one small thing for i915_reg.h can you add a comment and we can try and split it up.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 1/9] drm/i915: Make intel_uncore.h header self-contained
Quoted 26 lines · Chris Wilson
Quoting Michal Wajdeczko (2017-10-03 17:35:59)
Quoted 14 lines
We're trying to resolve inter-header dependencies.
Signed-off-by Michal Wajdeczko <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Chris Wilson <[email protected]>--- drivers/gpu/drm/i915/intel_uncore.h | 6 ++++++ 1 file changed, 6 insertions(+)drivers/gpu/drm/i915/intel_uncore.h +0
-0drivers/gpu/drm/i915/intel_uncore.h line 32
Quoted 8 lines
drivers/gpu/drm/i915/intel_uncore.h +5
-0@@ -25,6 +25,12 @@#ifndef __INTEL_UNCORE_H__#define __INTEL_UNCORE_H__ +#include <linux/spinlock.h> +#include <linux/notifier.h> +#include <linux/hrtimer.h> + +#include "i915_reg.h" Hmm, what do we pull in directly? Something like
i915_mmio_offset()?
Quoted 2 lines
In my head I have
i915_reg.h== unwieldy list of register defines and nothing more.
We need this:
typedef struct {
uint32_t reg;
} i915_reg_t;Quoted 6 lines
Reviewed-by Chris Wilson <[email protected]>Looks sensible but if it's only one small thing for
i915_reg.hcan you add a comment and we can try and split it up.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 2/9 drm/i915/uc: Drop unnecessary forward declaration
In reply to Michal WajdeczkoWe 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 v3 3/9 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)
v3 (Michal): add kerneldoc (Joonas)
--- drivers/gpu/drm/i915/i915_drv.c | 2 ++ drivers/gpu/drm/i915/intel_uc.c | 15 +++++++++++++-- drivers/gpu/drm/i915/intel_uc.h | 1 + 3 files changed, 16 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 +13 -2
@@ -288,6 +288,19 @@ static void guc_init_send_regs(struct intel_guc *guc) guc->send_regs.fw_domains = fw_domains; } +/** +* intel_uc_init_mmio - setup uC MMIO access +* +* @dev_priv: device private +* +* Setup minimal state necessary for MMIO accesses later in the +* initialization sequence. +*/ +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 )
@@ -309,8 +322,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
@@ -202,6 +202,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
PATCH v3 4/9 drm/i915/uc: Move uC fw helper code into dedicated files
In reply to Michal WajdeczkoThis is a prerequisite to unblock next steps.
v2: correct include order (Joonas)
--- 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 | 179 +++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_uc_fw.h | 98 ++++++++++++++++++++ 5 files changed, 283 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 +179 -0
179 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uc_fw.h new file +98 -0
98 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 v3 4/9] drm/i915/uc: Move uC fw helper code into dedicated files
Quoted 9 lines · Michal Wajdeczko
This is a prerequisite to unblock next steps.
v2: correct include order (Joonas)
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]>
s/i915_fetch_uc_fw/intel_uc_fw_init/
And this is;
Can you then re-submit these first four patches for CI results and I'll merge them.
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 v3 4/9] drm/i915/uc: Move uC fw helper code into dedicated files
Quoted 5 lines · Joonas Lahtinen
Quoted 4 lines · Michal Wajdeczko
This is a prerequisite to unblock next steps.
v2: correct include order (Joonas)
Quoted 7 lines
Quoted 5 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]>s/i915_fetch_uc_fw/intel_uc_fw_init/
Actually, "fetch_uc" function is not symmetrical to "fw_init" so above rename will be misleading. I'm planning to add below init function after we are done with all moves:
intel_uc_fw_init(struct intel_uc_fw *fw, enum intel_uc_fw_type type);
Given above, can I still keep your r-b?
Michal
Quoted 9 lines
And this is;
Reviewed-by Joonas Lahtinen <[email protected]>Can you then re-submit these first four patches for CI results and I'll merge them.
Regards, Joonas
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 5/9 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 | 39 +++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_uc.h | 13 +------------ 2 files changed, 40 insertions(+), 12 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_huc.h
drivers/gpu/drm/i915/intel_huc.h new file +39 -0
@@ -0,0 +1,39 @@ +/* +* 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
PATCH v3 6/9 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 v3 6/9] drm/i915/guc: Move Guc early init into own function
Quoted 7 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]>Cc Joonas Lahtinen <[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 v3 7/9 drm/i915/guc: Move GuC log declarations into dedicated header
In reply to Michal WajdeczkoWe want to keep component specific code in separate files.
--- drivers/gpu/drm/i915/intel_guc_log.c | 1 + drivers/gpu/drm/i915/intel_guc_log.h | 57 ++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_uc.h | 26 +--------------- 3 files changed, 59 insertions(+), 25 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_guc_log.h
drivers/gpu/drm/i915/intel_guc_log.c +1 -0
@@ -23,6 +23,7 @@*/ #include <linux/debugfs.h> #include <linux/relay.h> +#include "intel_guc_log.h" #include "i915_drv.h" static void guc_log_capture_logs (struct intel_guc *guc);
drivers/gpu/drm/i915/intel_guc_log.h new file +57 -0
57 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uc.h +1 -25
@@ -29,6 +29,7 @@#include "i915_guc_reg.h" #include "intel_ringbuffer.h" #include "intel_guc_ct.h" +#include "intel_guc_log.h" #include "i915_vma.h" #include "intel_huc.h"
@@ -72,24 +73,6 @@ struct i915_guc_client {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;
@@ -165,13 +148,6 @@ 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); -static inline u32 guc_ggtt_offset (struct i915_vma *vma) {u32 offset =i915_ggtt_offset (vma);
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 7/9] drm/i915/guc: Move GuC log declarations into dedicated header
Quoting Michal Wajdeczko (2017-10-03 17:36:05)
Quoted 19 lines
We want to keep component specific code in separate files.
Suggested-by Joonas Lahtinen <[email protected]>Signed-off-by Michal Wajdeczko <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Chris Wilson <[email protected]>Cc Sagar Arun Kamble <[email protected]>--- drivers/gpu/drm/i915/intel_guc_log.c | 1 + drivers/gpu/drm/i915/intel_guc_log.h | 57 ++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_uc.h | 26 +--------------- 3 files changed, 59 insertions(+), 25 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_guc_log.hdrivers/gpu/drm/i915/intel_guc_log.c +0
-0
drivers/gpu/drm/i915/intel_guc_log.c line 27
Quoted 5 lines
drivers/gpu/drm/i915/intel_guc_log.c +1
-0@@ -23,6 +23,7 @@*/ #include <linux/debugfs.h> #include <linux/relay.h> +#include "intel_guc_log.h" #include "i915_drv.h"
Can we keep a newline between <> and "", and aim for alphabetical order. -Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 7/9] drm/i915/guc: Move GuC log declarations into dedicated header
Quoted 16 lines · Chris Wilson
Quoting Michal Wajdeczko (2017-10-03 17:36:05)
Quoted 15 lines
We want to keep component specific code in separate files.
Suggested-by Joonas Lahtinen <[email protected]>Signed-off-by Michal Wajdeczko <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Chris Wilson <[email protected]>Cc Sagar Arun Kamble <[email protected]>--- drivers/gpu/drm/i915/intel_guc_log.c | 1 + drivers/gpu/drm/i915/intel_guc_log.h | 57 ++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_uc.h | 26 +--------------- 3 files changed, 59 insertions(+), 25 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_guc_log.h
Quoted 12 lines
drivers/gpu/drm/i915/intel_guc_log.c line 27
Quoted 10 lines
drivers/gpu/drm/i915/intel_guc_log.c +1
-0@@ -23,6 +23,7 @@*/ #include <linux/debugfs.h> #include <linux/relay.h> +#include "intel_guc_log.h" #include "i915_drv.h" Can we keep a newline between <> and "", and aim for alphabetical order.
I'll add newline in next spin, but I'm not sure about alphabetical order.
Note that Joonas wants all foo.c files to start with "foo.h" (after <>) and then followed by other headers to make dependencies more explicit.
Michal
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 7/9] drm/i915/guc: Move GuC log declarations into dedicated header
Quoting Michal Wajdeczko (2017-10-03 19:28:02)
Quoted 33 lines
Quoted 16 lines · Chris Wilson
Quoting Michal Wajdeczko (2017-10-03 17:36:05)
Quoted 15 lines
We want to keep component specific code in separate files.
Suggested-by Joonas Lahtinen <[email protected]>Signed-off-by Michal Wajdeczko <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Chris Wilson <[email protected]>Cc Sagar Arun Kamble <[email protected]>--- drivers/gpu/drm/i915/intel_guc_log.c | 1 + drivers/gpu/drm/i915/intel_guc_log.h | 57 ++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_uc.h | 26 +--------------- 3 files changed, 59 insertions(+), 25 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_guc_log.hQuoted 13 lines
drivers/gpu/drm/i915/intel_guc_log.c line 27
Quoted 11 lines
drivers/gpu/drm/i915/intel_guc_log.c +1
-0@@ -23,6 +23,7 @@*/ #include <linux/debugfs.h> #include <linux/relay.h> +#include "intel_guc_log.h" #include "i915_drv.h" Can we keep a newline between <> and "", and aim for alphabetical order.
Quoted 4 lines
I'll add newline in next spin, but I'm not sure about alphabetical order.
Note that Joonas wants all
foo.cfiles to start with "foo.h" (after <>) and then followed by other headers to make dependencies more explicit.
I'm not fussed, though tbh I am more likely to forget which file I'm in and so which special case to apply. 2 blocks of alphabetical includes is simple enough for me to not muck up :)
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Chris Wilson
Reviewed-byRe: [PATCH v3 7/9] drm/i915/guc: Move GuC log declarations into dedicated header
In reply to Michal WajdeczkoQuoting Michal Wajdeczko (2017-10-03 19:28:02)
Quoted 33 lines
Quoted 16 lines · Chris Wilson
Quoting Michal Wajdeczko (2017-10-03 17:36:05)
Quoted 15 lines
We want to keep component specific code in separate files.
Suggested-by Joonas Lahtinen <[email protected]>Signed-off-by Michal Wajdeczko <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Chris Wilson <[email protected]>Cc Sagar Arun Kamble <[email protected]>--- drivers/gpu/drm/i915/intel_guc_log.c | 1 + drivers/gpu/drm/i915/intel_guc_log.h | 57 ++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_uc.h | 26 +--------------- 3 files changed, 59 insertions(+), 25 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_guc_log.hQuoted 13 lines
drivers/gpu/drm/i915/intel_guc_log.c line 27
Quoted 11 lines
drivers/gpu/drm/i915/intel_guc_log.c +1
-0@@ -23,6 +23,7 @@*/ #include <linux/debugfs.h> #include <linux/relay.h> +#include "intel_guc_log.h" #include "i915_drv.h" Can we keep a newline between <> and "", and aim for alphabetical order.
Quoted 4 lines
I'll add newline in next spin, but I'm not sure about alphabetical order.
Note that Joonas wants all
foo.cfiles to start with "foo.h" (after <>) and then followed by other headers to make dependencies more explicit.
Anyway, the change is trivial and clearly correct, so
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 8/9 drm/i915/guc: Move GuC submission declarations into dedicated header
In reply to Michal WajdeczkoWe want to keep uC specific code in separate files.
--- drivers/gpu/drm/i915/i915_debugfs.c | 1 + drivers/gpu/drm/i915/i915_guc_submission.c | 7 +-- drivers/gpu/drm/i915/i915_guc_submission.h | 79 ++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_uc.c | 1 + drivers/gpu/drm/i915/intel_uc.h | 45 ----------------- 5 files changed, 85 insertions(+), 48 deletions(-) create mode 100644 drivers/gpu/drm/i915/i915_guc_submission.h
drivers/gpu/drm/i915/i915_debugfs.c +1 -0
@@ -30,6 +30,7 @@#include <linux/sort.h> #include <linux/sched/mm.h> #include "intel_drv.h" +#include "i915_guc_submission.h" static inline struct drm_i915_private *node_to_i915 (struct drm_info_node *node) {
drivers/gpu/drm/i915/i915_guc_submission.c +4 -3
@@ -21,12 +21,13 @@* IN THE SOFTWARE. * */ -#include <linux/circ_buf.h> -#include "i915_drv.h" -#include "intel_uc.h" +#include <linux/circ_buf.h> #include <trace/events/dma_fence.h> +#include "i915_guc_submission.h" +#include "i915_drv.h" +/** * DOC: GuC-based command submission *
drivers/gpu/drm/i915/i915_guc_submission.h new file +79 -0
79 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uc.c +1 -0
@@ -24,6 +24,7 @@#include "i915_drv.h" #include "intel_uc.h" +#include "i915_guc_submission.h" #include <linux/firmware.h> /* Reset GuC providing us with fresh state for both GuC and HuC.
drivers/gpu/drm/i915/intel_uc.h +0 -45
57 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 v3 8/9] drm/i915/guc: Move GuC submission declarations into dedicated header
Quoting Michal Wajdeczko (2017-10-03 17:36:06)
Quoted 73 lines
We want to keep 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]>Cc MichaĹ Winiarski <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 1 + drivers/gpu/drm/i915/i915_guc_submission.c | 7 +-- drivers/gpu/drm/i915/i915_guc_submission.h | 79 ++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_uc.c | 1 + drivers/gpu/drm/i915/intel_uc.h | 45 ----------------- 5 files changed, 85 insertions(+), 48 deletions(-) create mode 100644 drivers/gpu/drm/i915/i915_guc_submission.hdrivers/gpu/drm/i915/i915_debugfs.c +1
-0@@ -30,6 +30,7 @@#include <linux/sort.h> #include <linux/sched/mm.h> #include "intel_drv.h" +#include "i915_guc_submission.h" static inline struct drm_i915_private *node_to_i915 (struct drm_info_node *node) {drivers/gpu/drm/i915/i915_guc_submission.c +4
-3@@ -21,12 +21,13 @@* IN THE SOFTWARE. * */ -#include <linux/circ_buf.h> -#include "i915_drv.h" -#include "intel_uc.h" +#include <linux/circ_buf.h> #include <trace/events/dma_fence.h> +#include "i915_guc_submission.h" +#include "i915_drv.h" +/** * DOC: GuC-based command submission * drivers/gpu/drm/i915/i915_guc_submission.h new file +18
-0@@ -0,0 +1,79 @@ +/* +* 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
drivers/gpu/drm/i915/i915_guc_submission.h line 28
Quoted 10 lines
drivers/gpu/drm/i915/i915_guc_submission.h new file +10
-0+* 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 _I915_GUC_SUBMISSION_H_ +#define _I915_GUC_SUBMISSION_H_ + +#include <linux/spinlock.h>
\n
Quoted 56 lines
drivers/gpu/drm/i915/i915_guc_submission.h new file +51
-0+#include "i915_gem.h" + +struct drm_i915_private ; + +/* +* 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; + +/* bitmap of (host) engine ids */ +uint32_t engines; +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 ]; +}; + +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); + +#endif drivers/gpu/drm/i915/intel_uc.c +0
-0
drivers/gpu/drm/i915/intel_uc.c line 28
Quoted 5 lines
drivers/gpu/drm/i915/intel_uc.c +1
-0@@ -24,6 +24,7 @@#include "i915_drv.h" #include "intel_uc.h" +#include "i915_guc_submission.h" #include <linux/firmware.h>
Pencil in a fix for the ordering here.
The mechanical changes look mechanical, so
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 9/9 drm/i915/guc: Move GuC core definitions 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)
v3: rebased
--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_guc_submission.c | 94 ---------- drivers/gpu/drm/i915/intel_guc.c | 264 +++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_guc.h | 110 ++++++++++++ drivers/gpu/drm/i915/intel_uc.c | 146 +--------------- drivers/gpu/drm/i915/intel_uc.h | 78 +-------- 6 files changed, 378 insertions(+), 315 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 +264 -0
264 lines not on this page · raw message
drivers/gpu/drm/i915/intel_guc.h new file +110 -0
110 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uc.c +2 -144
175 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uc.h +1 -77
91 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 v3 9/9] drm/i915/guc: Move GuC core definitions into dedicated files
Quoting Michal Wajdeczko (2017-10-03 17:36:07)
Quoted 166 lines
We want to keep GuC specific code in separated files.
v2: move all functions in single patch (Joonas)
fix old checkpatch issues (Sagar)v3: rebased
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--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_guc_submission.c | 94 ---------- drivers/gpu/drm/i915/intel_guc.c | 264 +++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_guc.h | 110 ++++++++++++ drivers/gpu/drm/i915/intel_uc.c | 146 +--------------- drivers/gpu/drm/i915/intel_uc.h | 78 +-------- 6 files changed, 378 insertions(+), 315 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_guc.c create mode 100644 drivers/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@@ -644,48 +644,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) {@@ -1213,55 +1171,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 +16
-0@@ -0,0 +1,264 @@ +/* +* 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,
drivers/gpu/drm/i915/intel_guc.c line 26
Quoted 10 lines
drivers/gpu/drm/i915/intel_guc.c new file +10
-0+* 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 "intel_guc.h" +#include "i915_drv.h"
Hmm, if some of these functions aren't in intel_uncore.h they should be.
Quoted 268 lines
drivers/gpu/drm/i915/intel_guc.c new file +238
-0+ +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 +24
-0@@ -0,0 +1,110 @@ +/* +* 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. +* +*/ +
drivers/gpu/drm/i915/intel_guc.h line 34
Quoted 10 lines
drivers/gpu/drm/i915/intel_guc.h new file +10
-0+#ifndef _INTEL_GUC_H_ +#define _INTEL_GUC_H_ + +#include "intel_uncore.h" +#include "intel_guc_fwif.h" +#include "intel_guc_ct.h" +#include "intel_guc_log.h" +#include "intel_uc_fw.h" +#include "i915_guc_reg.h" +#include "i915_vma.h"
Hmm. Are they required for the header? Or for the C body?
drivers/gpu/drm/i915/intel_guc.h line 39
Quoted 5 lines
drivers/gpu/drm/i915/intel_guc.h new file +5
-0+ +struct intel_guc { +struct intel_uc_fw fw; +struct intel_guc_log log; +struct intel_guc_ct ct;
Most of the embedded types ^^ will not require all of these headers.
Quoted 5 lines
drivers/gpu/drm/i915/intel_guc.h new file +5
-0+ +/* Log snapshot if GuC errors during load */ +struct drm_i915_gem_object *load_err_log; + +/* intel_guc_recv interrupt related state */
drivers/gpu/drm/i915/intel_guc.h line 54
Quoted 10 lines
drivers/gpu/drm/i915/intel_guc.h new file +10
-0+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 );
But we do need <linux/bitmap.h>
drivers/gpu/drm/i915/intel_guc.h line 55
Quoted 1 line
drivers/gpu/drm/i915/intel_guc.h new file +1
-0+uint32_t db_cacheline;/* Cyclic counter mod pagesize */
Too soon to s/uint32_t/u32/ ?
Quoted 10 lines
drivers/gpu/drm/i915/intel_guc.h new file +10
-0+ +/* 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;
drivers/gpu/drm/i915/intel_guc.h line 75
Quoted 10 lines
drivers/gpu/drm/i915/intel_guc.h new file +10
-0+ +/* 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)
Unusual line splitting.
drivers/gpu/drm/i915/intel_guc.h line 87
Quoted 12 lines
drivers/gpu/drm/i915/intel_guc.h new file +12
-0+{ +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);
So here we required i915_vma.h, ok.
It's pretty much a carbon copy, so
However, there's still plenty to polish.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 9/9] drm/i915/guc: Move GuC core definitions into dedicated files
Quoted 14 lines · Chris Wilson
Quoting Michal Wajdeczko (2017-10-03 17:36:07)
Quoted 13 lines
We want to keep GuC specific code in separated files.
v2: move all functions in single patch (Joonas)
fix old checkpatch issues (Sagar)v3: rebased
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 4 lines
Quoted 4 lines
drivers/gpu/drm/i915/intel_guc.h new file +4
-0+#ifndef _INTEL_GUC_H_ +#define _INTEL_GUC_H_ + +#include "intel_uncore.h"
Quoted 8 lines
drivers/gpu/drm/i915/intel_guc.h line 34
Quoted 6 lines
drivers/gpu/drm/i915/intel_guc.h new file +6
-0+#include "intel_guc_fwif.h" +#include "intel_guc_ct.h" +#include "intel_guc_log.h" +#include "intel_uc_fw.h" +#include "i915_guc_reg.h" +#include "i915_vma.h" Hmm. Are they required for the header? Or for the C body?
For the header.
#include "intel_uncore.h" --> enum forcewake_domains #include "intel_guc_fwif.h" --> GUC_NUM_DOORBELLS #include "intel_guc_ct.h" --> struct intel_guc_ct #include "intel_guc_log.h" --> struct intel_guc_log #include "intel_uc_fw.h" --> struct intel_uc_fw #include "i915_guc_reg.h" --> GUC_WOPCM_TOP #include "i915_vma.h" --> i915_ggtt_offset
Quoted 8 lines
drivers/gpu/drm/i915/intel_guc.h line 39
Quoted 6 lines
drivers/gpu/drm/i915/intel_guc.h new file +5
-0+ +struct intel_guc { +struct intel_uc_fw fw; +struct intel_guc_log log; +struct intel_guc_ct ct;Most of the embedded types ^^ will not require all of these headers.
Their requirements are handled in their own .h
Quoted 10 lines
Quoted 10 lines
drivers/gpu/drm/i915/intel_guc.h new file +9
-0+ +/* 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;
Quoted 8 lines
drivers/gpu/drm/i915/intel_guc.h line 54
Quoted 6 lines
drivers/gpu/drm/i915/intel_guc.h new file +6
-0+void *stage_desc_pool_vaddr; +struct ida stage_ids; + +struct i915_guc_client *execbuf_client; + +DECLARE_BITMAP (doorbell_bitmap,GUC_NUM_DOORBELLS );But we do need <
linux/bitmap.h>
No, only <linux/types.h>
https://cgit.freedesktop.org/drm-tip/tree/include/linux/types.h#n9
Quoted 5 lines
Quoted 3 lines
+
uint32_tdb_cacheline; /* Cyclic counter mod pagesize
*/Too soon to s/uint32_t/u32/ ?
Yes.
Quoted 16 lines
Quoted 16 lines
drivers/gpu/drm/i915/intel_guc.h new file +15
-0+ +/* 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 */
Quoted 8 lines
Quoted 6 lines
drivers/gpu/drm/i915/intel_guc.h new file +5
-0+void (*notify)(struct intel_guc *guc); +}; + +static +inline int intel_guc_send(struct intel_guc *guc, const u32 *action,u32 len)
Unusual line splitting.
Will fix.
Quoted 16 lines
drivers/gpu/drm/i915/intel_guc.h line 87
Quoted 13 lines
drivers/gpu/drm/i915/intel_guc.h new file +12
-0+{ +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);So here we required
i915_vma.h, ok.
Quoted 5 lines
It's pretty much a carbon copy, so
Reviewed-by Chris Wilson <[email protected]>However, there's still plenty to polish.
-Chris
Thanks,
Michal
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success 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/31340/
State : success
== Summary ==
Series 31340v1 drm/i915: Guc code reorg
https://patchwork.freedesktop.org/api/1.0/series/31340/revisions/1/mbox/
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:472s 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:569s fi-bwr-2160 total:289 pass:184 dwarn:0 dfail:0 fail:0 skip:105 time:286s fi-bxt-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:526s fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:534s fi-byt-j1900 total:289 pass:254 dwarn:1 dfail:0 fail:0 skip:34 time:540s fi-byt-n2820 total:289 pass:250 dwarn:1 dfail:0 fail:0 skip:38 time:536s fi-cfl-s total:289 pass:256 dwarn:1 dfail:0 fail:0 skip:32 time:564s fi-cnl-y total:289 pass:261 dwarn:1 dfail:0 fail:0 skip:27 time:618s fi-elk-e7500 total:289 pass:230 dwarn:0 dfail:0 fail:0 skip:59 time:439s fi-glk-1 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:591s fi-hsw-4770 total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:439s fi-hsw-4770r total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:417s fi-ilk-650 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:467s fi-ivb-3520m total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:518s fi-ivb-3770 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:478s fi-kbl-7500u total:289 pass:264 dwarn:1 dfail:0 fail:0 skip:24 time:503s fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:580s fi-kbl-7567u total:289 pass:265 dwarn:4 dfail:0 fail:0 skip:20 time:492s fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:589s fi-pnv-d510 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:657s fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:477s fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:534s 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:476s fi-snb-2520m total:289 pass:251 dwarn:0 dfail:0 fail:0 skip:38 time:584s fi-snb-2600 total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:432s
e7187e87bb3b5ca43194f86d096b9cf974cc54d7 drm-tip: 2017y-10m-03d-16h-09m-59s UTC integration manifest 075e3af7041e drm/i915/guc: Move GuC core definitions into dedicated files 6376585ec9d0 drm/i915/guc: Move GuC submission declarations into dedicated header 17911cbed040 drm/i915/guc: Move GuC log declarations into dedicated header 4d9fdaddcdeb drm/i915/guc: Move Guc early init into own function410d58f48040 drm/i915/huc: Move HuC declarations into dedicated header81ea7a4979de drm/i915/uc: Move uC fw helper code into dedicated filesefcc84c34937 drm/i915/uc: Create intel_uc_init_mmio897166bdaffc drm/i915/uc: Drop unnecessary forward declaration927791b05913 drm/i915: Make intel_uncore.h header self-contained
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5882/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success 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/31340/
State : success
== Summary ==
Test kms_setmode:
Subgroup basic:
fail -> PASS (shard-hsw) fdo#99912
Test perf:
Subgroup blocking:
pass -> FAIL (shard-hsw) fdo#102252fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
shard-hsw total:2429 pass:1315 dwarn:7 dfail:0 fail:24 skip:1083 time:10047s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5882/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✓ Fi.CI.IGT: success for drm/i915: Guc code reorg
Quoted 5 lines · Patchwork
== Series Details ==
Series: drm/i915: Guc code reorg
URL : https://patchwork.freedesktop.org/series/31340/
State : success
I've merged the series, thanks for the patches and review.
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