Guc code reorg cont'd
Subsystems (2)
v6 cover Guc code reorg cont'd
Leftover from https://patchwork.freedesktop.org/series/31340/
plus next round of minor improvements
v6: line split fixup
Michal Wajdeczko (5):
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 drm/i915/uc: Fix includes order
drm/i915/uc: Unify initialization of the uC firmware helper
drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_debugfs.c | 1 + drivers/gpu/drm/i915/i915_guc_submission.c | 101 +---------- drivers/gpu/drm/i915/i915_guc_submission.h | 80 +++++++++ drivers/gpu/drm/i915/intel_guc.c | 264 +++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_guc.h | 109 ++++++++++++ drivers/gpu/drm/i915/intel_guc_loader.c | 5 +- drivers/gpu/drm/i915/intel_guc_log.c | 3 + drivers/gpu/drm/i915/intel_guc_log.h | 59 +++++++ drivers/gpu/drm/i915/intel_huc.c | 5 +- drivers/gpu/drm/i915/intel_uc.c | 150 +--------------- drivers/gpu/drm/i915/intel_uc.h | 147 +--------------- drivers/gpu/drm/i915/intel_uc_fw.h | 9 + 13 files changed, 537 insertions(+), 397 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
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 1/5 drm/i915/guc: Move GuC log declarations into dedicated header
Move GuC log declarations into dedicated header as we want to keep component specific code in separate files.
v2: fix includes (Chris)
update commit message (Joonas)
--- drivers/gpu/drm/i915/intel_guc_log.c | 3 ++ drivers/gpu/drm/i915/intel_guc_log.h | 59 ++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_uc.h | 26 +--------------- 3 files changed, 63 insertions(+), 25 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_guc_log.h
drivers/gpu/drm/i915/intel_guc_log.c +3 -0
@@ -21,8 +21,11 @@* IN THE SOFTWARE. * */ +#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 +59 -0
59 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
PATCH v6 2/5 drm/i915/guc: Move GuC submission declarations into dedicated header
In reply to Michal WajdeczkoMove GuC submission declarations into dedicated header as we want to keep uC specific code in separate files.
v2: fix include (Chris)
update commit message (Joonas)
--- 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 | 80 ++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_uc.c | 1 + drivers/gpu/drm/i915/intel_uc.h | 45 ----------------- 5 files changed, 86 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 +80 -0
80 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
PATCH v6 3/5 drm/i915/guc: Move GuC core definitions into dedicated files
In reply to Michal WajdeczkoMove GuC core definitions into dedicated files as 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
v4: fix line split (Chris/Joonas)
--- 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 | 109 ++++++++++++ drivers/gpu/drm/i915/intel_uc.c | 146 +--------------- drivers/gpu/drm/i915/intel_uc.h | 78 +-------- 6 files changed, 377 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 +109 -0
109 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
PATCH v6 4/5 drm/i915/uc: Fix includes order
In reply to Michal WajdeczkoFix includes order and make sure we only include required headers.
--- drivers/gpu/drm/i915/intel_uc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_uc.c +1 -2
@@ -22,10 +22,9 @@* */ -#include "i915_drv.h" #include "intel_uc.h" +#include "i915_drv.h" #include "i915_guc_submission.h" -#include <linux/firmware.h> /* Reset GuC providing us with fresh state for both GuC and HuC. */
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 5/5 drm/i915/uc: Unify initialization of the uC firmware helper
In reply to Michal WajdeczkoUnify initialization of the uC firmware helper as we want to maximize code reuse.
--- drivers/gpu/drm/i915/intel_guc_loader.c | 5 +---- drivers/gpu/drm/i915/intel_huc.c | 5 +---- drivers/gpu/drm/i915/intel_uc_fw.h | 9 +++++++++ 3 files changed, 11 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/intel_guc_loader.c +1 -4
@@ -386,10 +386,7 @@ int intel_guc_select_fw(struct intel_guc *guc) {struct drm_i915_private *dev_priv =guc_to_i915 (guc); - guc->fw.path =NULL ; - guc->fw.fetch_status =INTEL_UC_FIRMWARE_NONE ; - guc->fw.load_status =INTEL_UC_FIRMWARE_NONE ; - guc->fw.type =INTEL_UC_FW_TYPE_GUC ; +intel_uc_fw_init (&guc->fw,INTEL_UC_FW_TYPE_GUC );if (i915_modparams.guc_firmware_path) { guc->fw.path = i915_modparams.guc_firmware_path;
drivers/gpu/drm/i915/intel_huc.c +1 -4
@@ -150,10 +150,7 @@ void intel_huc_select_fw(struct intel_huc *huc) {struct drm_i915_private *dev_priv =huc_to_i915 (huc); - huc->fw.path =NULL ; - huc->fw.fetch_status =INTEL_UC_FIRMWARE_NONE ; - huc->fw.load_status =INTEL_UC_FIRMWARE_NONE ; - huc->fw.type =INTEL_UC_FW_TYPE_HUC ; +intel_uc_fw_init (&huc->fw,INTEL_UC_FW_TYPE_HUC );if (i915_modparams.huc_firmware_path) { huc->fw.path = i915_modparams.huc_firmware_path;
drivers/gpu/drm/i915/intel_uc_fw.h +9 -0
@@ -91,6 +91,15 @@ static inline const char *intel_uc_fw_type_repr(enum intel_uc_fw_type type)return "uC" ; } +static inline +void intel_uc_fw_init (struct intel_uc_fw *uc_fw,enum intel_uc_fw_type type) +{ + uc_fw->path =NULL ; + uc_fw->fetch_status =INTEL_UC_FIRMWARE_NONE ; + uc_fw->load_status =INTEL_UC_FIRMWARE_NONE ; + uc_fw->type = type; +} +void intel_uc_fw_fetch (struct drm_i915_private *dev_priv,struct intel_uc_fw *uc_fw);void intel_uc_fw_fini (struct intel_uc_fw *uc_fw);
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for Guc code reorg cont'd
In reply to Michal Wajdeczko== Series Details ==
== Series Details ==
Series: Guc code reorg cont'd
URL : https://patchwork.freedesktop.org/series/31447/
State : failure
== Summary ==
Series 31447 revision 1 was fully merged or fully failed: no git log
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx