Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
forked fromtorvalds/linux

Commitfc0768c

Browse files
telfmikuint
authored andcommitted
drm/i915/tdr: Initialize hangcheck struct for each engine
Initialize hangcheck struct during driver load. Since we do the same afterrecovering from a reset, this is extracted into a helper function.v2: remove redundant hangcheck init during load as this is done whenengines are initialized (Chris)Cc: Mika Kuoppala <mika.kuoppala@intel.com>Signed-off-by: Tomas Elf <tomas.elf@intel.com>Signed-off-by: Arun Siluvery <arun.siluvery@linux.intel.com>Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>Link:http://patchwork.freedesktop.org/patch/msgid/1458577619-12006-1-git-send-email-arun.siluvery@linux.intel.com
1 parent29dc373 commitfc0768c

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

‎drivers/gpu/drm/i915/i915_drv.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2740,6 +2740,7 @@ extern long i915_compat_ioctl(struct file *filp, unsigned int cmd,
27402740
externintintel_gpu_reset(structdrm_device*dev,u32engine_mask);
27412741
externboolintel_has_gpu_reset(structdrm_device*dev);
27422742
externinti915_reset(structdrm_device*dev);
2743+
externvoidintel_engine_init_hangcheck(structintel_engine_cs*engine);
27432744
externunsigned longi915_chipset_val(structdrm_i915_private*dev_priv);
27442745
externunsigned longi915_mch_val(structdrm_i915_private*dev_priv);
27452746
externunsigned longi915_gfx_val(structdrm_i915_private*dev_priv);

‎drivers/gpu/drm/i915/intel_lrc.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1606,7 +1606,7 @@ static int gen8_init_common_ring(struct intel_engine_cs *engine)
16061606
engine->next_context_status_buffer=next_context_status_buffer_hw;
16071607
DRM_DEBUG_DRIVER("Execlists enabled for %s\n",engine->name);
16081608

1609-
memset(&engine->hangcheck,0,sizeof(engine->hangcheck));
1609+
intel_engine_init_hangcheck(engine);
16101610

16111611
return0;
16121612
}

‎drivers/gpu/drm/i915/intel_ringbuffer.c‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -555,6 +555,11 @@ static bool stop_ring(struct intel_engine_cs *engine)
555555
return (I915_READ_HEAD(engine)&HEAD_ADDR)==0;
556556
}
557557

558+
voidintel_engine_init_hangcheck(structintel_engine_cs*engine)
559+
{
560+
memset(&engine->hangcheck,0,sizeof(engine->hangcheck));
561+
}
562+
558563
staticintinit_ring_common(structintel_engine_cs*engine)
559564
{
560565
structdrm_device*dev=engine->dev;
@@ -634,7 +639,7 @@ static int init_ring_common(struct intel_engine_cs *engine)
634639
ringbuf->tail=I915_READ_TAIL(engine)&TAIL_ADDR;
635640
intel_ring_update_space(ringbuf);
636641

637-
memset(&engine->hangcheck,0,sizeof(engine->hangcheck));
642+
intel_engine_init_hangcheck(engine);
638643

639644
out:
640645
intel_uncore_forcewake_put(dev_priv,FORCEWAKE_ALL);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp