| Message ID | 20180927062739.21156-1-nayan26deshmukh@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/etnaviv: fix build error due to change in scheduler struct | expand |
Am 27.09.2018 um 08:27 schrieb Nayan Deshmukh: > The work_tdr field was moved from drm_sched_job to drm_gpu_scheduler > as part of a previous patch. > > Fixes: 4f07d88d8534 drm/scheduler: remove timeout work_struct from drm_sched_job > Signed-off-by: Nayan Deshmukh <nayan26deshmukh@gmail.com> Acked-by: Christian König <christian.koenig@amd.com> > --- > drivers/gpu/drm/etnaviv/etnaviv_sched.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/etnaviv/etnaviv_sched.c b/drivers/gpu/drm/etnaviv/etnaviv_sched.c > index 69e9b431bf1f..e7c3ed6c9a2e 100644 > --- a/drivers/gpu/drm/etnaviv/etnaviv_sched.c > +++ b/drivers/gpu/drm/etnaviv/etnaviv_sched.c > @@ -105,7 +105,7 @@ static void etnaviv_sched_timedout_job(struct drm_sched_job *sched_job) > change = dma_addr - gpu->hangcheck_dma_addr; > if (change < 0 || change > 16) { > gpu->hangcheck_dma_addr = dma_addr; > - schedule_delayed_work(&sched_job->work_tdr, > + schedule_delayed_work(&sched_job->sched->work_tdr, > sched_job->sched->timeout); > return; > }
Am Donnerstag, den 27.09.2018, 08:27 +0200 schrieb Nayan Deshmukh: > The work_tdr field was moved from drm_sched_job to drm_gpu_scheduler > as part of a previous patch. > > Fixes: 4f07d88d8534 drm/scheduler: remove timeout work_struct from drm_sched_job > Signed-off-by: Nayan Deshmukh <nayan26deshmukh@gmail.com> Thanks, I guess whoever picked up the patch that gets fixed by this will pick this into the same tree. Did you also check VC5? I think they gained a similar timeout extension mechanism. Acked-by: Lucas Stach <l.stach@pengutronix.de> > --- > drivers/gpu/drm/etnaviv/etnaviv_sched.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/etnaviv/etnaviv_sched.c b/drivers/gpu/drm/etnaviv/etnaviv_sched.c > index 69e9b431bf1f..e7c3ed6c9a2e 100644 > --- a/drivers/gpu/drm/etnaviv/etnaviv_sched.c > +++ b/drivers/gpu/drm/etnaviv/etnaviv_sched.c > @@ -105,7 +105,7 @@ static void etnaviv_sched_timedout_job(struct drm_sched_job *sched_job) > change = dma_addr - gpu->hangcheck_dma_addr; > if (change < 0 || change > 16) { > gpu->hangcheck_dma_addr = dma_addr; > - schedule_delayed_work(&sched_job->work_tdr, > + schedule_delayed_work(&sched_job->sched->work_tdr, > sched_job->sched->timeout); > return; > }
On Thu, Sep 27, 2018, 9:03 AM Lucas Stach <l.stach@pengutronix.de> wrote: > Am Donnerstag, den 27.09.2018, 08:27 +0200 schrieb Nayan Deshmukh: > > The work_tdr field was moved from drm_sched_job to drm_gpu_scheduler > > as part of a previous patch. > > > > Fixes: 4f07d88d8534 drm/scheduler: remove timeout work_struct from > drm_sched_job > > Signed-off-by: Nayan Deshmukh <nayan26deshmukh@gmail.com> > > Thanks, I guess whoever picked up the patch that gets fixed by this > will pick this into the same tree. Did you also check VC5? I think they > gained a similar timeout extension mechanism. > Thanks. I will have a look at VC5. Nayan > > Acked-by: Lucas Stach <l.stach@pengutronix.de> > > > --- > > drivers/gpu/drm/etnaviv/etnaviv_sched.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/etnaviv/etnaviv_sched.c > b/drivers/gpu/drm/etnaviv/etnaviv_sched.c > > index 69e9b431bf1f..e7c3ed6c9a2e 100644 > > --- a/drivers/gpu/drm/etnaviv/etnaviv_sched.c > > +++ b/drivers/gpu/drm/etnaviv/etnaviv_sched.c > > @@ -105,7 +105,7 @@ static void etnaviv_sched_timedout_job(struct > drm_sched_job *sched_job) > > change = dma_addr - gpu->hangcheck_dma_addr; > > if (change < 0 || change > 16) { > > gpu->hangcheck_dma_addr = dma_addr; > > - schedule_delayed_work(&sched_job->work_tdr, > > + schedule_delayed_work(&sched_job->sched->work_tdr, > > sched_job->sched->timeout); > > return; > > } > > <div dir="auto"><div><br><br><div class="gmail_quote"><div dir="ltr">On Thu, Sep 27, 2018, 9:03 AM Lucas Stach <<a href="mailto:l.stach@pengutronix.de">l.stach@pengutronix.de</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Am Donnerstag, den 27.09.2018, 08:27 +0200 schrieb Nayan Deshmukh:<br> > The work_tdr field was moved from drm_sched_job to drm_gpu_scheduler<br> > as part of a previous patch.<br> > <br> > Fixes: 4f07d88d8534 drm/scheduler: remove timeout work_struct from drm_sched_job<br> > Signed-off-by: Nayan Deshmukh <<a href="mailto:nayan26deshmukh@gmail.com" target="_blank" rel="noreferrer">nayan26deshmukh@gmail.com</a>><br> <br> Thanks, I guess whoever picked up the patch that gets fixed by this<br> will pick this into the same tree. Did you also check VC5? I think they<br> gained a similar timeout extension mechanism.<br></blockquote></div></div><div dir="auto">Thanks. I will have a look at VC5.</div><div dir="auto"><br></div><div dir="auto">Nayan</div><div dir="auto"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> <br> Acked-by: Lucas Stach <<a href="mailto:l.stach@pengutronix.de" target="_blank" rel="noreferrer">l.stach@pengutronix.de</a>><br> <br> > ---<br> > drivers/gpu/drm/etnaviv/etnaviv_sched.c | 2 +-<br> > 1 file changed, 1 insertion(+), 1 deletion(-)<br> > <br> > diff --git a/drivers/gpu/drm/etnaviv/etnaviv_sched.c b/drivers/gpu/drm/etnaviv/etnaviv_sched.c<br> > index 69e9b431bf1f..e7c3ed6c9a2e 100644<br> > --- a/drivers/gpu/drm/etnaviv/etnaviv_sched.c<br> > +++ b/drivers/gpu/drm/etnaviv/etnaviv_sched.c<br> > @@ -105,7 +105,7 @@ static void etnaviv_sched_timedout_job(struct drm_sched_job *sched_job)<br> > change = dma_addr - gpu->hangcheck_dma_addr;<br> > if (change < 0 || change > 16) {<br> > gpu->hangcheck_dma_addr = dma_addr;<br> > - schedule_delayed_work(&sched_job->work_tdr,<br> > + schedule_delayed_work(&sched_job->sched->work_tdr,<br> > sched_job->sched->timeout);<br> > return;<br> > }<br> <br> </blockquote></div></div></div>
Am 27.09.2018 um 09:03 schrieb Lucas Stach: > Am Donnerstag, den 27.09.2018, 08:27 +0200 schrieb Nayan Deshmukh: >> The work_tdr field was moved from drm_sched_job to drm_gpu_scheduler >> as part of a previous patch. >> >> Fixes: 4f07d88d8534 drm/scheduler: remove timeout work_struct from drm_sched_job >> Signed-off-by: Nayan Deshmukh <nayan26deshmukh@gmail.com> > Thanks, I guess whoever picked up the patch that gets fixed by this > will pick this into the same tree. Did you also check VC5? I think they > gained a similar timeout extension mechanism. Thanks for pointing that out and yes there is also another reference in drivers/gpu/drm/v3d/v3d_sched.c. Christian. > > Acked-by: Lucas Stach <l.stach@pengutronix.de> > >> --- >> drivers/gpu/drm/etnaviv/etnaviv_sched.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_sched.c b/drivers/gpu/drm/etnaviv/etnaviv_sched.c >> index 69e9b431bf1f..e7c3ed6c9a2e 100644 >> --- a/drivers/gpu/drm/etnaviv/etnaviv_sched.c >> +++ b/drivers/gpu/drm/etnaviv/etnaviv_sched.c >> @@ -105,7 +105,7 @@ static void etnaviv_sched_timedout_job(struct drm_sched_job *sched_job) >> change = dma_addr - gpu->hangcheck_dma_addr; >> if (change < 0 || change > 16) { >> gpu->hangcheck_dma_addr = dma_addr; >> - schedule_delayed_work(&sched_job->work_tdr, >> + schedule_delayed_work(&sched_job->sched->work_tdr, >> sched_job->sched->timeout); >> return; >> }
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_sched.c b/drivers/gpu/drm/etnaviv/etnaviv_sched.c index 69e9b431bf1f..e7c3ed6c9a2e 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_sched.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_sched.c @@ -105,7 +105,7 @@ static void etnaviv_sched_timedout_job(struct drm_sched_job *sched_job) change = dma_addr - gpu->hangcheck_dma_addr; if (change < 0 || change > 16) { gpu->hangcheck_dma_addr = dma_addr; - schedule_delayed_work(&sched_job->work_tdr, + schedule_delayed_work(&sched_job->sched->work_tdr, sched_job->sched->timeout); return; }
The work_tdr field was moved from drm_sched_job to drm_gpu_scheduler as part of a previous patch. Fixes: 4f07d88d8534 drm/scheduler: remove timeout work_struct from drm_sched_job Signed-off-by: Nayan Deshmukh <nayan26deshmukh@gmail.com> --- drivers/gpu/drm/etnaviv/etnaviv_sched.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)