drm/writeback: Delete drm_writeback_cleanup_job
diff mbox series

Message ID 20190220232401.15257-1-daniel.vetter@ffwll.ch
State New
Headers show
Series
  • drm/writeback: Delete drm_writeback_cleanup_job
Related show

Commit Message

Daniel Vetter Feb. 20, 2019, 11:24 p.m. UTC
No implementation, no callers.

Cc: Brian Starkey <brian.starkey@arm.com>
Cc: Liviu Dudau <liviu.dudau@arm.com>
Cc: Eric Anholt <eric@anholt.net>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 include/drm/drm_writeback.h | 2 --
 1 file changed, 2 deletions(-)

Comments

Laurent Pinchart Feb. 21, 2019, 8:19 a.m. UTC | #1
Hi Daniel,

Thank you for the patch.

On Thu, Feb 21, 2019 at 12:24:01AM +0100, Daniel Vetter wrote:
> No implementation, no callers.

The issue here isn't that the function is declared, but that it's not
defined. Jobs are leaked when atomic commit fails (or when using test
commits). I'm working on a fix, please don't apply this patch in the
meantime.

> Cc: Brian Starkey <brian.starkey@arm.com>
> Cc: Liviu Dudau <liviu.dudau@arm.com>
> Cc: Eric Anholt <eric@anholt.net>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
>  include/drm/drm_writeback.h | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/include/drm/drm_writeback.h b/include/drm/drm_writeback.h
> index 23df9d463003..f34895f7fcb1 100644
> --- a/include/drm/drm_writeback.h
> +++ b/include/drm/drm_writeback.h
> @@ -125,8 +125,6 @@ int drm_writeback_connector_init(struct drm_device *dev,
>  void drm_writeback_queue_job(struct drm_writeback_connector *wb_connector,
>  			     struct drm_writeback_job *job);
>  
> -void drm_writeback_cleanup_job(struct drm_writeback_job *job);
> -
>  void
>  drm_writeback_signal_completion(struct drm_writeback_connector *wb_connector,
>  				int status);
Daniel Vetter Feb. 21, 2019, 9:30 a.m. UTC | #2
On Thu, Feb 21, 2019 at 9:19 AM Laurent Pinchart
<laurent.pinchart@ideasonboard.com> wrote:
> Hi Daniel,
>
> Thank you for the patch.
>
> On Thu, Feb 21, 2019 at 12:24:01AM +0100, Daniel Vetter wrote:
> > No implementation, no callers.
>
> The issue here isn't that the function is declared, but that it's not
> defined. Jobs are leaked when atomic commit fails (or when using test
> commits). I'm working on a fix, please don't apply this patch in the
> meantime.

Hm, can't I merge this one and give you a clean slate? Function in
header but nowhere else kinda upsets my ocd :-)
-Daniel

> > Cc: Brian Starkey <brian.starkey@arm.com>
> > Cc: Liviu Dudau <liviu.dudau@arm.com>
> > Cc: Eric Anholt <eric@anholt.net>
> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> > ---
> >  include/drm/drm_writeback.h | 2 --
> >  1 file changed, 2 deletions(-)
> >
> > diff --git a/include/drm/drm_writeback.h b/include/drm/drm_writeback.h
> > index 23df9d463003..f34895f7fcb1 100644
> > --- a/include/drm/drm_writeback.h
> > +++ b/include/drm/drm_writeback.h
> > @@ -125,8 +125,6 @@ int drm_writeback_connector_init(struct drm_device *dev,
> >  void drm_writeback_queue_job(struct drm_writeback_connector *wb_connector,
> >                            struct drm_writeback_job *job);
> >
> > -void drm_writeback_cleanup_job(struct drm_writeback_job *job);
> > -
> >  void
> >  drm_writeback_signal_completion(struct drm_writeback_connector *wb_connector,
> >                               int status);
>
> --
> Regards,
>
> Laurent Pinchart
Brian Starkey Feb. 21, 2019, 9:34 a.m. UTC | #3
On Thu, Feb 21, 2019 at 10:19:35AM +0200, Laurent Pinchart wrote:
> Hi Daniel,
> 
> Thank you for the patch.
> 
> On Thu, Feb 21, 2019 at 12:24:01AM +0100, Daniel Vetter wrote:
> > No implementation, no callers.
> 
> The issue here isn't that the function is declared, but that it's not
> defined. Jobs are leaked when atomic commit fails (or when using test
> commits). I'm working on a fix, please don't apply this patch in the
> meantime.

Yeah, looking at the series somehow the call to cleanup the writeback
job on failure looks like it got lost between v9 and v10. I saw a
patch internally, but looks like James didn't send it to the list yet.

@James, could you send out your patch which fixes the cleanup on
failure?

Thanks,
-Brian

> 
> > Cc: Brian Starkey <brian.starkey@arm.com>
> > Cc: Liviu Dudau <liviu.dudau@arm.com>
> > Cc: Eric Anholt <eric@anholt.net>
> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> > ---
> >  include/drm/drm_writeback.h | 2 --
> >  1 file changed, 2 deletions(-)
> > 
> > diff --git a/include/drm/drm_writeback.h b/include/drm/drm_writeback.h
> > index 23df9d463003..f34895f7fcb1 100644
> > --- a/include/drm/drm_writeback.h
> > +++ b/include/drm/drm_writeback.h
> > @@ -125,8 +125,6 @@ int drm_writeback_connector_init(struct drm_device *dev,
> >  void drm_writeback_queue_job(struct drm_writeback_connector *wb_connector,
> >  			     struct drm_writeback_job *job);
> >  
> > -void drm_writeback_cleanup_job(struct drm_writeback_job *job);
> > -
> >  void
> >  drm_writeback_signal_completion(struct drm_writeback_connector *wb_connector,
> >  				int status);
> 
> -- 
> Regards,
> 
> Laurent Pinchart
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
Laurent Pinchart Feb. 21, 2019, 10:36 a.m. UTC | #4
Hi Brian,

On Thu, Feb 21, 2019 at 09:34:10AM +0000, Brian Starkey wrote:
> On Thu, Feb 21, 2019 at 10:19:35AM +0200, Laurent Pinchart wrote:
> > Hi Daniel,
> > 
> > Thank you for the patch.
> > 
> > On Thu, Feb 21, 2019 at 12:24:01AM +0100, Daniel Vetter wrote:
> >> No implementation, no callers.
> > 
> > The issue here isn't that the function is declared, but that it's not
> > defined. Jobs are leaked when atomic commit fails (or when using test
> > commits). I'm working on a fix, please don't apply this patch in the
> > meantime.
> 
> Yeah, looking at the series somehow the call to cleanup the writeback
> job on failure looks like it got lost between v9 and v10. I saw a
> patch internally, but looks like James didn't send it to the list yet.
> 
> @James, could you send out your patch which fixes the cleanup on
> failure?

I've just posted

[PATCH v5 12/19] drm: writeback: Cleanup job ownership handling when queuing job
[PATCH v5 13/19] drm: writeback: Fix leak of writeback job

that should address this issue. The series also includes the RFC-like

[PATCH v5 14/19] drm: writeback: Add job prepare and cleanup operations

that addresses a separate issue with writeback support.

> >> Cc: Brian Starkey <brian.starkey@arm.com>
> >> Cc: Liviu Dudau <liviu.dudau@arm.com>
> >> Cc: Eric Anholt <eric@anholt.net>
> >> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> >> ---
> >>  include/drm/drm_writeback.h | 2 --
> >>  1 file changed, 2 deletions(-)
> >> 
> >> diff --git a/include/drm/drm_writeback.h b/include/drm/drm_writeback.h
> >> index 23df9d463003..f34895f7fcb1 100644
> >> --- a/include/drm/drm_writeback.h
> >> +++ b/include/drm/drm_writeback.h
> >> @@ -125,8 +125,6 @@ int drm_writeback_connector_init(struct drm_device *dev,
> >>  void drm_writeback_queue_job(struct drm_writeback_connector *wb_connector,
> >>  			     struct drm_writeback_job *job);
> >>  
> >> -void drm_writeback_cleanup_job(struct drm_writeback_job *job);
> >> -
> >>  void
> >>  drm_writeback_signal_completion(struct drm_writeback_connector *wb_connector,
> >>  				int status);
Laurent Pinchart Feb. 21, 2019, 10:36 a.m. UTC | #5
Hi Daniel,

On Thu, Feb 21, 2019 at 10:30:24AM +0100, Daniel Vetter wrote:
> On Thu, Feb 21, 2019 at 9:19 AM Laurent Pinchart
> <laurent.pinchart@ideasonboard.com> wrote:
> > Hi Daniel,
> >
> > Thank you for the patch.
> >
> > On Thu, Feb 21, 2019 at 12:24:01AM +0100, Daniel Vetter wrote:
> >> No implementation, no callers.
> >
> > The issue here isn't that the function is declared, but that it's not
> > defined. Jobs are leaked when atomic commit fails (or when using test
> > commits). I'm working on a fix, please don't apply this patch in the
> > meantime.
> 
> Hm, can't I merge this one and give you a clean slate? Function in
> header but nowhere else kinda upsets my ocd :-)

I'm afraid I've already posted the fix patches that depend on this
prototype :-)

> >> Cc: Brian Starkey <brian.starkey@arm.com>
> >> Cc: Liviu Dudau <liviu.dudau@arm.com>
> >> Cc: Eric Anholt <eric@anholt.net>
> >> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> >> ---
> >>  include/drm/drm_writeback.h | 2 --
> >>  1 file changed, 2 deletions(-)
> >>
> >> diff --git a/include/drm/drm_writeback.h b/include/drm/drm_writeback.h
> >> index 23df9d463003..f34895f7fcb1 100644
> >> --- a/include/drm/drm_writeback.h
> >> +++ b/include/drm/drm_writeback.h
> >> @@ -125,8 +125,6 @@ int drm_writeback_connector_init(struct drm_device *dev,
> >>  void drm_writeback_queue_job(struct drm_writeback_connector *wb_connector,
> >>                            struct drm_writeback_job *job);
> >>
> >> -void drm_writeback_cleanup_job(struct drm_writeback_job *job);
> >> -
> >>  void
> >>  drm_writeback_signal_completion(struct drm_writeback_connector *wb_connector,
> >>                               int status);

Patch
diff mbox series

diff --git a/include/drm/drm_writeback.h b/include/drm/drm_writeback.h
index 23df9d463003..f34895f7fcb1 100644
--- a/include/drm/drm_writeback.h
+++ b/include/drm/drm_writeback.h
@@ -125,8 +125,6 @@  int drm_writeback_connector_init(struct drm_device *dev,
 void drm_writeback_queue_job(struct drm_writeback_connector *wb_connector,
 			     struct drm_writeback_job *job);
 
-void drm_writeback_cleanup_job(struct drm_writeback_job *job);
-
 void
 drm_writeback_signal_completion(struct drm_writeback_connector *wb_connector,
 				int status);