bybrooklyn/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-03 14:02:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

drm/i915: Move context management under GEM

Browse Source 
Keep track of the GEM contexts underneath i915->gem.contexts and assign
them their own lock for the purposes of list management.

v2: Focus on lock tracking; ctx->vm is protected by ctx->mutex
v3: Correct split with removal of logical HW ID

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-15-chris@chris-wilson.co.uk
This commit is contained in:
Chris Wilson
2019-10-04 14:40:09 +01:00
parent 2935ed5339
commit a4e7ccdac3
28 changed files with 394 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/gpu/drm/i915/gt/selftest_context.c
View File

@@ -155,13 +155,9 @@ static int live_context_size(void *arg)
* HW tries to write past the end of one.
*/
mutex_lock(&gt->i915->drm.struct_mutex);
fixme = kernel_context(gt->i915);
if (IS_ERR(fixme)) {
err = PTR_ERR(fixme);
goto unlock;
}
if (IS_ERR(fixme))
return PTR_ERR(fixme);
for_each_engine(engine, gt->i915, id) {
struct {
@@ -201,8 +197,6 @@ static int live_context_size(void *arg)
}
kernel_context_close(fixme);
unlock:
mutex_unlock(&gt->i915->drm.struct_mutex);
return err;
}
@@ -305,12 +299,10 @@ static int live_active_context(void *arg)
if (IS_ERR(file))
return PTR_ERR(file);
mutex_lock(&gt->i915->drm.struct_mutex);
fixme = live_context(gt->i915, file);
if (IS_ERR(fixme)) {
err = PTR_ERR(fixme);
goto unlock;
goto out_file;
}
for_each_engine(engine, gt->i915, id) {
@@ -323,8 +315,7 @@ static int live_active_context(void *arg)
break;
}
unlock:
mutex_unlock(&gt->i915->drm.struct_mutex);
out_file:
mock_file_free(gt->i915, file);
return err;
}
@@ -418,12 +409,10 @@ static int live_remote_context(void *arg)
if (IS_ERR(file))
return PTR_ERR(file);
mutex_lock(&gt->i915->drm.struct_mutex);
fixme = live_context(gt->i915, file);
if (IS_ERR(fixme)) {
err = PTR_ERR(fixme);
goto unlock;
goto out_file;
}
for_each_engine(engine, gt->i915, id) {
@@ -436,8 +425,7 @@ static int live_remote_context(void *arg)
break;
}
unlock:
mutex_unlock(&gt->i915->drm.struct_mutex);
out_file:
mock_file_free(gt->i915, file);
return err;
}