Support for sustained capturing of GuC firmware logs
Subsystems (2)
cover Support for sustained capturing of GuC firmware logs
From: Akash Goel <[email protected]>
GuC firmware log its debug messages into a Host-GuC shared memory buffer and when the buffer is half full it sends a Flush interrupt to Host. GuC firmware expects that while it is writing to 2nd half of the buffer, first half would get consumed by Host and then get a flush completed acknowledgement from Host, so that it does not end up doing any overwrite causing loss of logs.
So far Flush interrupt wasn't enabled on Host side & User could capture the contents/snapshot of log buffer through 'i915_guc_log_dump' debugfs iface. But this couldn't meet couple of key requirements, especially of Validation, first is to ensure capturing of all boot time logs even with high verbosity level and second is to enable capturing of logs in a sustained manner like for the entire duration of a workload.
Now Driver will enable Flush interrupt and on receving it, would copy the contents of log buffer into its local buffer. The size of local buffer would be big enough to contain multiple snapshots of the log buffer giving ample time to User to pull boot time messages.
Have added a debugfs interface '/sys/kernel/debug/dri/guc_log' for User to collect the logs. Availed relay framework to implement this interface, where Driver will have to just use a relay API to store snapshots of GuC log buffer in a buffer managed by relay. The relay buffer will be operated in a mode where the old data, not yet collected by User, will be overwritten if buffer becomes full. So the behavior exhibited will be equivalent to 'dmesg -c'. Besides mmap method, through which User can directly access the relay buffer contents, relay also supports the 'poll' method. Through the 'poll' call on log file, User can come to know whenever a new snapshot of the log buffer is taken by Driver, so can run in lockstep with the Driver and thus capture logs in a sustained/streaming manner, without any loss of data.
Akash Goel (4):
drm/i915: Add low level set of routines for programming PM IER/IIR/IMR
register set
drm/i915: Add a relay backed debugfs interface for capturing GuC logs drm/i915: New module param to control the size of buffer used for
storing GuC firmware logs
drm/i915: Use uncached(WC) mapping for acessing the GuC log buffer
Chris Wilson (1):
drm/i915: Support to create write combined type vmaps
Sagar Arun Kamble (6):
drm/i915: Decouple GuC log setup from verbosity parameter drm/i915: Add GuC ukernel logging related fields to fw interface file drm/i915: Support for GuC interrupts
drm/i915: Handle log buffer flush interrupt event from GuC drm/i915: Forcefully flush GuC log buffer on reset drm/i915: Debugfs support for GuC logging control
drivers/gpu/drm/i915/i915_debugfs.c | 35 +++- drivers/gpu/drm/i915/i915_drv.h | 6 +- drivers/gpu/drm/i915/i915_gem.c | 57 ++++-- drivers/gpu/drm/i915/i915_gem_dmabuf.c | 2 +- drivers/gpu/drm/i915/i915_guc_submission.c | 292 ++++++++++++++++++++++++++++- drivers/gpu/drm/i915/i915_irq.c | 169 +++++++++++++++-- drivers/gpu/drm/i915/i915_params.c | 5 + drivers/gpu/drm/i915/i915_params.h | 1 + drivers/gpu/drm/i915/i915_reg.h | 11 ++ drivers/gpu/drm/i915/intel_drv.h | 9 + drivers/gpu/drm/i915/intel_guc.h | 10 + drivers/gpu/drm/i915/intel_guc_fwif.h | 53 ++++++ drivers/gpu/drm/i915/intel_guc_loader.c | 12 +- drivers/gpu/drm/i915/intel_lrc.c | 8 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +- 15 files changed, 631 insertions(+), 41 deletions(-)
Signature · 6 lines
1.9.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/11 drm/i915: Decouple GuC log setup from verbosity parameter
From: Sagar Arun Kamble <[email protected]>
GuC Log buffer allocation was tied up with verbosity level kernel parameter i915.guc_log_level. User could be given a provision to enable logging at runtime and not necessarily during load time only. This patch will perform allocation of shared log buffer always but will initially enable logging on GuC side through init params based on i915.guc_log_level.
--- drivers/gpu/drm/i915/i915_guc_submission.c | 3 --- drivers/gpu/drm/i915/intel_guc_loader.c | 8 +++++--- 2 files changed, 5 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/i915_guc_submission.c +0 -3
@@ -776,9 +776,6 @@ static void guc_create_log(struct intel_guc *guc)unsigned long offset;uint32_t size, flags; -if (i915.guc_log_level <GUC_LOG_VERBOSITY_MIN ) -return ; -if (i915.guc_log_level >GUC_LOG_VERBOSITY_MAX ) i915.guc_log_level =GUC_LOG_VERBOSITY_MAX ;
drivers/gpu/drm/i915/intel_guc_loader.c +5 -3
@@ -162,11 +162,13 @@ static void set_guc_init_params(struct drm_i915_private *dev_priv) params[GUC_CTL_FEATURE ] |=GUC_CTL_DISABLE_SCHEDULER |GUC_CTL_VCS2_ENABLED ; -if (i915.guc_log_level >=0 ) { - params[GUC_CTL_LOG_PARAMS ] = guc->log_flags; + params[GUC_CTL_LOG_PARAMS ] = guc->log_flags; + +if (i915.guc_log_level >=0 ) params[GUC_CTL_DEBUG ] = i915.guc_log_level <<GUC_LOG_VERBOSITY_SHIFT ; - } +else + params[GUC_CTL_DEBUG ] =GUC_LOG_DISABLED ;if (guc->ads_obj) {u32 ads = (u32 )i915_gem_obj_ggtt_offset (guc->ads_obj)
Signature · 6 lines
1.9.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/11 drm/i915: Add GuC ukernel logging related fields to fw interface file
In reply to [email protected]From: Sagar Arun Kamble <[email protected]>
The first page of the GuC log buffer contains state info or meta data which is required to parse the logs contained in the subsequent pages. The structure representing the state info is added to interface file as Driver would need to handle log buffer flush interrupts from GuC. Added an enum for the different message/event types that can be send by the GuC ukernel to Host.
Also added 2 new Host to GuC action types to inform GuC when Host has flushed the log buffer and forcefuly cause the GuC to send a new log buffer flush interrupt.
--- drivers/gpu/drm/i915/intel_guc_fwif.h | 53 +++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+)
drivers/gpu/drm/i915/intel_guc_fwif.h +53 -0
@@ -418,15 +418,62 @@ struct guc_ads {u32 reserved2[4 ]; } __packed; +/* GuC logging structures */ + +enum guc_log_buffer_type { +GUC_ISR_LOG_BUFFER , +GUC_DPC_LOG_BUFFER , +GUC_CRASH_DUMP_LOG_BUFFER , +GUC_MAX_LOG_BUFFER +}; + +/* +* Below state is used for coordination of retrival of GuC logs +* by i915. read_ptr is where i915 read last. GuC keeps incrementing +* write_ptr on each log entry. When buffer gets half filled and i915 +* has requested interrupt, GuC will set flush_to_file field and raise the +* interrupt. i915 should read the buffer and clear flush_to_file field. +* i915 should also update the read_ptr. +*/ +struct guc_log_buffer_state { +u32 marker[2 ]; +u32 read_ptr; +u32 write_ptr; +u32 size; +u32 sampled_write_ptr; +union { +struct { +u32 flush_to_file:1 ; +u32 buffer_full_cnt:4 ; +u32 reserved:27 ; + }; +u32 flags; + }; +u32 version; +} __packed; + +union guc_log_control { +struct { +u32 logging_enabled:1 ; +u32 reserved1:3 ; +u32 verbosity:4 ; +u32 reserved2:24 ; + }; +u32 value; +} __packed; +/* This Action will be programmed in C180 - SOFT_SCRATCH_O_REG */ enum host2guc_action {HOST2GUC_ACTION_DEFAULT =0x0 ,HOST2GUC_ACTION_SAMPLE_FORCEWAKE =0x6 ,HOST2GUC_ACTION_ALLOCATE_DOORBELL =0x10 ,HOST2GUC_ACTION_DEALLOCATE_DOORBELL =0x20 , +HOST2GUC_ACTION_LOG_BUFFER_FILE_FLUSH_COMPLETE =0x30 , +HOST2GUC_ACTION_FORCE_LOGBUFFERFLUSH =0x302 ,HOST2GUC_ACTION_ENTER_S_STATE =0x501 ,HOST2GUC_ACTION_EXIT_S_STATE =0x502 ,HOST2GUC_ACTION_SLPC_REQUEST =0x3003 , +HOST2GUC_ACTION_UK_LOG_ENABLE_LOGGING =0x0E000 ,HOST2GUC_ACTION_LIMIT };
@@ -448,4 +495,10 @@ enum guc2host_status {GUC2HOST_STATUS_GENERIC_FAIL =GUC2HOST_STATUS (0x0000F000 ) }; +/* This action will be programmed in C1BC - SOFT_SCRATCH_15_REG */ +enum guc2host_message { +GUC2HOST_MSG_CRASH_DUMP_POSTED = (1 <<1 ), +GUC2HOST_MSG_FLUSH_LOG_BUFFER = (1 <<3 ) +}; +#endif
Signature · 6 lines
1.9.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/11 drm/i915: Add low level set of routines for programming PM IER/IIR/IMR register set
In reply to [email protected]From: Akash Goel <[email protected]>
So far PM IER/IIR/IMR registers were being used only for Turbo related interrupts. But interrupts coming from GuC also use the same set. As a precursor to supporting GuC interrupts, added new low level routines so as to allow sharing the programming of PM IER/IIR/IMR registers between Turbo & GuC.
Also similar to PM IMR, maintaining a bitmask for PM IER register, to allow easy sharing of it between Turbo & GuC without involving a rmw operation.
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_irq.c | 55 ++++++++++++++++++++++++++++++++-------- drivers/gpu/drm/i915/intel_drv.h | 6 +++++ 3 files changed, 52 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -1789,6 +1789,7 @@ struct drm_i915_private { };u32 gt_irq_mask;u32 pm_irq_mask; +u32 pm_ier_mask;u32 pm_rps_events;u32 pipestat_irq_mask[I915_MAX_PIPES ];
drivers/gpu/drm/i915/i915_irq.c +45 -10
83 lines not on this page · raw message
drivers/gpu/drm/i915/intel_drv.h +6 -0
@@ -1058,6 +1058,12 @@ void gen6_disable_pm_irq(struct drm_i915_private *dev_priv, uint32_t mask);void gen6_reset_rps_interrupts (struct drm_i915_private *dev_priv);void gen6_enable_rps_interrupts (struct drm_i915_private *dev_priv);void gen6_disable_rps_interrupts (struct drm_i915_private *dev_priv); +void gen6_reset_pm_interrupts (struct drm_i915_private *dev_priv, +uint32_t reset_mask); +void gen6_enable_pm_interrupts (struct drm_i915_private *dev_priv, +uint32_t enable_mask); +void gen6_disable_pm_interrupts (struct drm_i915_private *dev_priv, +uint32_t disable_mask);u32 gen6_sanitize_rps_pm_mask (struct drm_i915_private *dev_priv,u32 mask);void intel_runtime_pm_disable_interrupts (struct drm_i915_private *dev_priv);void intel_runtime_pm_enable_interrupts (struct drm_i915_private *dev_priv);
Signature · 6 lines
1.9.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/11 drm/i915: Support for GuC interrupts
In reply to [email protected]From: Sagar Arun Kamble <[email protected]>
There are certain types of interrupts which Host can recieve from GuC. GuC ukernel sends an interrupt to Host for certain events, like for example retrieve/consume the logs generated by ukernel. This patch adds support to receive interrupts from GuC but currently enables & partially handles only the interrupt sent by GuC ukernel. Future patches will add support for handling other interrupt types.
v2: Use common low level routines for PM IER/IIR programming (Chris)
Rename interrupt functions to gen9_xxx from gen8_xxx (Chris) Replace disabling of wake ref asserts with rpm get/put (Chris)
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_guc_submission.c | 5 ++ drivers/gpu/drm/i915/i915_irq.c | 95 ++++++++++++++++++++++++++++-- drivers/gpu/drm/i915/i915_reg.h | 11 ++++ drivers/gpu/drm/i915/intel_drv.h | 3 + drivers/gpu/drm/i915/intel_guc.h | 5 ++ drivers/gpu/drm/i915/intel_guc_loader.c | 4 ++ 7 files changed, 120 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -1791,6 +1791,7 @@ struct drm_i915_private {u32 pm_irq_mask;u32 pm_ier_mask;u32 pm_rps_events; +u32 guc_events;u32 pipestat_irq_mask[I915_MAX_PIPES ];struct i915_hotplug hotplug;
drivers/gpu/drm/i915/i915_guc_submission.c +5 -0
@@ -990,6 +990,8 @@ int intel_guc_suspend(struct drm_device *dev)if (guc->guc_fw.guc_fw_load_status !=GUC_FIRMWARE_SUCCESS )return 0 ; +gen9_disable_guc_interrupts (dev_priv); + ctx = dev_priv->kernel_context; data[0 ] =HOST2GUC_ACTION_ENTER_S_STATE ;
@@ -1016,6 +1018,9 @@ int intel_guc_resume(struct drm_device *dev)if (guc->guc_fw.guc_fw_load_status !=GUC_FIRMWARE_SUCCESS )return 0 ; +if (i915.guc_log_level >=0 ) +gen9_enable_guc_interrupts (dev_priv); + ctx = dev_priv->kernel_context; data[0 ] =HOST2GUC_ACTION_EXIT_S_STATE ;
drivers/gpu/drm/i915/i915_irq.c +91 -4
145 lines not on this page · raw message
drivers/gpu/drm/i915/i915_reg.h +11 -0
@@ -5922,6 +5922,7 @@ enum skl_disp_power_wells {#define GEN8_DE_PIPE_A_IRQ (1<<16)#define GEN8_DE_PIPE_IRQ (pipe) (1<<(16+(pipe)))#define GEN8_GT_VECS_IRQ (1<<6) +#define GEN8_GT_GUC_IRQ (1<<5)#define GEN8_GT_PM_IRQ (1<<4)#define GEN8_GT_VCS2_IRQ (1<<3)#define GEN8_GT_VCS1_IRQ (1<<2)
@@ -5933,6 +5934,16 @@ enum skl_disp_power_wells {#define GEN8_GT_IIR (which) _MMIO(0x44308 + (0x10 * (which)))#define GEN8_GT_IER (which) _MMIO(0x4430c + (0x10 * (which))) +#define GEN9_GUC_TO_HOST_INT_EVENT (1<<31) +#define GEN9_GUC_EXEC_ERROR_EVENT (1<<30) +#define GEN9_GUC_DISPLAY_EVENT (1<<29) +#define GEN9_GUC_SEMA_SIGNAL_EVENT (1<<28) +#define GEN9_GUC_IOMMU_MSG_EVENT (1<<27) +#define GEN9_GUC_DB_RING_EVENT (1<<26) +#define GEN9_GUC_DMA_DONE_EVENT (1<<25) +#define GEN9_GUC_FATAL_ERROR_EVENT (1<<24) +#define GEN9_GUC_NOTIFICATION_EVENT (1<<23) +#define GEN8_RCS_IRQ_SHIFT 0#define GEN8_BCS_IRQ_SHIFT 16#define GEN8_VCS1_IRQ_SHIFT 0
drivers/gpu/drm/i915/intel_drv.h +3 -0
@@ -1081,6 +1081,9 @@ void gen8_irq_power_well_post_enable(struct drm_i915_private *dev_priv, unsigned int pipe_mask);void gen8_irq_power_well_pre_disable (struct drm_i915_private *dev_priv,unsigned int pipe_mask); +void gen9_reset_guc_interrupts (struct drm_i915_private *dev_priv); +void gen9_enable_guc_interrupts (struct drm_i915_private *dev_priv); +void gen9_disable_guc_interrupts (struct drm_i915_private *dev_priv);/* intel_crt.c */ void intel_crt_init (struct drm_device *dev);
drivers/gpu/drm/i915/intel_guc.h +5 -0
@@ -125,6 +125,11 @@ struct intel_guc {struct intel_guc_fw guc_fw;uint32_t log_flags;struct drm_i915_gem_object *log_obj; +/* +* work, interrupts_enabled are protected by dev_priv->irq_lock +*/ +struct work_struct events_work; +bool interrupts_enabled;struct drm_i915_gem_object *ads_obj;
drivers/gpu/drm/i915/intel_guc_loader.c +4 -0
@@ -433,6 +433,7 @@ int intel_guc_setup(struct drm_device *dev) }direct_interrupts_to_host (dev_priv); +gen9_reset_guc_interrupts (dev_priv); guc_fw->guc_fw_load_status =GUC_FIRMWARE_PENDING ;
@@ -479,6 +480,9 @@ int intel_guc_setup(struct drm_device *dev) intel_guc_fw_status_repr(guc_fw->guc_fw_load_status));if (i915.enable_guc_submission) { +if (i915.guc_log_level >=0 ) +gen9_enable_guc_interrupts (dev_priv); +/* The execbuf_client will be recreated. Release it first. */ i915_guc_submission_disable (dev);
Signature · 6 lines
1.9.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/11 drm/i915: Handle log buffer flush interrupt event from GuC
In reply to [email protected]From: Sagar Arun Kamble <[email protected]>
GuC ukernel sends an interrupt to Host to flush the log buffer and expects Host to correspondingly update the read pointer information in the state structure, once it has consumed the log buffer contents by copying them to a file or buffer. Even if Host couldn't copy the contents, it can still update the read pointer so that logging state is not disturbed on GuC side.
--- drivers/gpu/drm/i915/i915_guc_submission.c | 72 ++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/i915_irq.c | 19 +++++++- drivers/gpu/drm/i915/intel_guc.h | 1 + 3 files changed, 91 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_guc_submission.c +72 -0
@@ -769,6 +769,65 @@ err:return NULL ; } +static void *guc_get_write_buffer (struct intel_guc *guc) +{ +return NULL ; +} + +static void guc_read_update_log_buffer (struct drm_device *dev) +{ +struct drm_i915_private *dev_priv = dev->dev_private; +struct intel_guc *guc = &dev_priv->guc; +struct guc_log_buffer_state *log_buffer_state; +struct guc_log_buffer_state *log_buffer_copy_state; +void *src_ptr, *dst_ptr; +int i; + +if (!guc->log_obj) +return ; + + log_buffer_state = src_ptr = +kmap_atomic (i915_gem_object_get_page (guc->log_obj,0 )); + +/* Get the pointer to local buffer to store the logs */ + dst_ptr = log_buffer_copy_state =guc_get_write_buffer (guc); +if (log_buffer_copy_state) +memcpy (log_buffer_copy_state, log_buffer_state,PAGE_SIZE ); + +for (i =0 ; i <GUC_MAX_LOG_BUFFER ; i++) { +/* Update the read pointer in the shared log buffer */ + log_buffer_state->read_ptr = + log_buffer_state->sampled_write_ptr; + +/* Clear the 'flush to file' flag */ + log_buffer_state->flush_to_file =0 ; + log_buffer_state++; + +if (!log_buffer_copy_state) +continue ; + +/* The write pointer could have been updated by the GuC firmware, +* after sending the flush interrupt to Host, for consistency +* set the write pointer value to same value of sampled_write_ptr +* in the snapshot buffer. +*/ + log_buffer_copy_state->write_ptr = + log_buffer_copy_state->sampled_write_ptr; + + log_buffer_copy_state++; + } + +kunmap_atomic (src_ptr); + +/* Now copy the actual logs */ +for (i=1 ; (i < guc->log_obj->base.size /PAGE_SIZE ) && dst_ptr; i++) { + dst_ptr +=PAGE_SIZE ; + src_ptr =kmap_atomic (i915_gem_object_get_page (guc->log_obj, i)); +memcpy (dst_ptr, src_ptr,PAGE_SIZE ); +kunmap_atomic (src_ptr); + } +} +static void guc_create_log (struct intel_guc *guc) {struct drm_i915_private *dev_priv =guc_to_i915 (guc);
@@ -1030,3 +1089,16 @@ int intel_guc_resume(struct drm_device *dev)return host2guc_action (guc, data,ARRAY_SIZE (data)); } + +void i915_guc_capture_logs (struct drm_device *dev) +{ +struct drm_i915_private *dev_priv = dev->dev_private; +struct intel_guc *guc = &dev_priv->guc; +u32 data[1 ]; + +guc_read_update_log_buffer (dev); + + data[0 ] =HOST2GUC_ACTION_LOG_BUFFER_FILE_FLUSH_COMPLETE ; +if (host2guc_action (guc, data,1 )) +DRM_ERROR ("Failed\n" ); +}
drivers/gpu/drm/i915/i915_irq.c +18 -1
@@ -1249,6 +1249,7 @@ static void gen9_guc2host_events_work(struct work_struct *work) {struct drm_i915_private *dev_priv = container_of(work, struct drm_i915_private, guc.events_work); +u32 msg;spin_lock_irq (&dev_priv->irq_lock);/* Speed up work cancelation during disabling guc interrupts. */
@@ -1268,7 +1269,23 @@ static void gen9_guc2host_events_work(struct work_struct *work)gen6_enable_pm_irq (dev_priv,GEN9_GUC_TO_HOST_INT_EVENT );spin_unlock_irq (&dev_priv->irq_lock); -/* TODO: Handle the events for which GuC interrupted host */ +/* Determine why GuC interrupted host and process */ + msg =I915_READ (SOFT_SCRATCH (15 )); +if (msg & (GUC2HOST_MSG_CRASH_DUMP_POSTED | +GUC2HOST_MSG_FLUSH_LOG_BUFFER )) { +i915_guc_capture_logs (dev_priv->dev); + +/* Clear GuC to Host msg bits that are handled */ +if (msg &GUC2HOST_MSG_FLUSH_LOG_BUFFER ) +I915_WRITE (SOFT_SCRATCH (15 ), +I915_READ (SOFT_SCRATCH (15 )) & + ~GUC2HOST_MSG_FLUSH_LOG_BUFFER ); + +if (msg &GUC2HOST_MSG_CRASH_DUMP_POSTED ) +I915_WRITE (SOFT_SCRATCH (15 ), +I915_READ (SOFT_SCRATCH (15 )) & + ~GUC2HOST_MSG_CRASH_DUMP_POSTED ); + }intel_runtime_pm_put (dev_priv); }
drivers/gpu/drm/i915/intel_guc.h +1 -0
@@ -167,5 +167,6 @@ int i915_guc_wq_check_space(struct drm_i915_gem_request *rq);int i915_guc_submit (struct drm_i915_gem_request *rq);void i915_guc_submission_disable (struct drm_device *dev);void i915_guc_submission_fini (struct drm_device *dev); +void i915_guc_capture_logs (struct drm_device *dev);#endif
Signature · 6 lines
1.9.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 6/11 drm/i915: Add a relay backed debugfs interface for capturing GuC logs
In reply to [email protected]From: Akash Goel <[email protected]>
Added a new debugfs interface '/sys/kernel/debug/dri/guc_log' for the User to capture GuC firmware logs. Availed relay framework to implement the interface, where Driver will have to just use a relay API to store snapshots of the GuC log buffer in the buffer managed by relay. The snapshot will be taken when GuC firmware sends a log buffer flush interrupt and up to four snaphots could be stored in the relay buffer. The relay buffer will be operated in a mode where it will overwrite the data not yet collected by User.
Besides mmap method, through which User can directly access the relay buffer contents, relay also supports the 'poll' method. Through the 'poll' call on log file, User can come to know whenever a new snapshot of the log buffer is taken by Driver, so can run in lockstep with the Driver and capture the logs in a sustained/streaming manner, without any loss of data.
--- drivers/gpu/drm/i915/i915_guc_submission.c | 133 ++++++++++++++++++++++++++++- drivers/gpu/drm/i915/intel_guc.h | 1 + 2 files changed, 133 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_guc_submission.c +132 -1
@@ -23,6 +23,8 @@*/ #include <linux/firmware.h> #include <linux/circ_buf.h> +#include <linux/debugfs.h> +#include <linux/relay.h> #include "i915_drv.h" #include "intel_guc.h"
@@ -771,7 +773,15 @@ err:static void *guc_get_write_buffer (struct intel_guc *guc) { -return NULL ; +if (!guc->log_relay_chan) +return NULL ; + +/* Get the pointer to relay sub buffer and copy data into it ourselves. +* Could have used the relay_write() to indirectly copy the data, but +* that would have been bit convoluted, as we also need to update the +* first page containing state data. +*/ +return relay_reserve (guc->log_relay_chan, guc->log_obj->base.size); }static void guc_read_update_log_buffer (struct drm_device *dev)
@@ -828,6 +838,125 @@ static void guc_read_update_log_buffer(struct drm_device *dev) } } +/* +* Sub buffer switch callback. If this callback is not implemented +* relay will operate in non-overwrite mode so will stop accepting +* new data if there are no empty sub buffers left. +*/ +static int subbuf_start_callback (struct rchan_buf *buf, +void *subbuf, +void *prev_subbuf, +size_t prev_padding) +{ +/* Always switch to next sub buffer as we don't mind overwriting of +* old data/logs. +*/ +return 1 ; +} + +/* +* file_create() callback. Creates relay file in debugfs. +*/ +static struct dentry *create_buf_file_callback (const char *filename, +struct dentry *parent, +umode_t mode, +struct rchan_buf *buf, +int *is_global) +{ +/* +* Not using the channel filename passed as an argument, since for each +* channel relay appends the corresponding CPU number to the filename +* passed in relay_open(). This should be fine as relay just needs a +* dentry of the file associated with the channel buffer and that file's +* name need not be same as the filename passed as an argument. +*/ +struct dentry *buf_file =debugfs_create_file ("guc_log" , mode, + parent, buf, &relay_file_operations); + +/* This to enable the use of a single buffer for the relay channel and +* correspondingly have a single file exposed to User, through which +* it can pull the logs in order without any post-processing. +*/ + *is_global =1 ; + +return buf_file; +} + +/* +* file_remove() default callback. Removes relay file in debugfs. +*/ +static int remove_buf_file_callback (struct dentry *dentry) +{ +debugfs_remove (dentry); +return 0 ; +} + +/* relay channel callbacks */ +static struct rchan_callbacks relay_callbacks = { + .subbuf_start = subbuf_start_callback, + .create_buf_file = create_buf_file_callback, + .remove_buf_file = remove_buf_file_callback, +}; + +static void guc_remove_log_relay_file (struct intel_guc *guc) +{ +relay_close (guc->log_relay_chan); +} + +static void guc_create_log_relay_file (struct intel_guc *guc) +{ +struct drm_i915_private *dev_priv =guc_to_i915 (guc); +struct drm_device *dev = dev_priv->dev; +struct dentry *log_dir; +struct rchan *guc_log_relay_chan; +size_t n_subbufs, subbuf_size; + +if (guc->log_relay_chan) +return ; + +/* If /sys/kernel/debug/dri/0 location do not exist, then debugfs is +* not mounted and so can't create the relay file. +* The relay API seems to fit well with debugfs only. +*/ +if (!dev->primary->debugfs_root) { +/* logging will remain off */ + i915.guc_log_level =-1 ; +return ; + } + +/* For now create the log file in /sys/kernel/debug/dri dir. */ + log_dir = dev->primary->debugfs_root->d_parent; + +/* Keep the size of sub buffers same as shared log buffer */ + subbuf_size = guc->log_obj->base.size; +/* TODO: Decide based on the User's input */ + n_subbufs =4 ; + + guc_log_relay_chan =relay_open ("guc_log" , log_dir, + subbuf_size, n_subbufs, &relay_callbacks, dev); + +if (!guc_log_relay_chan) { +DRM_ERROR ("Couldn't create relay chan for guc logs\n" ); +/* keep logging off as couldn't create the relay channel in +* in which the logs can be stored. +*/ + i915.guc_log_level =-1 ; +return ; + } + + guc->log_relay_chan = guc_log_relay_chan; +} + +static void guc_logging_fini (struct intel_guc *guc) +{ +guc_remove_log_relay_file (guc); +} + +static void guc_logging_init (struct intel_guc *guc) +{ +guc_create_log_relay_file (guc); +} +static void guc_create_log (struct intel_guc *guc) {struct drm_i915_private *dev_priv =guc_to_i915 (guc);
@@ -864,6 +993,7 @@ static void guc_create_log(struct intel_guc *guc) offset =i915_gem_obj_ggtt_offset (obj) >>PAGE_SHIFT ;/* in pages */ guc->log_flags = (offset <<GUC_LOG_BUF_ADDR_SHIFT ) | flags; +guc_logging_init (guc); }static void init_guc_policies (struct guc_policies *policies)
@@ -1028,6 +1158,7 @@ void i915_guc_submission_fini(struct drm_device *dev)gem_release_guc_obj (dev_priv->guc.log_obj); guc->log_obj =NULL ; +guc_logging_fini (guc);if (guc->ctx_pool_obj)ida_destroy (&guc->ctx_ids);
drivers/gpu/drm/i915/intel_guc.h +1 -0
@@ -125,6 +125,7 @@ struct intel_guc {struct intel_guc_fw guc_fw;uint32_t log_flags;struct drm_i915_gem_object *log_obj; +struct rchan *log_relay_chan;/* * work, interrupts_enabled are protected by dev_priv->irq_lock */
Signature · 6 lines
1.9.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 7/11 drm/i915: Forcefully flush GuC log buffer on reset
In reply to [email protected]From: Sagar Arun Kamble <[email protected]>
If GuC logs are being captured, there should be a force log buffer flush action sent to GuC before proceeding with GPU reset and re-initializing GUC. Those logs would be useful to understand why the GPU reset was initiated.
--- drivers/gpu/drm/i915/i915_guc_submission.c | 25 +++++++++++++++++++++++++ drivers/gpu/drm/i915/i915_irq.c | 2 ++ drivers/gpu/drm/i915/intel_guc.h | 1 + 3 files changed, 28 insertions(+)
drivers/gpu/drm/i915/i915_guc_submission.c +25 -0
@@ -169,6 +169,16 @@ static int host2guc_sample_forcewake(struct intel_guc *guc,return host2guc_action (guc, data,ARRAY_SIZE (data)); } +static int host2guc_force_logbuffer_flush (struct intel_guc *guc) +{ +u32 data[2 ]; + + data[0 ] =HOST2GUC_ACTION_FORCE_LOGBUFFERFLUSH ; + data[1 ] =0 ; + +return host2guc_action (guc, data,2 ); +} +/* * Initialise, update, or clear doorbell data shared with the GuC *
@@ -1233,3 +1243,18 @@ void i915_guc_capture_logs(struct drm_device *dev)if (host2guc_action (guc, data,1 ))DRM_ERROR ("Failed\n" ); } + +void i915_guc_capture_logs_on_reset (struct drm_device *dev) +{ +struct drm_i915_private *dev_priv = dev->dev_private; +struct intel_guc *guc = &dev_priv->guc; + +/* First disable the interrupts, will be renabled after reset */ +gen9_disable_guc_interrupts (dev_priv); + +/* Ask GuC to update the log buffer state */ +host2guc_force_logbuffer_flush (guc); + +/* GuC would have updated the log buffer by now, so capture it */ +i915_guc_capture_logs (dev); +}
drivers/gpu/drm/i915/i915_irq.c +2 -0
@@ -2701,6 +2701,8 @@ static void i915_reset_and_wakeup(struct drm_i915_private *dev_priv)*/ intel_runtime_pm_get (dev_priv); +i915_guc_capture_logs_on_reset (dev_priv->dev); +intel_prepare_reset (dev_priv);/*
drivers/gpu/drm/i915/intel_guc.h +1 -0
@@ -169,5 +169,6 @@ int i915_guc_submit(struct drm_i915_gem_request *rq);void i915_guc_submission_disable (struct drm_device *dev);void i915_guc_submission_fini (struct drm_device *dev);void i915_guc_capture_logs (struct drm_device *dev); +void i915_guc_capture_logs_on_reset (struct drm_device *dev);#endif
Signature · 6 lines
1.9.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 8/11 drm/i915: Debugfs support for GuC logging control
In reply to [email protected]From: Sagar Arun Kamble <[email protected]>
This patch provides debugfs interface i915_guc_output_control for on the fly enabling/disabling of logging in GuC firmware and controlling the verbosity level of logs.
--- drivers/gpu/drm/i915/i915_debugfs.c | 35 ++++++++++++++++++++++++- drivers/gpu/drm/i915/i915_guc_submission.c | 41 ++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_guc.h | 1 + 3 files changed, 76 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_debugfs.c +34 -1
@@ -2624,6 +2624,38 @@ static int i915_guc_log_dump(struct seq_file *m, void *data)return 0 ; } +static int +i915_guc_log_control_set (void *data,u64 val) +{ +struct drm_device *dev = data; +struct drm_i915_private *dev_priv = dev->dev_private; +struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw; +struct intel_guc *guc = &dev_priv->guc; +int ret; + +if (!HAS_GUC_UCODE (dev)) +return -EINVAL ; + +if (!i915.enable_guc_submission) +return -EINVAL ; + +if (guc_fw->guc_fw_load_status !=GUC_FIRMWARE_SUCCESS ) +return -EINVAL ; + +if (!guc->log_obj || !guc->log_relay_chan) +return -EINVAL ; + +intel_runtime_pm_get (dev_priv); + ret =i915_guc_log_control (dev, val); +intel_runtime_pm_put (dev_priv); + +return ret; +} + +DEFINE_SIMPLE_ATTRIBUTE (i915_guc_log_control_fops, +NULL , i915_guc_log_control_set, +"0x%08llx\n" ); +static int i915_edp_psr_status (struct seq_file *m,void *data) {struct drm_info_node *node = m->private;
@@ -5481,7 +5513,8 @@ static const struct i915_debugfs_files { {"i915_fbc_false_color", &i915_fbc_fc_fops}, {"i915_dp_test_data", &i915_displayport_test_data_fops}, {"i915_dp_test_type", &i915_displayport_test_type_fops}, - {"i915_dp_test_active", &i915_displayport_test_active_fops} + {"i915_dp_test_active", &i915_displayport_test_active_fops}, + {"i915_guc_log_control", &i915_guc_log_control_fops} };void intel_display_crc_init (struct drm_device *dev)
drivers/gpu/drm/i915/i915_guc_submission.c +41 -0
50 lines not on this page · raw message
drivers/gpu/drm/i915/intel_guc.h +1 -0
@@ -170,5 +170,6 @@ void i915_guc_submission_disable(struct drm_device *dev);void i915_guc_submission_fini (struct drm_device *dev);void i915_guc_capture_logs (struct drm_device *dev);void i915_guc_capture_logs_on_reset (struct drm_device *dev); +int i915_guc_log_control (struct drm_device *dev,uint64_t control_val);#endif
Signature · 6 lines
1.9.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 9/11 drm/i915: New module param to control the size of buffer used for storing GuC firmware logs
In reply to [email protected]From: Akash Goel <[email protected]>
On recieving the log buffer flush interrupt from GuC firmware, Driver stores the snapshot of the log buffer in a local buffer, from which Userspace can pull the logs. By default Driver store, up to, 4 snapshots of the log buffer in a local buffer (managed by relay). Added a new module (read only) param, 'guc_log_size', through which User can specify the number of snapshots of log buffer to be stored in local buffer. This can be used to ensure capturing of all boot time logs even with high verbosity level.
--- drivers/gpu/drm/i915/i915_guc_submission.c | 2 +- drivers/gpu/drm/i915/i915_params.c | 5 +++++ drivers/gpu/drm/i915/i915_params.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_guc_submission.c +1 -1
@@ -950,7 +950,7 @@ static void guc_create_log_relay_file(struct intel_guc *guc)/* Keep the size of sub buffers same as shared log buffer */ subbuf_size = guc->log_obj->base.size;/* TODO: Decide based on the User's input */ - n_subbufs =4 ; + n_subbufs = i915.guc_log_size; guc_log_relay_chan =relay_open ("guc_log" , log_dir, subbuf_size, n_subbufs, &relay_callbacks, dev);
drivers/gpu/drm/i915/i915_params.c +5 -0
@@ -57,6 +57,7 @@ struct i915_params i915 __read_mostly = { .enable_guc_loading = 0, .enable_guc_submission = 0, .guc_log_level = -1, + .guc_log_size = 4, .enable_dp_mst = true, .inject_load_failure = 0, .enable_dpcd_backlight = false,
@@ -213,6 +214,10 @@ module_param_named(guc_log_level, i915.guc_log_level, int, 0400);MODULE_PARM_DESC (guc_log_level,"GuC firmware logging level (-1:disabled (default), 0-3:enabled)" ); +module_param_named (guc_log_size, i915.guc_log_size, int,0400 ); +MODULE_PARM_DESC (guc_log_size, +"Number of sub buffers to store GuC firmware logs (default: 4)" ); +module_param_named_unsafe (enable_dp_mst, i915.enable_dp_mst, bool,0600 );MODULE_PARM_DESC (enable_dp_mst,"Enable multi-stream transport (MST) for new DisplayPort sinks. (default: true)" );
drivers/gpu/drm/i915/i915_params.h +1 -0
@@ -48,6 +48,7 @@ struct i915_params {int enable_guc_loading;int enable_guc_submission;int guc_log_level; +int guc_log_size;int use_mmio_flip;int mmio_debug;int edp_vswing;
Signature · 6 lines
1.9.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 10/11 drm/i915: Support to create write combined type vmaps
In reply to [email protected]From: Chris Wilson <[email protected]>
vmaps has a provision for controlling the page protection bits, with which we can use to control the mapping type, e.g. WB, WC, UC or even WT. To allow the caller to choose their mapping type, we add a parameter to i915_gem_object_pin_map - but we still only allow one vmap to be cached per object. If the object is currently not pinned, then we recreate the previous vmap with the new access type, but if it was pinned we report an error. This effectively limits the access via i915_gem_object_pin_map to a single mapping type for the lifetime of the object. Not usually a problem, but something to be aware of when setting up the object's vmap.
We will want to vary the access type to enable WC mappings of ringbuffer and context objects on !llc platforms, as well as other objects where we need coherent access to the GPU's pages without going through the GTT
--- drivers/gpu/drm/i915/i915_drv.h | 4 ++- drivers/gpu/drm/i915/i915_gem.c | 57 +++++++++++++++++++++++++-------- drivers/gpu/drm/i915/i915_gem_dmabuf.c | 2 +- drivers/gpu/drm/i915/intel_lrc.c | 8 ++--- drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +- 5 files changed, 53 insertions(+), 20 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +3 -1
@@ -3144,6 +3144,7 @@ static inline void i915_gem_object_unpin_pages(struct drm_i915_gem_object *obj)/** * i915_gem_object_pin_map - return a contiguous mapping of the entire object * @obj - the object to map into kernel address space +* &use_wc - whether the mapping should be using WC or WB pgprot_t * * Calls i915_gem_object_pin_pages() to prevent reaping of the object's * pages and then returns a contiguous mapping of the backing storage into
@@ -3155,7 +3156,8 @@ static inline void i915_gem_object_unpin_pages(struct drm_i915_gem_object *obj)* Returns the pointer through which to access the mapped object, or an * ERR_PTR() on error. */ -void *__must_check i915_gem_object_pin_map (struct drm_i915_gem_object *obj); +void *__must_check i915_gem_object_pin_map (struct drm_i915_gem_object *obj, +bool use_wc);/** * i915_gem_object_unpin_map - releases an earlier mapping
drivers/gpu/drm/i915/i915_gem.c +44 -13
102 lines not on this page · raw message
drivers/gpu/drm/i915/i915_gem_dmabuf.c +1 -1
@@ -115,7 +115,7 @@ static void *i915_gem_dmabuf_vmap(struct dma_buf *dma_buf)if (ret)return ERR_PTR (ret); - addr =i915_gem_object_pin_map (obj); + addr =i915_gem_object_pin_map (obj, false);mutex_unlock (&dev->struct_mutex);return addr;
drivers/gpu/drm/i915/intel_lrc.c +4 -4
@@ -952,7 +952,7 @@ static int intel_lr_context_pin(struct i915_gem_context *ctx,if (ret) goto err; - vaddr =i915_gem_object_pin_map (ce->state); + vaddr =i915_gem_object_pin_map (ce->state, false);if (IS_ERR (vaddr)) { ret =PTR_ERR (vaddr); goto unpin_ctx_obj;
@@ -1939,7 +1939,7 @@ lrc_setup_hws(struct intel_engine_cs *engine,/* The HWSP is part of the default context object in LRC mode. */ engine->status_page.gfx_addr =i915_gem_obj_ggtt_offset (dctx_obj) +LRC_PPHWSP_PN *PAGE_SIZE ; - hws =i915_gem_object_pin_map (dctx_obj); + hws =i915_gem_object_pin_map (dctx_obj, false);if (IS_ERR (hws))return PTR_ERR (hws); engine->status_page.page_addr = hws +LRC_PPHWSP_PN *PAGE_SIZE ;
@@ -2291,7 +2291,7 @@ populate_lr_context(struct i915_gem_context *ctx,return ret; } - vaddr =i915_gem_object_pin_map (ctx_obj); + vaddr =i915_gem_object_pin_map (ctx_obj, false);if (IS_ERR (vaddr)) { ret =PTR_ERR (vaddr);DRM_DEBUG_DRIVER ("Could not map object pages! (%d)\n" , ret);
@@ -2525,7 +2525,7 @@ void intel_lr_context_reset(struct drm_i915_private *dev_priv,if (!ctx_obj)continue ; - vaddr =i915_gem_object_pin_map (ctx_obj); + vaddr =i915_gem_object_pin_map (ctx_obj, false);if (WARN_ON (IS_ERR (vaddr)))continue ;
drivers/gpu/drm/i915/intel_ringbuffer.c +1 -1
@@ -2131,7 +2131,7 @@ int intel_pin_and_map_ringbuffer_obj(struct drm_i915_private *dev_priv,if (ret) goto err_unpin; - addr =i915_gem_object_pin_map (obj); + addr =i915_gem_object_pin_map (obj, false);if (IS_ERR (addr)) { ret =PTR_ERR (addr); goto err_unpin;
Signature · 6 lines
1.9.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 11/11 drm/i915: Use uncached(WC) mapping for acessing the GuC log buffer
In reply to [email protected]From: Akash Goel <[email protected]>
Host needs to sample the GuC log buffer on every flush interrupt from GuC. To ensure that we always get the up-to-date data from log buffer, its better to access the buffer through an uncached CPU mapping. Since the data to be read is less than 50 KB, there would not be any performance implications.
--- drivers/gpu/drm/i915/i915_guc_submission.c | 27 +++++++++++++++++++++------ drivers/gpu/drm/i915/intel_guc.h | 1 + 2 files changed, 22 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/i915_guc_submission.c +21 -6
@@ -816,8 +816,7 @@ static void guc_read_update_log_buffer(struct drm_device *dev)if (!guc->log_obj)return ; - log_buffer_state = src_ptr = -kmap_atomic (i915_gem_object_get_page (guc->log_obj,0 )); + log_buffer_state = src_ptr = guc->log_buf_addr;/* Get the pointer to local buffer to store the logs */ dst_ptr = log_buffer_copy_state =guc_get_write_buffer (guc);
@@ -847,14 +846,11 @@ static void guc_read_update_log_buffer(struct drm_device *dev) log_buffer_copy_state++; } -kunmap_atomic (src_ptr); -/* Now copy the actual logs */ for (i=1 ; (i < guc->log_obj->base.size /PAGE_SIZE ) && dst_ptr; i++) { dst_ptr +=PAGE_SIZE ; - src_ptr =kmap_atomic (i915_gem_object_get_page (guc->log_obj, i)); + src_ptr +=PAGE_SIZE ;memcpy (dst_ptr, src_ptr,PAGE_SIZE ); -kunmap_atomic (src_ptr); } }
@@ -983,6 +979,7 @@ static void guc_create_log(struct intel_guc *guc)struct drm_i915_gem_object *obj;unsigned long offset;uint32_t size, flags; +void *vaddr;if (i915.guc_log_level >GUC_LOG_VERBOSITY_MAX ) i915.guc_log_level =GUC_LOG_VERBOSITY_MAX ;
@@ -1003,6 +1000,21 @@ static void guc_create_log(struct intel_guc *guc) } guc->log_obj = obj; + +/* Create a WC (Uncached for read) mapping so that we can +* directly get the data (up-to-date) from system memory. +*/ + vaddr =i915_gem_object_pin_map (obj, true); +if (IS_ERR (vaddr)) { +DRM_DEBUG_DRIVER ("Couldn't map log buffer pages(%ld)\n" , +PTR_ERR (vaddr)); + i915.guc_log_level =-1 ; +gem_release_guc_obj (dev_priv->guc.log_obj); + guc->log_obj =NULL ; +return ; + } + + guc->log_buf_addr = vaddr; }/* each allocated unit is a page */
@@ -1176,6 +1188,9 @@ void i915_guc_submission_fini(struct drm_device *dev)gem_release_guc_obj (dev_priv->guc.ads_obj); guc->ads_obj =NULL ; +if (guc->log_obj) +i915_gem_object_unpin_map (guc->log_obj); + guc->log_buf_addr =NULL ;gem_release_guc_obj (dev_priv->guc.log_obj); guc->log_obj =NULL ;guc_logging_fini (guc);
drivers/gpu/drm/i915/intel_guc.h +1 -0
@@ -125,6 +125,7 @@ struct intel_guc {struct intel_guc_fw guc_fw;uint32_t log_flags;struct drm_i915_gem_object *log_obj; +void *log_buf_addr;struct rchan *log_relay_chan;/* * work, interrupts_enabled are protected by dev_priv->irq_lock
Signature · 6 lines
1.9.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Ro.CI.BAT: failure for Support for sustained capturing of GuC firmware logs (rev2)
In reply to [email protected]== Series Details ==
== Series Details ==
Series: Support for sustained capturing of GuC firmware logs (rev2)
URL : https://patchwork.freedesktop.org/series/7910/
State : failure
== Summary ==
Applying: drm/i915: Decouple GuC log setup from verbosity parameter
Applying: drm/i915: Add GuC ukernel logging related fields to fw interface file
Applying: drm/i915: Add low level set of routines for programming PM IER/IIR/IMR register set
Applying: drm/i915: Support for GuC interrupts
fatal: sha1 information is lacking or useless (drivers/gpu/drm/i915/i915_drv.h).
error: could not build fake ancestor
Patch failed at 0004 drm/i915: Support for GuC interrupts
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx