| Message ID | 20250331144352.736700-7-stefan.klug@ideasonboard.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series |
|
| Related | show |
Quoting Stefan Klug (2025-03-31 15:43:45) > When the rkisp1 driver of the running kernel supports less parameter > types than the libcamera build and such a parameter is used, queuing of > the parameter buffer fails with -EINVAL. For the time being we have no > way to query the kernel for supported parameter types at runtime. So at > least print a error message that points the user in that direction. > > Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com> > --- > src/libcamera/pipeline/rkisp1/rkisp1.cpp | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > > diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp > index 52633fe3cb85..132ab40fdbf7 100644 > --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp > +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp > @@ -409,7 +409,15 @@ void RkISP1CameraData::paramsComputed(unsigned int frame, unsigned int bytesused > return; > > info->paramBuffer->_d()->metadata().planes()[0].bytesused = bytesused; > - pipe->param_->queueBuffer(info->paramBuffer); > + > + int ret = pipe->param_->queueBuffer(info->paramBuffer); > + if (ret < 0) { > + LOG(RkISP1, Error) << "Failed to queue parameter buffer. " > + << "Maybe the kernel doesn't support the" > + << " required parameter types."; Can we report ret so we can know /what/ error it is incase it's not -EINVAL ? > + return; > + } > + > pipe->stat_->queueBuffer(info->statBuffer); > > if (info->mainPathBuffer) > -- > 2.43.0 >
diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index 52633fe3cb85..132ab40fdbf7 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp @@ -409,7 +409,15 @@ void RkISP1CameraData::paramsComputed(unsigned int frame, unsigned int bytesused return; info->paramBuffer->_d()->metadata().planes()[0].bytesused = bytesused; - pipe->param_->queueBuffer(info->paramBuffer); + + int ret = pipe->param_->queueBuffer(info->paramBuffer); + if (ret < 0) { + LOG(RkISP1, Error) << "Failed to queue parameter buffer. " + << "Maybe the kernel doesn't support the" + << " required parameter types."; + return; + } + pipe->stat_->queueBuffer(info->statBuffer); if (info->mainPathBuffer)
When the rkisp1 driver of the running kernel supports less parameter types than the libcamera build and such a parameter is used, queuing of the parameter buffer fails with -EINVAL. For the time being we have no way to query the kernel for supported parameter types at runtime. So at least print a error message that points the user in that direction. Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com> --- src/libcamera/pipeline/rkisp1/rkisp1.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)