Commit 65805c2e authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: split out i915_wait_util.h 



Move waiting related utilities from i915_utils.h to separate new file
i915_wait_util.h. Clean up related includes.

Note: Many of the various wait macro usages could likely be refactored
to use poll_timeout_us().

Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://lore.kernel.org/r/431396ac8cdb3e2f4ff053a8933290289a66ce42.1757582214.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 2f04432f

drivers/gpu/drm/i915/gt/intel_execlists_submission.c

+1 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ 
#include "i915_timer_util.h"

#include "i915_trace.h"

#include "i915_vgpu.h"

#include "i915_wait_util.h"

#include "intel_breadcrumbs.h"

#include "intel_context.h"

#include "intel_engine_heartbeat.h"

drivers/gpu/drm/i915/gt/intel_gt_mcr.c

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
 */



#include "i915_drv.h"

#include "i915_wait_util.h"

#include "intel_gt.h"

#include "intel_gt_mcr.h"

#include "intel_gt_print.h"

drivers/gpu/drm/i915/gt/intel_reset.c

+2 −5
Original line number Diff line number Diff line
@@ -9,18 +9,17 @@ 


#include "display/intel_display_reset.h"

#include "display/intel_overlay.h"



#include "gem/i915_gem_context.h"



#include "gt/intel_gt_regs.h"



#include "gt/uc/intel_gsc_fw.h"

#include "uc/intel_guc.h"



#include "i915_drv.h"

#include "i915_file_private.h"

#include "i915_gpu_error.h"

#include "i915_irq.h"

#include "i915_reg.h"

#include "i915_wait_util.h"

#include "intel_breadcrumbs.h"

#include "intel_engine_pm.h"

#include "intel_engine_regs.h"
@@ -32,8 +31,6 @@ 
#include "intel_pci_config.h"

#include "intel_reset.h"



#include "uc/intel_guc.h"



#define RESET_MAX_RETRIES 3



static void client_mark_guilty(struct i915_gem_context *ctx, bool banned)

drivers/gpu/drm/i915/gt/intel_ring_submission.c

+4 −3
Original line number Diff line number Diff line
@@ -15,18 +15,19 @@ 
#include "i915_irq.h"

#include "i915_mitigations.h"

#include "i915_reg.h"

#include "i915_wait_util.h"

#include "intel_breadcrumbs.h"

#include "intel_context.h"

#include "intel_engine_heartbeat.h"

#include "intel_engine_pm.h"

#include "intel_engine_regs.h"

#include "intel_gt.h"

#include "intel_gt_irq.h"

#include "intel_gt_print.h"

#include "intel_gt_regs.h"

#include "intel_reset.h"

#include "intel_ring.h"

#include "shmem_utils.h"

#include "intel_engine_heartbeat.h"

#include "intel_engine_pm.h"

#include "intel_gt_print.h"



/* Rough estimate of the typical request size, performing a flush,

 * set-context and then emitting the batch.

drivers/gpu/drm/i915/gt/intel_rps.c

+2 −0
Original line number Diff line number Diff line
@@ -10,9 +10,11 @@ 
#include "display/intel_display.h"

#include "display/intel_display_rps.h"

#include "soc/intel_dram.h"



#include "i915_drv.h"

#include "i915_irq.h"

#include "i915_reg.h"

#include "i915_wait_util.h"

#include "intel_breadcrumbs.h"

#include "intel_gt.h"

#include "intel_gt_clock_utils.h"