NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

ipa: rkisp1: Fail on init if hw revision is not RKISP1_V10

Browse source 
In kernel 5.11 the rkisp1 uapi had changed to support different hardware
revisions. Currently only revision 10 is supported by the rkisp1 IPA and
therefore 'init' should fail if the revision is not 10.

This changes depends on the kernel driver reporting the hardware
revision, and thus requires the rkisp1 driver from v5.11 or newer.

Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Dafna Hirschfeld 2021-03-09 07:38:29 +01:00 • committed by Laurent Pinchart
parent f4fe8cf588
commit e32d33b11d
3 changed files with 30 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/ipa/rkisp1/rkisp1.cpp
View file

@ -31,10 +31,7 @@ LOG_DEFINE_CATEGORY(IPARkISP1)
class IPARkISP1 : public ipa::rkisp1::IPARkISP1Interface
{
public:
int init([[maybe_unused]] const IPASettings &settings) override
{
return 0;
}
int init(unsigned int hwRevision) override;
int start() override { return 0; }
void stop() override {}
@ -69,6 +66,20 @@ private:
uint32_t maxGain_;
};
int IPARkISP1::init(unsigned int hwRevision)
{
/* \todo Add support for other revisions */
if (hwRevision != RKISP1_V10) {
LOG(IPARkISP1, Error)
<< "Hardware revision " << hwRevision
<< " is currently not supported";
return -ENODEV;
}
LOG(IPARkISP1, Debug) << "Hardware revision is " << hwRevision;
return 0;
}
/**
* \todo The RkISP1 pipeline currently provides an empty CameraSensorInfo
* if the connected sensor does not provide enough information to properly