diff options
author | Dave Airlie <airlied@redhat.com> | 2018-09-27 19:37:51 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2018-09-27 19:37:55 -0400 |
commit | db9825c95498280718c4687fcf712016f5b6f5f6 (patch) | |
tree | 01661a811bcd16a7b6f3ee9790e77da75fd178b0 /drivers/gpu/drm/i915/selftests/i915_request.c | |
parent | 156e60bc71aa31a3b42b1d66a822c2999bd0994c (diff) | |
parent | 448626103dad54ec5d06722e955586b5d557625d (diff) |
Merge tag 'drm-intel-next-2018-09-21' of git://anongit.freedesktop.org/drm/drm-intel into drm-next
Driver Changes:
- Bugzilla 107600: Fix stuttering video playback on MythTV on old hardware (Chris)
- Avoid black screen when using CSC coefficient matrix (Raviraj)
- Hammer PDs on Baytrail to make sure they reload (Chris)
- Capture some objects if unable to capture all, on error (Chris)
- Add W/A for 16 GB DIMMs on SKL+ (Mahesh)
- Only enable IPC for symmetric memory configurations on KBL+ (Mahesh)
- Assume pipe A to have maximum stride limits (Ville)
- Always update update OA contexts via context image (Tvrtko)
- Icelake enabling patches (Madhav, Dhinakaran)
- Add Icelake DMC firmware (Anusha)
- Fixes for CI found corner cases (Chris)
- Limit the backpressure for request allocation (Chris)
- Park GPU on module load so usage starts from known state (Chris)
- Flush tasklet when checking for idle (Chris)
- Use coherent write into the context image on BSW+ (Chris)
- Fix possible integer overflow for framebuffers that get aligned past 4GiB (Ville)
- Downgrade fence timeout from warn to notice and add debug hint (Chris)
- Fixes to multi function encoder code (Ville)
- Fix sprite plane check logic (Dan, Ville)
- PAGE_SIZE vs. I915_GTT_PAGE_SIZE fixes (Ville)
- Decode memory bandwidth and parameters for BXT and SKL+ (Mahesh)
- Overwrite BIOS set IPC value from KMS (Mahesh)
- Multiple pipe handling code cleanups/restructurings/optimizations (Ville)
- Spare low 4G address for non-48bit objects (Chris)
- Free context_setparam of struct_mutex (Chris)
- Delay updating ring register state on resume (Chris)
- Avoid unnecessarily copying overlay IOCTL parameters (Chris)
- Update GuC power domain states even without submission (Michal)
- Restore GuC preempt-context across S3/S4 (Chris)
- Add kernel selftest for rapid context switching (Chris)
- Keep runtime power management ref for live selftests (Chris)
- GEM code cleanups (Matt)
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180927095933.GA11458@jlahtine-desk.ger.corp.intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/selftests/i915_request.c')
-rw-r--r-- | drivers/gpu/drm/i915/selftests/i915_request.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/selftests/i915_request.c b/drivers/gpu/drm/i915/selftests/i915_request.c index c4aac6141e04..07e557815308 100644 --- a/drivers/gpu/drm/i915/selftests/i915_request.c +++ b/drivers/gpu/drm/i915/selftests/i915_request.c | |||
@@ -342,6 +342,7 @@ static int live_nop_request(void *arg) | |||
342 | */ | 342 | */ |
343 | 343 | ||
344 | mutex_lock(&i915->drm.struct_mutex); | 344 | mutex_lock(&i915->drm.struct_mutex); |
345 | intel_runtime_pm_get(i915); | ||
345 | 346 | ||
346 | for_each_engine(engine, i915, id) { | 347 | for_each_engine(engine, i915, id) { |
347 | struct i915_request *request = NULL; | 348 | struct i915_request *request = NULL; |
@@ -402,6 +403,7 @@ static int live_nop_request(void *arg) | |||
402 | } | 403 | } |
403 | 404 | ||
404 | out_unlock: | 405 | out_unlock: |
406 | intel_runtime_pm_put(i915); | ||
405 | mutex_unlock(&i915->drm.struct_mutex); | 407 | mutex_unlock(&i915->drm.struct_mutex); |
406 | return err; | 408 | return err; |
407 | } | 409 | } |
@@ -487,6 +489,7 @@ static int live_empty_request(void *arg) | |||
487 | */ | 489 | */ |
488 | 490 | ||
489 | mutex_lock(&i915->drm.struct_mutex); | 491 | mutex_lock(&i915->drm.struct_mutex); |
492 | intel_runtime_pm_get(i915); | ||
490 | 493 | ||
491 | batch = empty_batch(i915); | 494 | batch = empty_batch(i915); |
492 | if (IS_ERR(batch)) { | 495 | if (IS_ERR(batch)) { |
@@ -550,6 +553,7 @@ out_batch: | |||
550 | i915_vma_unpin(batch); | 553 | i915_vma_unpin(batch); |
551 | i915_vma_put(batch); | 554 | i915_vma_put(batch); |
552 | out_unlock: | 555 | out_unlock: |
556 | intel_runtime_pm_put(i915); | ||
553 | mutex_unlock(&i915->drm.struct_mutex); | 557 | mutex_unlock(&i915->drm.struct_mutex); |
554 | return err; | 558 | return err; |
555 | } | 559 | } |
@@ -644,6 +648,7 @@ static int live_all_engines(void *arg) | |||
644 | */ | 648 | */ |
645 | 649 | ||
646 | mutex_lock(&i915->drm.struct_mutex); | 650 | mutex_lock(&i915->drm.struct_mutex); |
651 | intel_runtime_pm_get(i915); | ||
647 | 652 | ||
648 | err = begin_live_test(&t, i915, __func__, ""); | 653 | err = begin_live_test(&t, i915, __func__, ""); |
649 | if (err) | 654 | if (err) |
@@ -726,6 +731,7 @@ out_request: | |||
726 | i915_vma_unpin(batch); | 731 | i915_vma_unpin(batch); |
727 | i915_vma_put(batch); | 732 | i915_vma_put(batch); |
728 | out_unlock: | 733 | out_unlock: |
734 | intel_runtime_pm_put(i915); | ||
729 | mutex_unlock(&i915->drm.struct_mutex); | 735 | mutex_unlock(&i915->drm.struct_mutex); |
730 | return err; | 736 | return err; |
731 | } | 737 | } |
@@ -747,6 +753,7 @@ static int live_sequential_engines(void *arg) | |||
747 | */ | 753 | */ |
748 | 754 | ||
749 | mutex_lock(&i915->drm.struct_mutex); | 755 | mutex_lock(&i915->drm.struct_mutex); |
756 | intel_runtime_pm_get(i915); | ||
750 | 757 | ||
751 | err = begin_live_test(&t, i915, __func__, ""); | 758 | err = begin_live_test(&t, i915, __func__, ""); |
752 | if (err) | 759 | if (err) |
@@ -853,6 +860,7 @@ out_request: | |||
853 | i915_request_put(request[id]); | 860 | i915_request_put(request[id]); |
854 | } | 861 | } |
855 | out_unlock: | 862 | out_unlock: |
863 | intel_runtime_pm_put(i915); | ||
856 | mutex_unlock(&i915->drm.struct_mutex); | 864 | mutex_unlock(&i915->drm.struct_mutex); |
857 | return err; | 865 | return err; |
858 | } | 866 | } |