diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-03-12 15:19:54 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-03-12 15:20:57 +1000 |
| commit | 3a7d2f4f4427f4b241f8240e370099e2ec1fd307 (patch) | |
| tree | 74e6bf378ef12918891d3cdc1eaf56e64a19941d /drivers/gpu/drm/etnaviv/etnaviv_sched.c | |
| parent | c703bf9e11c3314d068b974ef1af030ba5050e77 (diff) | |
| parent | 9e05352340d3a3e68c144136db9810b26ebb88c3 (diff) | |
Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm-next
"small fixes and a change to not restrict etnaviv to certain architectures."
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Lucas Stach <l.stach@pengutronix.de>
Link: https://patchwork.freedesktop.org/patch/msgid/4bc1a4c8447bb947d2fe8facd0ff09c5b8753087.camel@pengutronix.de
Diffstat (limited to 'drivers/gpu/drm/etnaviv/etnaviv_sched.c')
| -rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_sched.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_sched.c b/drivers/gpu/drm/etnaviv/etnaviv_sched.c index 67ae26602024..6d24fea1766b 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_sched.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_sched.c @@ -153,7 +153,7 @@ int etnaviv_sched_push_job(struct drm_sched_entity *sched_entity, mutex_lock(&submit->gpu->fence_lock); ret = drm_sched_job_init(&submit->sched_job, sched_entity, - submit->cmdbuf.ctx); + submit->ctx); if (ret) goto out_unlock; |