mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jk/spufs into merge
This commit is contained in:
commit
d82bf49094
2 changed files with 17 additions and 9 deletions
|
@ -206,11 +206,6 @@ static int spu_run_init(struct spu_context *ctx, u32 *npc)
|
|||
(SPU_RUNCNTL_RUNNABLE | SPU_RUNCNTL_ISOLATE);
|
||||
if (runcntl == 0)
|
||||
runcntl = SPU_RUNCNTL_RUNNABLE;
|
||||
}
|
||||
|
||||
if (ctx->flags & SPU_CREATE_NOSCHED) {
|
||||
spuctx_switch_state(ctx, SPU_UTIL_USER);
|
||||
ctx->ops->runcntl_write(ctx, runcntl);
|
||||
} else {
|
||||
unsigned long privcntl;
|
||||
|
||||
|
@ -219,9 +214,15 @@ static int spu_run_init(struct spu_context *ctx, u32 *npc)
|
|||
else
|
||||
privcntl = SPU_PRIVCNTL_MODE_NORMAL;
|
||||
|
||||
ctx->ops->npc_write(ctx, *npc);
|
||||
ctx->ops->privcntl_write(ctx, privcntl);
|
||||
ctx->ops->runcntl_write(ctx, runcntl);
|
||||
ctx->ops->npc_write(ctx, *npc);
|
||||
}
|
||||
|
||||
ctx->ops->runcntl_write(ctx, runcntl);
|
||||
|
||||
if (ctx->flags & SPU_CREATE_NOSCHED) {
|
||||
spuctx_switch_state(ctx, SPU_UTIL_USER);
|
||||
} else {
|
||||
|
||||
if (ctx->state == SPU_STATE_SAVED) {
|
||||
ret = spu_activate(ctx, 0);
|
||||
|
|
|
@ -641,8 +641,10 @@ static struct spu *find_victim(struct spu_context *ctx)
|
|||
|
||||
if (tmp && tmp->prio > ctx->prio &&
|
||||
!(tmp->flags & SPU_CREATE_NOSCHED) &&
|
||||
(!victim || tmp->prio > victim->prio))
|
||||
(!victim || tmp->prio > victim->prio)) {
|
||||
victim = spu->ctx;
|
||||
get_spu_context(victim);
|
||||
}
|
||||
}
|
||||
mutex_unlock(&cbe_spu_info[node].list_mutex);
|
||||
|
||||
|
@ -658,6 +660,7 @@ static struct spu *find_victim(struct spu_context *ctx)
|
|||
* look at another context or give up after X retries.
|
||||
*/
|
||||
if (!mutex_trylock(&victim->state_mutex)) {
|
||||
put_spu_context(victim);
|
||||
victim = NULL;
|
||||
goto restart;
|
||||
}
|
||||
|
@ -670,6 +673,7 @@ static struct spu *find_victim(struct spu_context *ctx)
|
|||
* restart the search.
|
||||
*/
|
||||
mutex_unlock(&victim->state_mutex);
|
||||
put_spu_context(victim);
|
||||
victim = NULL;
|
||||
goto restart;
|
||||
}
|
||||
|
@ -687,6 +691,7 @@ static struct spu *find_victim(struct spu_context *ctx)
|
|||
spu_add_to_rq(victim);
|
||||
|
||||
mutex_unlock(&victim->state_mutex);
|
||||
put_spu_context(victim);
|
||||
|
||||
return spu;
|
||||
}
|
||||
|
@ -985,9 +990,11 @@ static int spusched_thread(void *unused)
|
|||
struct spu_context *ctx = spu->ctx;
|
||||
|
||||
if (ctx) {
|
||||
get_spu_context(ctx);
|
||||
mutex_unlock(mtx);
|
||||
spusched_tick(ctx);
|
||||
mutex_lock(mtx);
|
||||
put_spu_context(ctx);
|
||||
}
|
||||
}
|
||||
mutex_unlock(mtx);
|
||||
|
@ -1030,7 +1037,7 @@ void spuctx_switch_state(struct spu_context *ctx,
|
|||
node = spu->node;
|
||||
if (old_state == SPU_UTIL_USER)
|
||||
atomic_dec(&cbe_spu_info[node].busy_spus);
|
||||
if (new_state == SPU_UTIL_USER);
|
||||
if (new_state == SPU_UTIL_USER)
|
||||
atomic_inc(&cbe_spu_info[node].busy_spus);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue