| Message ID | 20210129155439.10128-1-patrik.r.jakobsson@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/v3d: Fix incorrect return type to timedout_job | expand |
On Fri, Jan 29, 2021 at 04:54:39PM +0100, Patrik Jakobsson wrote: > The commit a6a1f036c74e ("drm/scheduler: Job timeout handler returns > status (v3)") incorrectly uses "enum drm_task_status" for v3d and causes > a build failure. "enum drm_task_status" got changed into "enum > drm_gpu_sched_status" in v3 of the patch but the change for v3d got > lost. > > Fixes: ("drm/scheduler: Job timeout handler returns status (v3)") > Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com> I think I r-b'ed such a patch already, but maybe not yet merged. Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > drivers/gpu/drm/v3d/v3d_sched.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/v3d/v3d_sched.c b/drivers/gpu/drm/v3d/v3d_sched.c > index ef2338a294ca..ceb33f8e4379 100644 > --- a/drivers/gpu/drm/v3d/v3d_sched.c > +++ b/drivers/gpu/drm/v3d/v3d_sched.c > @@ -259,7 +259,7 @@ v3d_cache_clean_job_run(struct drm_sched_job *sched_job) > return NULL; > } > > -static enum drm_gpu_sched_status > +static enum drm_gpu_sched_stat > v3d_gpu_reset_for_timeout(struct v3d_dev *v3d, struct drm_sched_job *sched_job) > { > enum v3d_queue q; > @@ -294,7 +294,7 @@ v3d_gpu_reset_for_timeout(struct v3d_dev *v3d, struct drm_sched_job *sched_job) > * could fail if the GPU got in an infinite loop in the CL, but that > * is pretty unlikely outside of an i-g-t testcase. > */ > -static enum drm_task_status > +static enum drm_gpu_sched_stat > v3d_cl_job_timedout(struct drm_sched_job *sched_job, enum v3d_queue q, > u32 *timedout_ctca, u32 *timedout_ctra) > { > @@ -312,7 +312,7 @@ v3d_cl_job_timedout(struct drm_sched_job *sched_job, enum v3d_queue q, > return v3d_gpu_reset_for_timeout(v3d, sched_job); > } > > -static enum drm_task_status > +static enum drm_gpu_sched_stat > v3d_bin_job_timedout(struct drm_sched_job *sched_job) > { > struct v3d_bin_job *job = to_bin_job(sched_job); > @@ -321,7 +321,7 @@ v3d_bin_job_timedout(struct drm_sched_job *sched_job) > &job->timedout_ctca, &job->timedout_ctra); > } > > -static enum drm_task_status > +static enum drm_gpu_sched_stat > v3d_render_job_timedout(struct drm_sched_job *sched_job) > { > struct v3d_render_job *job = to_render_job(sched_job); > @@ -330,7 +330,7 @@ v3d_render_job_timedout(struct drm_sched_job *sched_job) > &job->timedout_ctca, &job->timedout_ctra); > } > > -static enum drm_task_status > +static enum drm_gpu_sched_stat > v3d_generic_job_timedout(struct drm_sched_job *sched_job) > { > struct v3d_job *job = to_v3d_job(sched_job); > @@ -338,7 +338,7 @@ v3d_generic_job_timedout(struct drm_sched_job *sched_job) > return v3d_gpu_reset_for_timeout(job->v3d, sched_job); > } > > -static enum drm_task_status > +static enum drm_gpu_sched_stat > v3d_csd_job_timedout(struct drm_sched_job *sched_job) > { > struct v3d_csd_job *job = to_csd_job(sched_job); > -- > 2.30.0 >
On 2021-02-03 5:36 a.m., Daniel Vetter wrote: > On Fri, Jan 29, 2021 at 04:54:39PM +0100, Patrik Jakobsson wrote: >> The commit a6a1f036c74e ("drm/scheduler: Job timeout handler returns >> status (v3)") incorrectly uses "enum drm_task_status" for v3d and causes >> a build failure. "enum drm_task_status" got changed into "enum >> drm_gpu_sched_status" in v3 of the patch but the change for v3d got >> lost. >> >> Fixes: ("drm/scheduler: Job timeout handler returns status (v3)") >> Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com> > > I think I r-b'ed such a patch already, but maybe not yet merged. I think Christian did that patch already on Monday. Regards, Luben > > Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> >> --- >> drivers/gpu/drm/v3d/v3d_sched.c | 12 ++++++------ >> 1 file changed, 6 insertions(+), 6 deletions(-) >> >> diff --git a/drivers/gpu/drm/v3d/v3d_sched.c b/drivers/gpu/drm/v3d/v3d_sched.c >> index ef2338a294ca..ceb33f8e4379 100644 >> --- a/drivers/gpu/drm/v3d/v3d_sched.c >> +++ b/drivers/gpu/drm/v3d/v3d_sched.c >> @@ -259,7 +259,7 @@ v3d_cache_clean_job_run(struct drm_sched_job *sched_job) >> return NULL; >> } >> >> -static enum drm_gpu_sched_status >> +static enum drm_gpu_sched_stat >> v3d_gpu_reset_for_timeout(struct v3d_dev *v3d, struct drm_sched_job *sched_job) >> { >> enum v3d_queue q; >> @@ -294,7 +294,7 @@ v3d_gpu_reset_for_timeout(struct v3d_dev *v3d, struct drm_sched_job *sched_job) >> * could fail if the GPU got in an infinite loop in the CL, but that >> * is pretty unlikely outside of an i-g-t testcase. >> */ >> -static enum drm_task_status >> +static enum drm_gpu_sched_stat >> v3d_cl_job_timedout(struct drm_sched_job *sched_job, enum v3d_queue q, >> u32 *timedout_ctca, u32 *timedout_ctra) >> { >> @@ -312,7 +312,7 @@ v3d_cl_job_timedout(struct drm_sched_job *sched_job, enum v3d_queue q, >> return v3d_gpu_reset_for_timeout(v3d, sched_job); >> } >> >> -static enum drm_task_status >> +static enum drm_gpu_sched_stat >> v3d_bin_job_timedout(struct drm_sched_job *sched_job) >> { >> struct v3d_bin_job *job = to_bin_job(sched_job); >> @@ -321,7 +321,7 @@ v3d_bin_job_timedout(struct drm_sched_job *sched_job) >> &job->timedout_ctca, &job->timedout_ctra); >> } >> >> -static enum drm_task_status >> +static enum drm_gpu_sched_stat >> v3d_render_job_timedout(struct drm_sched_job *sched_job) >> { >> struct v3d_render_job *job = to_render_job(sched_job); >> @@ -330,7 +330,7 @@ v3d_render_job_timedout(struct drm_sched_job *sched_job) >> &job->timedout_ctca, &job->timedout_ctra); >> } >> >> -static enum drm_task_status >> +static enum drm_gpu_sched_stat >> v3d_generic_job_timedout(struct drm_sched_job *sched_job) >> { >> struct v3d_job *job = to_v3d_job(sched_job); >> @@ -338,7 +338,7 @@ v3d_generic_job_timedout(struct drm_sched_job *sched_job) >> return v3d_gpu_reset_for_timeout(job->v3d, sched_job); >> } >> >> -static enum drm_task_status >> +static enum drm_gpu_sched_stat >> v3d_csd_job_timedout(struct drm_sched_job *sched_job) >> { >> struct v3d_csd_job *job = to_csd_job(sched_job); >> -- >> 2.30.0 >> >
Am 03.02.21 um 16:51 schrieb Luben Tuikov: > On 2021-02-03 5:36 a.m., Daniel Vetter wrote: >> On Fri, Jan 29, 2021 at 04:54:39PM +0100, Patrik Jakobsson wrote: >>> The commit a6a1f036c74e ("drm/scheduler: Job timeout handler returns >>> status (v3)") incorrectly uses "enum drm_task_status" for v3d and causes >>> a build failure. "enum drm_task_status" got changed into "enum >>> drm_gpu_sched_status" in v3 of the patch but the change for v3d got >>> lost. >>> >>> Fixes: ("drm/scheduler: Job timeout handler returns status (v3)") >>> Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com> >> I think I r-b'ed such a patch already, but maybe not yet merged. > I think Christian did that patch already on Monday. Yes, this is already inside drm-misc-next. Just needs to bubble up into linux-next etc... Regards, Christian. > > Regards, > Luben > > >> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> >>> --- >>> drivers/gpu/drm/v3d/v3d_sched.c | 12 ++++++------ >>> 1 file changed, 6 insertions(+), 6 deletions(-) >>> >>> diff --git a/drivers/gpu/drm/v3d/v3d_sched.c b/drivers/gpu/drm/v3d/v3d_sched.c >>> index ef2338a294ca..ceb33f8e4379 100644 >>> --- a/drivers/gpu/drm/v3d/v3d_sched.c >>> +++ b/drivers/gpu/drm/v3d/v3d_sched.c >>> @@ -259,7 +259,7 @@ v3d_cache_clean_job_run(struct drm_sched_job *sched_job) >>> return NULL; >>> } >>> >>> -static enum drm_gpu_sched_status >>> +static enum drm_gpu_sched_stat >>> v3d_gpu_reset_for_timeout(struct v3d_dev *v3d, struct drm_sched_job *sched_job) >>> { >>> enum v3d_queue q; >>> @@ -294,7 +294,7 @@ v3d_gpu_reset_for_timeout(struct v3d_dev *v3d, struct drm_sched_job *sched_job) >>> * could fail if the GPU got in an infinite loop in the CL, but that >>> * is pretty unlikely outside of an i-g-t testcase. >>> */ >>> -static enum drm_task_status >>> +static enum drm_gpu_sched_stat >>> v3d_cl_job_timedout(struct drm_sched_job *sched_job, enum v3d_queue q, >>> u32 *timedout_ctca, u32 *timedout_ctra) >>> { >>> @@ -312,7 +312,7 @@ v3d_cl_job_timedout(struct drm_sched_job *sched_job, enum v3d_queue q, >>> return v3d_gpu_reset_for_timeout(v3d, sched_job); >>> } >>> >>> -static enum drm_task_status >>> +static enum drm_gpu_sched_stat >>> v3d_bin_job_timedout(struct drm_sched_job *sched_job) >>> { >>> struct v3d_bin_job *job = to_bin_job(sched_job); >>> @@ -321,7 +321,7 @@ v3d_bin_job_timedout(struct drm_sched_job *sched_job) >>> &job->timedout_ctca, &job->timedout_ctra); >>> } >>> >>> -static enum drm_task_status >>> +static enum drm_gpu_sched_stat >>> v3d_render_job_timedout(struct drm_sched_job *sched_job) >>> { >>> struct v3d_render_job *job = to_render_job(sched_job); >>> @@ -330,7 +330,7 @@ v3d_render_job_timedout(struct drm_sched_job *sched_job) >>> &job->timedout_ctca, &job->timedout_ctra); >>> } >>> >>> -static enum drm_task_status >>> +static enum drm_gpu_sched_stat >>> v3d_generic_job_timedout(struct drm_sched_job *sched_job) >>> { >>> struct v3d_job *job = to_v3d_job(sched_job); >>> @@ -338,7 +338,7 @@ v3d_generic_job_timedout(struct drm_sched_job *sched_job) >>> return v3d_gpu_reset_for_timeout(job->v3d, sched_job); >>> } >>> >>> -static enum drm_task_status >>> +static enum drm_gpu_sched_stat >>> v3d_csd_job_timedout(struct drm_sched_job *sched_job) >>> { >>> struct v3d_csd_job *job = to_csd_job(sched_job); >>> -- >>> 2.30.0 >>>
On Wed, Feb 3, 2021 at 4:54 PM Christian König <christian.koenig@amd.com> wrote: > > Am 03.02.21 um 16:51 schrieb Luben Tuikov: > > On 2021-02-03 5:36 a.m., Daniel Vetter wrote: > >> On Fri, Jan 29, 2021 at 04:54:39PM +0100, Patrik Jakobsson wrote: > >>> The commit a6a1f036c74e ("drm/scheduler: Job timeout handler returns > >>> status (v3)") incorrectly uses "enum drm_task_status" for v3d and causes > >>> a build failure. "enum drm_task_status" got changed into "enum > >>> drm_gpu_sched_status" in v3 of the patch but the change for v3d got > >>> lost. > >>> > >>> Fixes: ("drm/scheduler: Job timeout handler returns status (v3)") > >>> Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com> > >> I think I r-b'ed such a patch already, but maybe not yet merged. > > I think Christian did that patch already on Monday. > > Yes, this is already inside drm-misc-next. Just needs to bubble up into > linux-next etc... Great, thanks! -Patrik
diff --git a/drivers/gpu/drm/v3d/v3d_sched.c b/drivers/gpu/drm/v3d/v3d_sched.c index ef2338a294ca..ceb33f8e4379 100644 --- a/drivers/gpu/drm/v3d/v3d_sched.c +++ b/drivers/gpu/drm/v3d/v3d_sched.c @@ -259,7 +259,7 @@ v3d_cache_clean_job_run(struct drm_sched_job *sched_job) return NULL; } -static enum drm_gpu_sched_status +static enum drm_gpu_sched_stat v3d_gpu_reset_for_timeout(struct v3d_dev *v3d, struct drm_sched_job *sched_job) { enum v3d_queue q; @@ -294,7 +294,7 @@ v3d_gpu_reset_for_timeout(struct v3d_dev *v3d, struct drm_sched_job *sched_job) * could fail if the GPU got in an infinite loop in the CL, but that * is pretty unlikely outside of an i-g-t testcase. */ -static enum drm_task_status +static enum drm_gpu_sched_stat v3d_cl_job_timedout(struct drm_sched_job *sched_job, enum v3d_queue q, u32 *timedout_ctca, u32 *timedout_ctra) { @@ -312,7 +312,7 @@ v3d_cl_job_timedout(struct drm_sched_job *sched_job, enum v3d_queue q, return v3d_gpu_reset_for_timeout(v3d, sched_job); } -static enum drm_task_status +static enum drm_gpu_sched_stat v3d_bin_job_timedout(struct drm_sched_job *sched_job) { struct v3d_bin_job *job = to_bin_job(sched_job); @@ -321,7 +321,7 @@ v3d_bin_job_timedout(struct drm_sched_job *sched_job) &job->timedout_ctca, &job->timedout_ctra); } -static enum drm_task_status +static enum drm_gpu_sched_stat v3d_render_job_timedout(struct drm_sched_job *sched_job) { struct v3d_render_job *job = to_render_job(sched_job); @@ -330,7 +330,7 @@ v3d_render_job_timedout(struct drm_sched_job *sched_job) &job->timedout_ctca, &job->timedout_ctra); } -static enum drm_task_status +static enum drm_gpu_sched_stat v3d_generic_job_timedout(struct drm_sched_job *sched_job) { struct v3d_job *job = to_v3d_job(sched_job); @@ -338,7 +338,7 @@ v3d_generic_job_timedout(struct drm_sched_job *sched_job) return v3d_gpu_reset_for_timeout(job->v3d, sched_job); } -static enum drm_task_status +static enum drm_gpu_sched_stat v3d_csd_job_timedout(struct drm_sched_job *sched_job) { struct v3d_csd_job *job = to_csd_job(sched_job);
The commit a6a1f036c74e ("drm/scheduler: Job timeout handler returns status (v3)") incorrectly uses "enum drm_task_status" for v3d and causes a build failure. "enum drm_task_status" got changed into "enum drm_gpu_sched_status" in v3 of the patch but the change for v3d got lost. Fixes: ("drm/scheduler: Job timeout handler returns status (v3)") Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com> --- drivers/gpu/drm/v3d/v3d_sched.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)