drm/i915: Guc code reorg cont'd
Subsystems (2)
v5 cover drm/i915: Guc code reorg cont'd
Leftover from https://patchwork.freedesktop.org/series/31340/
plus next round of minor improvements
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 v5 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 v5 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 v5 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
--- 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
Re: [PATCH v5 3/5] drm/i915/guc: Move GuC core definitions into dedicated files
Quoted 14 lines · Michal Wajdeczko
Move 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
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 100 lines
drivers/gpu/drm/i915/intel_guc.h new file +94
-0@@ -0,0 +1,109 @@ +/* +* 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_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" + +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; +} +
drivers/gpu/drm/i915/intel_guc.h line 104
Quoted 10 lines
drivers/gpu/drm/i915/intel_guc.h new file +10
-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 */ was dropped.
Quoted 276 lines
drivers/gpu/drm/i915/intel_guc.h new file +5
-0+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); + +#endif drivers/gpu/drm/i915/intel_uc.c +2
-144@@ -82,25 +82,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)@@ -115,32 +99,6 @@ 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; -} -/** * intel_uc_init_mmio - setup uC MMIO access * @@ -151,7 +109,7 @@ static void guc_init_send_regs(struct intel_guc *guc)*/ 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)@@ -192,27 +150,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;@@ -344,82 +281,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
-69@@ -24,54 +24,9 @@#ifndef _INTEL_UC_H_#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 "intel_guc_log.h" -#include "i915_vma.h" +#include "intel_guc.h" #include "intel_huc.h" -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);@@ -79,36 +34,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); - -struct i915_vma *intel_guc_allocate_vma (struct intel_guc *guc,u32 size);
drivers/gpu/drm/i915/intel_uc.h void intel_uc_init_fw(struct drm_i915_private *dev_priv); · line 38
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
Re: [PATCH v5 3/5] drm/i915/guc: Move GuC core definitions into dedicated files
In reply to Michal WajdeczkoQuoted 13 lines · Michal Wajdeczko
Move 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
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>
drivers/gpu/drm/i915/intel_guc.h line 75
Quoted 2 lines
drivers/gpu/drm/i915/intel_guc.h new file +2
-0+static +inline int intel_guc_send (struct intel_guc *guc,const u32 *action,u32 len)
Split this at the correct boundary between return type and function name. Then 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 v5 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
Re: [PATCH v5 4/5] drm/i915/uc: Fix includes order
Quoted 6 lines · Michal Wajdeczko
Fix includes order and make sure we only include required headers.
Suggested-by Chris Wilson <[email protected]>Signed-off-by Michal Wajdeczko <[email protected]>Cc Chris Wilson <[email protected]>Cc Joonas Lahtinen <[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 v5 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
Re: [PATCH v5 5/5] drm/i915/uc: Unify initialization of the uC firmware helper
Quoted 6 lines · Michal Wajdeczko
Unify initialization of the uC firmware helper as we want to maximize code reuse.
Signed-off-by Michal Wajdeczko <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Chris Wilson <[email protected]>
<SNIP>
Quoted 1 line
drivers/gpu/drm/i915/intel_guc_loader.c | 5 +----
I'm still looking to get the guc_loader.c file axed, or a more clean code island to be formed in there. Not related to this move itself.
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: success for drm/i915: Guc code reorg cont'd
In reply to Michal Wajdeczko== Series Details ==
== Series Details ==
Series: drm/i915: Guc code reorg cont'd
URL : https://patchwork.freedesktop.org/series/31401/
State : success
== Summary ==
Series 31401v1 drm/i915: Guc code reorg cont'd
https://patchwork.freedesktop.org/api/1.0/series/31401/revisions/1/mbox/
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-b:
dmesg-warn -> PASS (fi-byt-j1900) fdo#101705fdo#101705 https://bugs.freedesktop.org/show_bug.cgi?id=101705
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:460s 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:394s fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:565s 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:527s fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:541s fi-byt-j1900 total:289 pass:255 dwarn:0 dfail:0 fail:0 skip:34 time:544s fi-byt-n2820 total:289 pass:250 dwarn:1 dfail:0 fail:0 skip:38 time:524s fi-cfl-s total:289 pass:256 dwarn:1 dfail:0 fail:0 skip:32 time:566s fi-cnl-y total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:614s 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:596s fi-hsw-4770 total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:435s fi-hsw-4770r total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:419s fi-ilk-650 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:463s fi-ivb-3520m total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:508s fi-ivb-3770 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:476s fi-kbl-7500u total:289 pass:264 dwarn:1 dfail:0 fail:0 skip:24 time:504s fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:581s fi-kbl-7567u total:289 pass:265 dwarn:4 dfail:0 fail:0 skip:20 time:493s 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:659s fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:483s fi-skl-6700hq total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:614s fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:540s fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:508s fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:483s fi-snb-2520m total:289 pass:251 dwarn:0 dfail:0 fail:0 skip:38 time:585s fi-snb-2600 total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:440s
ce6163933673902f8cabd7111c04766b0fcd6e3d drm-tip: 2017y-10m-04d-16h-49m-44s UTC integration manifest 408e6e76dd5f drm/i915/uc: Unify initialization of the uC firmware helper ed06cc91db00 drm/i915/uc: Fix includes ordera09fa8b2d828 drm/i915/guc: Move GuC core definitions into dedicated files 31be4b5764b5 drm/i915/guc: Move GuC submission declarations into dedicated header 8c1687c12ce4 drm/i915/guc: Move GuC log declarations into dedicated header
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5903/
_______________________________________________
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 cont'd
In reply to Michal Wajdeczko== Series Details ==
== Series Details ==
Series: drm/i915: Guc code reorg cont'd
URL : https://patchwork.freedesktop.org/series/31401/
State : success
== Summary ==
Test perf:
Subgroup blocking:
fail -> PASS (shard-hsw) fdo#102252fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
shard-hsw total:2430 pass:1331 dwarn:7 dfail:0 fail:8 skip:1084 time:10232s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5903/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx