| Message ID | 20210406182335.85847-3-nfraprado@collabora.com |
|---|---|
| State | Accepted |
| Commit | 63dd6a832722f801e93286f03428061dd0b16c00 |
| Headers | show |
| Series |
|
| Related | show |
Hi Nícolas, Thanks for your patch. On 2021-04-06 15:23:34 -0300, Nícolas F. R. A. Prado wrote: > Assert that there are no queued requests before clearing the frameInfo, > otherwise a SEGFAULT can occur. > > This issue happened while running lc-compliance. > > Suggested-by: Kieran Bingham <kieran.bingham@ideasonboard.com> > Signed-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> > --- > src/libcamera/pipeline/rkisp1/rkisp1.cpp | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp > index c122c9be2afd..3c8d9dfe6f87 100644 > --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp > +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp > @@ -842,6 +842,7 @@ void PipelineHandlerRkISP1::stop(Camera *camera) > LOG(RkISP1, Warning) > << "Failed to stop parameters for " << camera->id(); > > + ASSERT(data->queuedRequests_.empty()); > data->frameInfo_.clear(); > > freeBuffers(camera); > -- > 2.31.1 >
On 06/04/2021 19:23, Nícolas F. R. A. Prado wrote: > Assert that there are no queued requests before clearing the frameInfo, > otherwise a SEGFAULT can occur. > > This issue happened while running lc-compliance. > > Suggested-by: Kieran Bingham <kieran.bingham@ideasonboard.com> > Signed-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> > --- > src/libcamera/pipeline/rkisp1/rkisp1.cpp | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp > index c122c9be2afd..3c8d9dfe6f87 100644 > --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp > +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp > @@ -842,6 +842,7 @@ void PipelineHandlerRkISP1::stop(Camera *camera) > LOG(RkISP1, Warning) > << "Failed to stop parameters for " << camera->id(); > > + ASSERT(data->queuedRequests_.empty()); > data->frameInfo_.clear(); > > freeBuffers(camera); >
diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index c122c9be2afd..3c8d9dfe6f87 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp @@ -842,6 +842,7 @@ void PipelineHandlerRkISP1::stop(Camera *camera) LOG(RkISP1, Warning) << "Failed to stop parameters for " << camera->id(); + ASSERT(data->queuedRequests_.empty()); data->frameInfo_.clear(); freeBuffers(camera);
Assert that there are no queued requests before clearing the frameInfo, otherwise a SEGFAULT can occur. This issue happened while running lc-compliance. Suggested-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Signed-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com> --- src/libcamera/pipeline/rkisp1/rkisp1.cpp | 1 + 1 file changed, 1 insertion(+)