* Re: [RFC v2 01/10] exynos5-fimc-is: Add Exynos5 FIMC-IS device tree bindings documentation [not found] ` <1370005408-10853-2-git-send-email-arun.kk@samsung.com> @ 2013-06-20 22:45 ` Sylwester Nawrocki 2013-07-09 11:08 ` Arun Kumar K 0 siblings, 1 reply; 15+ messages in thread From: Sylwester Nawrocki @ 2013-06-20 22:45 UTC (permalink / raw) To: Arun Kumar K Cc: linux-media, s.nawrocki, kilyeon.im, shaik.ameer, arunkk.samsung, linux-samsung-soc Hi Arun, On 05/31/2013 03:03 PM, Arun Kumar K wrote: Please add at least one sentence here. All in all this patch adds DT binding documentation for a fairly complex subsystem. And please Cc devicetree-discuss@lists.ozlabs.org next time. > Signed-off-by: Arun Kumar K<arun.kk@samsung.com> > --- > .../devicetree/bindings/media/exynos5-fimc-is.txt | 41 ++++++++++++++++++++ > 1 file changed, 41 insertions(+) > create mode 100644 Documentation/devicetree/bindings/media/exynos5-fimc-is.txt > > diff --git a/Documentation/devicetree/bindings/media/exynos5-fimc-is.txt b/Documentation/devicetree/bindings/media/exynos5-fimc-is.txt > new file mode 100644 > index 0000000..9fd4646 > --- /dev/null > +++ b/Documentation/devicetree/bindings/media/exynos5-fimc-is.txt > @@ -0,0 +1,41 @@ > +Samsung EXYNOS SoC Camera Subsystem Shouldn't it be, e.g.: Samsung EXYNOS5 SoC series Imaging Subsystem (FIMC-IS) Or do you intend this file to be describing also the other sub-devices, like GScaler ? > +----------------------------------- > + > +The camera subsystem on Samsung Exynos5 SoC has some changes relative > +to previous SoC versions. Exynos5 has almost similar MIPI-CSIS and > +FIMC-LITE IPs but has a much improved version of FIMC-IS which can > +handle sensor controls and camera post-processing operations. The > +Exynos5 FIMC-IS has a dedicated ARM Cortex A5 processor, many > +post-processing blocks (ISP, DRC, FD, ODC, DIS, 3DNR) and two > +dedicated scalers (SCC and SCP). > + > +fimc-is node > +------------ > + > +Required properties: > + > +- compatible : must be "samsung,exynos5250-fimc-is" > +- reg : physical base address and size of the memory mapped > + registers > +- interrupt-parent : Parent interrupt controller > +- interrupts : fimc-is interrupt to the parent combiner > +- clocks : list of clock specifiers, corresponding to entries in > + clock-names property; > +- clock-names : must contain "isp", "mcu_isp", "isp_div0", "isp_div1", > + "isp_divmpwm", "mcu_isp_div0", "mcu_isp_div1" entries, > + matching entries in the clocks property. > + > + > +Board specific properties: > + > +- pinctrl-names : pinctrl names for camera port pinmux control, at least > + "default" needs to be specified. > +- pinctrl-0...N : pinctrl properties corresponding to pinctrl-names What pins exactly are supposed to be covered by these properties ? For what devices ? Aren't the camera port pins supposed to be specified at the common 'camera' node ? I believe the camera ports are not specific to the FIMC-IS. > +pmu subnode > +----------- > + > +Required properties: > + - reg : should contain PMU physical base address and size of the memory > + mapped registers. What about other devices, like ISP I2C, SPI ? Don't you want to list at least the ones currently used (I2C bus controllers) ? Regards, Sylwester ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [RFC v2 01/10] exynos5-fimc-is: Add Exynos5 FIMC-IS device tree bindings documentation 2013-06-20 22:45 ` [RFC v2 01/10] exynos5-fimc-is: Add Exynos5 FIMC-IS device tree bindings documentation Sylwester Nawrocki @ 2013-07-09 11:08 ` Arun Kumar K 2013-07-16 21:23 ` Sylwester Nawrocki 0 siblings, 1 reply; 15+ messages in thread From: Arun Kumar K @ 2013-07-09 11:08 UTC (permalink / raw) To: Sylwester Nawrocki Cc: Arun Kumar K, LMML, Sylwester Nawrocki, kilyeon.im, shaik.ameer, linux-samsung-soc Hi Sylwester, Thank you for the review and sorry for the delayed response. On Fri, Jun 21, 2013 at 4:15 AM, Sylwester Nawrocki <sylvester.nawrocki@gmail.com> wrote: > Hi Arun, > > On 05/31/2013 03:03 PM, Arun Kumar K wrote: > > Please add at least one sentence here. All in all this patch > adds DT binding documentation for a fairly complex subsystem. > > And please Cc devicetree-discuss@lists.ozlabs.org next time. > Ok will do that. > >> Signed-off-by: Arun Kumar K<arun.kk@samsung.com> >> --- >> .../devicetree/bindings/media/exynos5-fimc-is.txt | 41 >> ++++++++++++++++++++ >> 1 file changed, 41 insertions(+) >> create mode 100644 >> Documentation/devicetree/bindings/media/exynos5-fimc-is.txt >> >> diff --git a/Documentation/devicetree/bindings/media/exynos5-fimc-is.txt >> b/Documentation/devicetree/bindings/media/exynos5-fimc-is.txt >> new file mode 100644 >> index 0000000..9fd4646 >> --- /dev/null >> +++ b/Documentation/devicetree/bindings/media/exynos5-fimc-is.txt >> @@ -0,0 +1,41 @@ >> +Samsung EXYNOS SoC Camera Subsystem > > > Shouldn't it be, e.g.: > > Samsung EXYNOS5 SoC series Imaging Subsystem (FIMC-IS) > > Or do you intend this file to be describing also the other sub-devices, > like GScaler ? > Probably not. WIll change it to Imaging subsystem. > >> +----------------------------------- >> + >> +The camera subsystem on Samsung Exynos5 SoC has some changes relative >> +to previous SoC versions. Exynos5 has almost similar MIPI-CSIS and >> +FIMC-LITE IPs but has a much improved version of FIMC-IS which can >> +handle sensor controls and camera post-processing operations. The >> +Exynos5 FIMC-IS has a dedicated ARM Cortex A5 processor, many >> +post-processing blocks (ISP, DRC, FD, ODC, DIS, 3DNR) and two >> +dedicated scalers (SCC and SCP). >> + >> +fimc-is node >> +------------ >> + >> +Required properties: >> + >> +- compatible : must be "samsung,exynos5250-fimc-is" >> +- reg : physical base address and size of the memory mapped >> + registers >> +- interrupt-parent : Parent interrupt controller >> +- interrupts : fimc-is interrupt to the parent combiner >> +- clocks : list of clock specifiers, corresponding to entries >> in >> + clock-names property; >> +- clock-names : must contain "isp", "mcu_isp", "isp_div0", >> "isp_div1", >> + "isp_divmpwm", "mcu_isp_div0", "mcu_isp_div1" >> entries, >> + matching entries in the clocks property. >> + >> + >> +Board specific properties: >> + >> +- pinctrl-names : pinctrl names for camera port pinmux control, at >> least >> + "default" needs to be specified. >> +- pinctrl-0...N : pinctrl properties corresponding to >> pinctrl-names > > > What pins exactly are supposed to be covered by these properties ? For what > devices ? Aren't the camera port pins supposed to be specified at the common > 'camera' node ? I believe the camera ports are not specific to the FIMC-IS. > These are for the sensor controls (especially clock lines). I think I should move these to the sensor node. > >> +pmu subnode >> +----------- >> + >> +Required properties: >> + - reg : should contain PMU physical base address and size of the memory >> + mapped registers. > > > What about other devices, like ISP I2C, SPI ? Don't you want to list at > least > the ones currently used (I2C bus controllers) ? > The present driver doesnt make use of the SPI bus as its used only for sensor calibration which is not yet added. I2C bus is used by the sensor which has its own node. May be I should explain one of the sensor nodes over here? Regards Arun ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [RFC v2 01/10] exynos5-fimc-is: Add Exynos5 FIMC-IS device tree bindings documentation 2013-07-09 11:08 ` Arun Kumar K @ 2013-07-16 21:23 ` Sylwester Nawrocki 2013-07-17 4:42 ` Arun Kumar K 0 siblings, 1 reply; 15+ messages in thread From: Sylwester Nawrocki @ 2013-07-16 21:23 UTC (permalink / raw) To: Arun Kumar K Cc: Sylwester Nawrocki, Arun Kumar K, LMML, Sylwester Nawrocki, kilyeon.im, shaik.ameer, linux-samsung-soc Hi Arun, On 07/09/2013 01:08 PM, Arun Kumar K wrote: > On Fri, Jun 21, 2013 at 4:15 AM, Sylwester Nawrocki > <sylvester.nawrocki@gmail.com> wrote: >> On 05/31/2013 03:03 PM, Arun Kumar K wrote: [...] >>> Signed-off-by: Arun Kumar K<arun.kk@samsung.com> >>> --- >>> .../devicetree/bindings/media/exynos5-fimc-is.txt | 41 >>> ++++++++++++++++++++ >>> 1 file changed, 41 insertions(+) >>> create mode 100644 >>> Documentation/devicetree/bindings/media/exynos5-fimc-is.txt >>> >>> diff --git a/Documentation/devicetree/bindings/media/exynos5-fimc-is.txt >>> b/Documentation/devicetree/bindings/media/exynos5-fimc-is.txt >>> new file mode 100644 >>> index 0000000..9fd4646 >>> --- /dev/null >>> +++ b/Documentation/devicetree/bindings/media/exynos5-fimc-is.txt >>> @@ -0,0 +1,41 @@ [...] >>> +----------------------------------- >>> + >>> +The camera subsystem on Samsung Exynos5 SoC has some changes relative >>> +to previous SoC versions. Exynos5 has almost similar MIPI-CSIS and >>> +FIMC-LITE IPs but has a much improved version of FIMC-IS which can >>> +handle sensor controls and camera post-processing operations. The >>> +Exynos5 FIMC-IS has a dedicated ARM Cortex A5 processor, many >>> +post-processing blocks (ISP, DRC, FD, ODC, DIS, 3DNR) and two >>> +dedicated scalers (SCC and SCP). >>> + >>> +fimc-is node >>> +------------ >>> + >>> +Required properties: >>> + >>> +- compatible : must be "samsung,exynos5250-fimc-is" >>> +- reg : physical base address and size of the memory mapped >>> + registers >>> +- interrupt-parent : Parent interrupt controller >>> +- interrupts : fimc-is interrupt to the parent combiner >>> +- clocks : list of clock specifiers, corresponding to entries >>> in >>> + clock-names property; >>> +- clock-names : must contain "isp", "mcu_isp", "isp_div0", >>> "isp_div1", >>> + "isp_divmpwm", "mcu_isp_div0", "mcu_isp_div1" >>> entries, >>> + matching entries in the clocks property. >>> + >>> + >>> +Board specific properties: >>> + >>> +- pinctrl-names : pinctrl names for camera port pinmux control, at >>> least >>> + "default" needs to be specified. >>> +- pinctrl-0...N : pinctrl properties corresponding to >>> pinctrl-names >> >> >> What pins exactly are supposed to be covered by these properties ? For what >> devices ? Aren't the camera port pins supposed to be specified at the common >> 'camera' node ? I believe the camera ports are not specific to the FIMC-IS. > > These are for the sensor controls (especially clock lines). > I think I should move these to the sensor node. This doesn't sound right either. These pins are not a property of an external image sensor device, they are specific to the AP SoC. So IMO these pinctrl properties belong to some SoC's internal device node. I think we could add a clock provider for the sclk_cam clocks and then the pinmux of those clock outputs could be configurable from with the clock ops. E.g. we set the pinumx into CAM_?_CLKOUT function only when a clock is enabled. Disabling a clock would put CLKOUT pin pinmux e.g. into input with pull down state. This would ensure proper CLKOUT pin configuration when image sensor is suspended or entirely powered off. I'm working on something like this for exynos4. >>> +pmu subnode >>> +----------- >>> + >>> +Required properties: >>> + - reg : should contain PMU physical base address and size of the memory >>> + mapped registers. >> >> >> What about other devices, like ISP I2C, SPI ? Don't you want to list at >> least >> the ones currently used (I2C bus controllers) ? >> > > The present driver doesnt make use of the SPI bus as its used only > for sensor calibration which is not yet added. Is it only going to be used by the Cortex-A5 firmware, similarly to the I2C bus ? If so then it is likely not needed to specify it here right now. But I believe for complete H/W description we should reserve a possibility to add those various peripheral device nodes here. > I2C bus is used by the sensor which has its own node. May be I should > explain one of the sensor nodes over here? I would describe at least I2C bus controller node and add a note that image sensor nodes can be specified there. Also, it would be good to start adding separate sensor drivers for each sensor, like s5k6a3, s5k4e3, etc. Ideally we should not have duplicated fimc-is-sensor.[ch] that would handle various sensors, i.e. same set of sensors to drivers/media/platform/exynos4-is and drivers/media/platform/ exynos5-is. After you post the next iteration of this series I could have a look how it could be done. -- Thanks, Sylwester ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [RFC v2 01/10] exynos5-fimc-is: Add Exynos5 FIMC-IS device tree bindings documentation 2013-07-16 21:23 ` Sylwester Nawrocki @ 2013-07-17 4:42 ` Arun Kumar K 0 siblings, 0 replies; 15+ messages in thread From: Arun Kumar K @ 2013-07-17 4:42 UTC (permalink / raw) To: Sylwester Nawrocki Cc: LMML, Sylwester Nawrocki, kilyeon.im, shaik.ameer, linux-samsung-soc Hi Sylwester, On Wed, Jul 17, 2013 at 2:53 AM, Sylwester Nawrocki <sylvester.nawrocki@gmail.com> wrote: > Hi Arun, > > > On 07/09/2013 01:08 PM, Arun Kumar K wrote: >> >> On Fri, Jun 21, 2013 at 4:15 AM, Sylwester Nawrocki >> <sylvester.nawrocki@gmail.com> wrote: >>> >>> On 05/31/2013 03:03 PM, Arun Kumar K wrote: > > [...] > >>>> Signed-off-by: Arun Kumar K<arun.kk@samsung.com> >>>> --- >>>> .../devicetree/bindings/media/exynos5-fimc-is.txt | 41 >>>> ++++++++++++++++++++ >>>> 1 file changed, 41 insertions(+) >>>> create mode 100644 >>>> Documentation/devicetree/bindings/media/exynos5-fimc-is.txt >>>> >>>> diff --git a/Documentation/devicetree/bindings/media/exynos5-fimc-is.txt >>>> b/Documentation/devicetree/bindings/media/exynos5-fimc-is.txt >>>> new file mode 100644 >>>> index 0000000..9fd4646 >>>> --- /dev/null >>>> +++ b/Documentation/devicetree/bindings/media/exynos5-fimc-is.txt >>>> @@ -0,0 +1,41 @@ > > [...] > >>>> +----------------------------------- >>>> + >>>> +The camera subsystem on Samsung Exynos5 SoC has some changes relative >>>> +to previous SoC versions. Exynos5 has almost similar MIPI-CSIS and >>>> +FIMC-LITE IPs but has a much improved version of FIMC-IS which can >>>> +handle sensor controls and camera post-processing operations. The >>>> +Exynos5 FIMC-IS has a dedicated ARM Cortex A5 processor, many >>>> +post-processing blocks (ISP, DRC, FD, ODC, DIS, 3DNR) and two >>>> +dedicated scalers (SCC and SCP). >>>> + >>>> +fimc-is node >>>> +------------ >>>> + >>>> +Required properties: >>>> + >>>> +- compatible : must be "samsung,exynos5250-fimc-is" >>>> +- reg : physical base address and size of the memory >>>> mapped >>>> + registers >>>> +- interrupt-parent : Parent interrupt controller >>>> +- interrupts : fimc-is interrupt to the parent combiner >>>> +- clocks : list of clock specifiers, corresponding to >>>> entries >>>> in >>>> + clock-names property; >>>> +- clock-names : must contain "isp", "mcu_isp", "isp_div0", >>>> "isp_div1", >>>> + "isp_divmpwm", "mcu_isp_div0", "mcu_isp_div1" >>>> entries, >>>> + matching entries in the clocks property. >>>> + >>>> + >>>> +Board specific properties: >>>> + >>>> +- pinctrl-names : pinctrl names for camera port pinmux control, at >>>> least >>>> + "default" needs to be specified. >>>> +- pinctrl-0...N : pinctrl properties corresponding to >>>> pinctrl-names >>> >>> >>> >>> What pins exactly are supposed to be covered by these properties ? For >>> what >>> devices ? Aren't the camera port pins supposed to be specified at the >>> common >>> 'camera' node ? I believe the camera ports are not specific to the >>> FIMC-IS. >> >> >> These are for the sensor controls (especially clock lines). >> I think I should move these to the sensor node. > > > This doesn't sound right either. These pins are not a property of an > external > image sensor device, they are specific to the AP SoC. So IMO these pinctrl > properties belong to some SoC's internal device node. > Ok. Time being I will move it to the camera node pinctrl properties. > I think we could add a clock provider for the sclk_cam clocks and then the > pinmux of those clock outputs could be configurable from with the clock ops. > E.g. we set the pinumx into CAM_?_CLKOUT function only when a clock is > enabled. > Disabling a clock would put CLKOUT pin pinmux e.g. into input with pull down > state. This would ensure proper CLKOUT pin configuration when image sensor > is > suspended or entirely powered off. I'm working on something like this for > exynos4. > Ok that would be great. I will refer your exynos4 implementation for doing this. > >>>> +pmu subnode >>>> +----------- >>>> + >>>> +Required properties: >>>> + - reg : should contain PMU physical base address and size of the >>>> memory >>>> + mapped registers. >>> >>> >>> >>> What about other devices, like ISP I2C, SPI ? Don't you want to list at >>> least >>> the ones currently used (I2C bus controllers) ? >>> >> >> The present driver doesnt make use of the SPI bus as its used only >> for sensor calibration which is not yet added. > > > Is it only going to be used by the Cortex-A5 firmware, similarly to the > I2C bus ? If so then it is likely not needed to specify it here right now. > But I believe for complete H/W description we should reserve a possibility > to add those various peripheral device nodes here. > Yes its going to be used by the firmware and is done for sensor calibration. The sensor works well even without it and so I didnt include it in my initial patchset and kept it as a todo. > >> I2C bus is used by the sensor which has its own node. May be I should >> explain one of the sensor nodes over here? > > > I would describe at least I2C bus controller node and add a note that image > sensor nodes can be specified there. > I havent created a dummy i2c device driver for handling the i2c clock part and everything was handled in the fimc-is-sensor itself. I was checking your exynos4 implementation and will try to do in similar lines. > Also, it would be good to start adding separate sensor drivers for each > sensor, like s5k6a3, s5k4e3, etc. Ideally we should not have duplicated > fimc-is-sensor.[ch] that would handle various sensors, i.e. same set of > sensors to drivers/media/platform/exynos4-is and drivers/media/platform/ > exynos5-is. > Yes I hope it can be re-used. > After you post the next iteration of this series I could have a look how > it could be done. > Ok thanks. Regards Arun ^ permalink raw reply [flat|nested] 15+ messages in thread
[parent not found: <1370005408-10853-4-git-send-email-arun.kk@samsung.com>]
* Re: [RFC v2 03/10] exynos5-fimc-is: Adds common driver header files [not found] ` <1370005408-10853-4-git-send-email-arun.kk@samsung.com> @ 2013-06-20 22:46 ` Sylwester Nawrocki 2013-06-21 7:14 ` Arun Kumar K 2013-07-09 11:20 ` Arun Kumar K 0 siblings, 2 replies; 15+ messages in thread From: Sylwester Nawrocki @ 2013-06-20 22:46 UTC (permalink / raw) To: Arun Kumar K Cc: linux-media, s.nawrocki, kilyeon.im, shaik.ameer, arunkk.samsung, linux-samsung-soc On 05/31/2013 03:03 PM, Arun Kumar K wrote: > This patch adds all the common header files used by the fimc-is > driver. It includes the commands for interfacing with the firmware > and error codes from IS firmware, metadata and command parameter > definitions. > > Signed-off-by: Arun Kumar K<arun.kk@samsung.com> > Signed-off-by: Kilyeon Im<kilyeon.im@samsung.com> > --- > drivers/media/platform/exynos5-is/fimc-is-cmd.h | 201 ++++ > drivers/media/platform/exynos5-is/fimc-is-err.h | 261 ++++ > .../media/platform/exynos5-is/fimc-is-metadata.h | 771 ++++++++++++ > drivers/media/platform/exynos5-is/fimc-is-param.h | 1259 ++++++++++++++++++++ > 4 files changed, 2492 insertions(+) > create mode 100644 drivers/media/platform/exynos5-is/fimc-is-cmd.h > create mode 100644 drivers/media/platform/exynos5-is/fimc-is-err.h > create mode 100644 drivers/media/platform/exynos5-is/fimc-is-metadata.h > create mode 100644 drivers/media/platform/exynos5-is/fimc-is-param.h > > diff --git a/drivers/media/platform/exynos5-is/fimc-is-cmd.h b/drivers/media/platform/exynos5-is/fimc-is-cmd.h > new file mode 100644 > index 0000000..4adf832 > --- /dev/null > +++ b/drivers/media/platform/exynos5-is/fimc-is-cmd.h > @@ -0,0 +1,201 @@ > +/* > + * Samsung Exynos5 SoC series FIMC-IS driver > + * > + * Copyright (c) 2013 Samsung Electronics Co., Ltd > + * Kil-yeon Lim<kilyeon.im@samsung.com> > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 as > + * published by the Free Software Foundation. > + */ > + > +#ifndef FIMC_IS_CMD_H > +#define FIMC_IS_CMD_H > + > +#define IS_COMMAND_VER 122 /* IS COMMAND VERSION 1.22 */ > + > +enum is_cmd { > + /* HOST -> IS */ > + HIC_PREVIEW_STILL = 0x1, > + HIC_PREVIEW_VIDEO, > + HIC_CAPTURE_STILL, > + HIC_CAPTURE_VIDEO, > + HIC_PROCESS_START, > + HIC_PROCESS_STOP, > + HIC_STREAM_ON, > + HIC_STREAM_OFF, > + HIC_SHOT, > + HIC_GET_STATIC_METADATA, > + HIC_SET_CAM_CONTROL, > + HIC_GET_CAM_CONTROL, > + HIC_SET_PARAMETER, > + HIC_GET_PARAMETER, > + HIC_SET_A5_MEM_ACCESS, > + RESERVED2, > + HIC_GET_STATUS, > + /* SENSOR PART*/ > + HIC_OPEN_SENSOR, > + HIC_CLOSE_SENSOR, > + HIC_SIMMIAN_INIT, > + HIC_SIMMIAN_WRITE, > + HIC_SIMMIAN_READ, > + HIC_POWER_DOWN, > + HIC_GET_SET_FILE_ADDR, > + HIC_LOAD_SET_FILE, > + HIC_MSG_CONFIG, > + HIC_MSG_TEST, > + /* IS -> HOST */ > + IHC_GET_SENSOR_NUMBER = 0x1000, > + /* Parameter1 : Address of space to copy a setfile */ > + /* Parameter2 : Space szie */ > + IHC_SET_SHOT_MARK, > + /* PARAM1 : a frame number */ > + /* PARAM2 : confidence level(smile 0~100) */ > + /* PARMA3 : confidence level(blink 0~100) */ > + IHC_SET_FACE_MARK, > + /* PARAM1 : coordinate count */ > + /* PARAM2 : coordinate buffer address */ > + IHC_FRAME_DONE, > + /* PARAM1 : frame start number */ > + /* PARAM2 : frame count */ > + IHC_AA_DONE, > + IHC_NOT_READY, > + IHC_FLASH_READY > +}; > + > +enum is_reply { > + ISR_DONE = 0x2000, > + ISR_NDONE > +}; > + > +enum is_scenario_id { > + ISS_PREVIEW_STILL, > + ISS_PREVIEW_VIDEO, > + ISS_CAPTURE_STILL, > + ISS_CAPTURE_VIDEO, > + ISS_END > +}; > + > +enum is_subscenario_id { > + ISS_SUB_SCENARIO_STILL, > + ISS_SUB_SCENARIO_VIDEO, > + ISS_SUB_SCENARIO_SCENE1, > + ISS_SUB_SCENARIO_SCENE2, > + ISS_SUB_SCENARIO_SCENE3, > + ISS_SUB_END > +}; > + > +struct is_setfile_header_element { > + u32 binary_addr; > + u32 binary_size; > +}; > + > +struct is_setfile_header { > + struct is_setfile_header_element isp[ISS_END]; > + struct is_setfile_header_element drc[ISS_END]; > + struct is_setfile_header_element fd[ISS_END]; > +}; > + > +struct is_common_reg { > + u32 hicmd; > + u32 hic_sensorid; > + u32 hic_param1; > + u32 hic_param2; > + u32 hic_param3; > + u32 hic_param4; How about replacing the above 4 fields with u32 hic_param[4]; ? > + u32 reserved1[3]; > + > + u32 ihcmd_iflag; > + u32 ihcmd; > + u32 ihc_sensorid; > + u32 ihc_param1; > + u32 ihc_param2; > + u32 ihc_param3; > + u32 ihc_param4; Similarly, u32 ihc_param[4]; and for other groups of fields below ? > + > + u32 reserved2[3]; > + > + u32 isp_bayer_iflag; > + u32 isp_bayer_sensor_id; > + u32 isp_bayer_param1; > + u32 isp_bayer_param2; > + > + u32 reserved3[4]; > + > + u32 scc_iflag; > + u32 scc_sensor_id; > + u32 scc_param1; > + u32 scc_param2; > + u32 scc_param3; > + > + u32 reserved4[3]; > + > + u32 dnr_iflag; > + u32 dnr_sensor_id; > + u32 dnr_param1; > + u32 dnr_param2; > + > + u32 reserved5[4]; > + > + u32 scp_iflag; > + u32 scp_sensor_id; > + u32 scp_param1; > + u32 scp_param2; > + u32 scp_param3; > + > + u32 reserved6[1]; > + > + u32 isp_yuv_iflag; > + u32 isp_yuv_sensor_id; > + u32 isp_yuv_param1; > + u32 isp_yuv_param2; > + > + u32 reserved7[1]; > + > + u32 shot_iflag; > + u32 shot_sensor_id; > + u32 shot_param1; > + u32 shot_param2; > + > + u32 reserved8[1]; > + > + u32 meta_iflag; > + u32 meta_sensor_id; > + u32 meta_param1; > + > + u32 reserved9[1]; > + > + u32 fcount; > +}; > + > +struct is_mcuctl_reg { > + u32 mcuctl; > + u32 bboar; > + > + u32 intgr0; > + u32 intcr0; > + u32 intmr0; > + u32 intsr0; > + u32 intmsr0; > + > + u32 intgr1; > + u32 intcr1; > + u32 intmr1; > + u32 intsr1; > + u32 intmsr1; > + > + u32 intcr2; > + u32 intmr2; > + u32 intsr2; > + u32 intmsr2; > + > + u32 gpoctrl; > + u32 cpoenctlr; > + u32 gpictlr; > + > + u32 pad[0xD]; > + > + struct is_common_reg common_reg; > +}; > +#endif > diff --git a/drivers/media/platform/exynos5-is/fimc-is-err.h b/drivers/media/platform/exynos5-is/fimc-is-err.h > new file mode 100644 > index 0000000..49d7cf5 > --- /dev/null > +++ b/drivers/media/platform/exynos5-is/fimc-is-err.h > @@ -0,0 +1,261 @@ > +/* > + * Samsung Exynos5 SoC series FIMC-IS driver > + * > + * Copyright (c) 2013 Samsung Electronics Co., Ltd > + * Arun Kumar K<arun.kk@samsung.com> > + * Kil-yeon Lim<kilyeon.im@samsung.com> > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 as > + * published by the Free Software Foundation. > + */ > + > +#ifndef FIMC_IS_ERR_H > +#define FIMC_IS_ERR_H > + > +#define IS_ERROR_VER 012 /* IS ERROR VERSION 0.07 */ > + > +/* IS error enum */ > +enum is_error { > + > + IS_ERROR_SUCCESS = 0, > + > + /* General 1 ~ 100 */ > + IS_ERROR_INVALID_COMMAND = 1, > + IS_ERROR_REQUEST_FAIL, > + IS_ERROR_INVALID_SCENARIO, > + IS_ERROR_INVALID_SENSORID, > + IS_ERROR_INVALID_MODE_CHANGE, > + IS_ERROR_INVALID_MAGIC_NUMBER, > + IS_ERROR_INVALID_SETFILE_HDR, > + IS_ERROR_ISP_SETFILE_VERSION_MISMATCH, > + IS_ERROR_ISP_SETFILE_REVISION_MISMATCH, > + IS_ERROR_BUSY, > + IS_ERROR_SET_PARAMETER, > + IS_ERROR_INVALID_PATH, > + IS_ERROR_OPEN_SENSOR_FAIL, > + IS_ERROR_ENTRY_MSG_THREAD_DOWN, > + IS_ERROR_ISP_FRAME_END_NOT_DONE, > + IS_ERROR_DRC_FRAME_END_NOT_DONE, > + IS_ERROR_SCALERC_FRAME_END_NOT_DONE, > + IS_ERROR_ODC_FRAME_END_NOT_DONE, > + IS_ERROR_DIS_FRAME_END_NOT_DONE, > + IS_ERROR_TDNR_FRAME_END_NOT_DONE, > + IS_ERROR_SCALERP_FRAME_END_NOT_DONE, > + IS_ERROR_WAIT_STREAM_OFF_NOT_DONE, > + IS_ERROR_NO_MSG_IS_RECEIVED, > + IS_ERROR_SENSOR_MSG_FAIL, > + IS_ERROR_ISP_MSG_FAIL, > + IS_ERROR_DRC_MSG_FAIL, > + IS_ERROR_SCALERC_MSG_FAIL, > + IS_ERROR_ODC_MSG_FAIL, > + IS_ERROR_DIS_MSG_FAIL, > + IS_ERROR_TDNR_MSG_FAIL, > + IS_ERROR_SCALERP_MSG_FAIL, > + IS_ERROR_LHFD_MSG_FAIL, > + IS_ERROR_INTERNAL_STOP, > + IS_ERROR_UNKNOWN, > + IS_ERROR_TIME_OUT_FLAG, > + > + /* Sensor 100 ~ 200 */ > + IS_ERROR_SENSOR_PWRDN_FAIL = 100, > + IS_ERROR_SENSOR_STREAM_ON_FAIL, > + IS_ERROR_SENSOR_STREAM_OFF_FAIL, > + > + /* ISP 200 ~ 300 */ > + IS_ERROR_ISP_PWRDN_FAIL = 200, > + IS_ERROR_ISP_MULTIPLE_INPUT, > + IS_ERROR_ISP_ABSENT_INPUT, > + IS_ERROR_ISP_ABSENT_OUTPUT, > + IS_ERROR_ISP_NONADJACENT_OUTPUT, > + IS_ERROR_ISP_FORMAT_MISMATCH, > + IS_ERROR_ISP_WIDTH_MISMATCH, > + IS_ERROR_ISP_HEIGHT_MISMATCH, > + IS_ERROR_ISP_BITWIDTH_MISMATCH, > + IS_ERROR_ISP_FRAME_END_TIME_OUT, > + > + /* DRC 300 ~ 400 */ > + IS_ERROR_DRC_PWRDN_FAIL = 300, > + IS_ERROR_DRC_MULTIPLE_INPUT, > + IS_ERROR_DRC_ABSENT_INPUT, > + IS_ERROR_DRC_NONADJACENT_INTPUT, > + IS_ERROR_DRC_ABSENT_OUTPUT, > + IS_ERROR_DRC_NONADJACENT_OUTPUT, > + IS_ERROR_DRC_FORMAT_MISMATCH, > + IS_ERROR_DRC_WIDTH_MISMATCH, > + IS_ERROR_DRC_HEIGHT_MISMATCH, > + IS_ERROR_DRC_BITWIDTH_MISMATCH, > + IS_ERROR_DRC_FRAME_END_TIME_OUT, > + > + /*SCALERC(400~500)*/ > + IS_ERROR_SCALERC_PWRDN_FAIL = 400, > + > + /*ODC(500~600)*/ > + IS_ERROR_ODC_PWRDN_FAIL = 500, > + > + /*DIS(600~700)*/ > + IS_ERROR_DIS_PWRDN_FAIL = 600, > + > + /*TDNR(700~800)*/ > + IS_ERROR_TDNR_PWRDN_FAIL = 700, > + > + /*SCALERP(800~900)*/ > + IS_ERROR_SCALERP_PWRDN_FAIL = 800, > + > + /*FD(900~1000)*/ > + IS_ERROR_FD_PWRDN_FAIL = 900, > + IS_ERROR_FD_MULTIPLE_INPUT, > + IS_ERROR_FD_ABSENT_INPUT, > + IS_ERROR_FD_NONADJACENT_INPUT, > + IS_ERROR_LHFD_FRAME_END_TIME_OUT, > +}; > + > +/* Set parameter error enum */ > +enum error { > + /* Common error (0~99) */ > + ERROR_COMMON_NO = 0, How about renaming all those ERROR_*_NO symbols to ERROR_*_NONE ? > + ERROR_COMMON_CMD = 1, /* Invalid command*/ > + ERROR_COMMON_PARAMETER = 2, /* Invalid parameter*/ > + /* setfile is not loaded before adjusting */ > + ERROR_COMMON_SETFILE_LOAD = 3, > + /* setfile is not Adjusted before runnng. */ > + ERROR_COMMON_SETFILE_ADJUST = 4, > + /* index of setfile is not valid. */ > + ERROR_COMMON_SETFILE_INDEX = 5, > + /* Input path can be changed in ready state(stop) */ > + ERROR_COMMON_INPUT_PATH = 6, > + /* IP can not start if input path is not set */ > + ERROR_COMMON_INPUT_INIT = 7, > + /* Output path can be changed in ready state(stop) */ > + ERROR_COMMON_OUTPUT_PATH = 8, > + /* IP can not start if output path is not set */ > + ERROR_COMMON_OUTPUT_INIT = 9, > + > + ERROR_CONTROL_NO = ERROR_COMMON_NO, > + ERROR_CONTROL_BYPASS = 11, /* Enable or Disable */ > + ERROR_CONTROL_BUF = 12, /* invalid buffer info */ > + > + ERROR_OTF_INPUT_NO = ERROR_COMMON_NO, > + /* invalid command */ > + ERROR_OTF_INPUT_CMD = 21, > + /* invalid format (DRC: YUV444, FD: YUV444, 422, 420) */ > + ERROR_OTF_INPUT_FORMAT = 22, > + /* invalid width (DRC: 128~8192, FD: 32~8190) */ > + ERROR_OTF_INPUT_WIDTH = 23, > + /* invalid height (DRC: 64~8192, FD: 16~8190) */ > + ERROR_OTF_INPUT_HEIGHT = 24, > + /* invalid bit-width (DRC: 8~12bits, FD: 8bit) */ > + ERROR_OTF_INPUT_BIT_WIDTH = 25, > + /* invalid frame time for ISP */ > + ERROR_OTF_INPUT_USER_FRAMETILE = 26, > + > + ERROR_DMA_INPUT_NO = ERROR_COMMON_NO, > + /* invalid width (DRC: 128~8192, FD: 32~8190) */ > + ERROR_DMA_INPUT_WIDTH = 31, > + /* invalid height (DRC: 64~8192, FD: 16~8190) */ > + ERROR_DMA_INPUT_HEIGHT = 32, > + /* invalid format (DRC: YUV444 or YUV422, FD: YUV444, 422, 420) */ > + ERROR_DMA_INPUT_FORMAT = 33, > + /* invalid bit-width (DRC: 8~12bit, FD: 8bit) */ > + ERROR_DMA_INPUT_BIT_WIDTH = 34, > + /* invalid order(DRC: YYCbCrorYCbYCr, FD:NO,YYCbCr,YCbYCr,CbCr,CrCb) */ > + ERROR_DMA_INPUT_ORDER = 35, > + /* invalid palne (DRC: 3, FD: 1, 2, 3) */ > + ERROR_DMA_INPUT_PLANE = 36, > + > + ERROR_OTF_OUTPUT_NO = ERROR_COMMON_NO, > + /* invalid width (DRC: 128~8192) */ > + ERROR_OTF_OUTPUT_WIDTH = 41, > + /* invalid height (DRC: 64~8192) */ > + ERROR_OTF_OUTPUT_HEIGHT = 42, > + /* invalid format (DRC: YUV444) */ > + ERROR_OTF_OUTPUT_FORMAT = 43, > + /* invalid bit-width (DRC: 8~12bits) */ > + ERROR_OTF_OUTPUT_BIT_WIDTH = 44, > + /* invalid crop size (ODC: left>2, right>10) */ > + ERROR_OTF_OUTPUT_CROP = 45, > + > + ERROR_DMA_OUTPUT_NO = ERROR_COMMON_NO, > + ERROR_DMA_OUTPUT_WIDTH = 51, /* invalid width */ > + ERROR_DMA_OUTPUT_HEIGHT = 52, /* invalid height */ > + ERROR_DMA_OUTPUT_FORMAT = 53, /* invalid format */ > + ERROR_DMA_OUTPUT_BIT_WIDTH = 54, /* invalid bit-width */ > + ERROR_DMA_OUTPUT_PLANE = 55, /* invalid plane */ > + ERROR_DMA_OUTPUT_ORDER = 56, /* invalid order */ > + ERROR_DMA_OUTPUT_BUF = 57, /* invalid buffer info */ > + > + ERROR_GLOBAL_SHOTMODE_NO = ERROR_COMMON_NO, > + > + /* SENSOR Error(100~199) */ > + ERROR_SENSOR_NO = ERROR_COMMON_NO, > + ERROR_SENSOR_I2C_FAIL = 101, > + ERROR_SENSOR_INVALID_FRAMERATE, > + ERROR_SENSOR_INVALID_EXPOSURETIME, > + ERROR_SENSOR_INVALID_SIZE, > + ERROR_SENSOR_ACTURATOR_INIT_FAIL, > + ERROR_SENSOR_INVALID_AF_POS, > + ERROR_SENSOR_UNSUPPORT_FUNC, > + ERROR_SENSOR_UNSUPPORT_PERI, > + ERROR_SENSOR_UNSUPPORT_AF, > + ERROR_SENSOR_FLASH_FAIL, > + ERROR_SENSOR_START_FAIL, > + ERROR_SENSOR_STOP_FAIL, > + > + /* ISP Error (200~299) */ > + ERROR_ISP_AF_NO = ERROR_COMMON_NO, > + ERROR_ISP_AF_BUSY = 201, > + ERROR_ISP_AF_INVALID_COMMAND = 202, > + ERROR_ISP_AF_INVALID_MODE = 203, > + ERROR_ISP_FLASH_NO = ERROR_COMMON_NO, > + ERROR_ISP_AWB_NO = ERROR_COMMON_NO, > + ERROR_ISP_IMAGE_EFFECT_NO = ERROR_COMMON_NO, > + ERROR_ISP_IMAGE_EFFECT_INVALID = 231, > + ERROR_ISP_ISO_NO = ERROR_COMMON_NO, > + ERROR_ISP_ADJUST_NO = ERROR_COMMON_NO, > + ERROR_ISP_METERING_NO = ERROR_COMMON_NO, > + ERROR_ISP_AFC_NO = ERROR_COMMON_NO, > + > + /* DRC Error (300~399) */ > + > + /* FD Error (400~499) */ > + ERROR_FD_NO = ERROR_COMMON_NO, > + /* Invalid max number (1~16) */ > + ERROR_FD_CONFIG_MAX_NUMBER_STATE = 401, > + ERROR_FD_CONFIG_MAX_NUMBER_INVALID = 402, > + ERROR_FD_CONFIG_YAW_ANGLE_STATE = 403, > + ERROR_FD_CONFIG_YAW_ANGLE_INVALID = 404, > + ERROR_FD_CONFIG_ROLL_ANGLE_STATE = 405, > + ERROR_FD_CONFIG_ROLL_ANGLE_INVALID = 406, > + ERROR_FD_CONFIG_SMILE_MODE_INVALID = 407, > + ERROR_FD_CONFIG_BLINK_MODE_INVALID = 408, > + ERROR_FD_CONFIG_EYES_DETECT_INVALID = 409, > + ERROR_FD_CONFIG_MOUTH_DETECT_INVALID = 410, > + ERROR_FD_CONFIG_ORIENTATION_STATE = 411, > + ERROR_FD_CONFIG_ORIENTATION_INVALID = 412, > + ERROR_FD_CONFIG_ORIENTATION_VALUE_INVALID = 413, > + /* PARAM_FdResultStr can be only applied > + * in ready-state or stream off */ > + ERROR_FD_RESULT = 414, > + /* PARAM_FdModeStr can be only applied > + * in ready-state or stream off */ > + ERROR_FD_MODE = 415, > + > + /*SCALER ERR(500~599)*/ > + ERROR_SCALER_NO = ERROR_COMMON_NO, > + ERROR_SCALER_DMA_OUTSEL = 501, > + ERROR_SCALER_H_RATIO = 502, > + ERROR_SCALER_V_RATIO = 503, > + ERROR_SCALER_FRAME_BUFFER_SEQ = 504, > + > + ERROR_SCALER_IMAGE_EFFECT = 510, > + > + ERROR_SCALER_ROTATE = 520, > + ERROR_SCALER_FLIP = 521, > + > +}; > + > +#define ENOBASE_IS 0x10000 > +#define ENOSHOT (ENOBASE_IS + 1) /* shot error */ > +#define ENOMDONE (ENOBASE_IS + 2) /* meta done error */ > + > +#endif > diff --git a/drivers/media/platform/exynos5-is/fimc-is-metadata.h b/drivers/media/platform/exynos5-is/fimc-is-metadata.h > new file mode 100644 > index 0000000..9738d7d > --- /dev/null > +++ b/drivers/media/platform/exynos5-is/fimc-is-metadata.h > @@ -0,0 +1,771 @@ > +/* > + * Samsung EXYNOS5 FIMC-IS (Imaging Subsystem) driver > + * > + * Copyright (C) 2013 Samsung Electronics Co., Ltd. > + * Kil-yeon Lim<kilyeon.im@samsung.com> > + * Arun Kumar K<arun.kk@samsung.com> > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 as > + * published by the Free Software Foundation. > + */ > + > +#ifndef FIMC_IS_METADATA_H_ > +#define FIMC_IS_METADATA_H_ > + > +struct rational { > + uint32_t num; > + uint32_t den; > +}; > + > +#define CAMERA2_MAX_AVAILABLE_MODE 21 > +#define CAMERA2_MAX_FACES 16 > + > +/* > + *controls/dynamic metadata > +*/ > + > +enum metadata_mode { > + METADATA_MODE_NONE, > + METADATA_MODE_FULL > +}; > + > +struct camera2_request_ctl { > + uint32_t id; > + enum metadata_mode metadatamode; > + uint8_t outputstreams[16]; > + uint32_t framecount; > +}; > + > +struct camera2_request_dm { > + uint32_t id; > + enum metadata_mode metadatamode; > + uint32_t framecount; > +}; > + > + > + > +enum optical_stabilization_mode { > + OPTICAL_STABILIZATION_MODE_OFF, > + OPTICAL_STABILIZATION_MODE_ON > +}; > + > +enum lens_facing { > + LENS_FACING_BACK, > + LENS_FACING_FRONT > +}; > + > +struct camera2_lens_ctl { > + uint32_t focusdistance; > + float aperture; > + float focallength; > + float filterdensity; > + enum optical_stabilization_mode opticalstabilizationmode; > + Unnecessary empty line. Huh, flat number in the kernel ? What are we going to do with those ? Is this structure going to be needed to be exposed to user space somehow ? > +}; > + > +struct camera2_lens_dm { > + uint32_t focusdistance; > + float aperture; > + float focalilength; > + float filterdensity; > + enum optical_stabilization_mode opticalstabilizationmode; > + float focusrange[2]; > +}; > + > +struct camera2_lens_sm { > + float minimumfocusdistance; > + float hyperfocaldistance; > + float availablefocalLength[2]; > + float availableapertures; > + /*assuming 1 aperture*/ > + float availablefilterdensities; > + /*assuming 1 ND filter value*/ > + enum optical_stabilization_mode availableopticalstabilization; > + /*assuming 1*/ > + uint32_t shadingmapsize; > + float shadingmap[3][40][30]; > + uint32_t geometriccorrectionmapsize; > + float geometriccorrectionmap[2][3][40][30]; > + enum lens_facing facing; > + float position[2]; > +}; > + > +enum sensor_colorfilterarrangement { > + SENSOR_COLORFILTERARRANGEMENT_RGGB, > + SENSOR_COLORFILTERARRANGEMENT_GRBG, > + SENSOR_COLORFILTERARRANGEMENT_GBRG, > + SENSOR_COLORFILTERARRANGEMENT_BGGR, > + SENSOR_COLORFILTERARRANGEMENT_RGB Iwonderwhathappenedwithspacesinthoseenumdefinitions.... > +}; > + > +enum sensor_ref_illuminant { > + SENSOR_ILLUMINANT_DAYLIGHT = 1, > + SENSOR_ILLUMINANT_FLUORESCENT = 2, > + SENSOR_ILLUMINANT_TUNGSTEN = 3, > + SENSOR_ILLUMINANT_FLASH = 4, > + SENSOR_ILLUMINANT_FINE_WEATHER = 9, > + SENSOR_ILLUMINANT_CLOUDY_WEATHER = 10, > + SENSOR_ILLUMINANT_SHADE = 11, > + SENSOR_ILLUMINANT_DAYLIGHT_FLUORESCENT = 12, > + SENSOR_ILLUMINANT_DAY_WHITE_FLUORESCENT = 13, > + SENSOR_ILLUMINANT_COOL_WHITE_FLUORESCENT = 14, > + SENSOR_ILLUMINANT_WHITE_FLUORESCENT = 15, > + SENSOR_ILLUMINANT_STANDARD_A = 17, > + SENSOR_ILLUMINANT_STANDARD_B = 18, > + SENSOR_ILLUMINANT_STANDARD_C = 19, > + SENSOR_ILLUMINANT_D55 = 20, > + SENSOR_ILLUMINANT_D65 = 21, > + SENSOR_ILLUMINANT_D75 = 22, > + SENSOR_ILLUMINANT_D50 = 23, > + SENSOR_ILLUMINANT_ISO_STUDIO_TUNGSTEN = 24 > +}; > +struct camera2_sensor_ctl { > + /* unit : nano */ > + uint64_t exposuretime; > + /* unit : nano(It's min frame duration */ > + uint64_t frameduration; > + /* unit : percent(need to change ISO value?) */ > + uint32_t sensitivity; > +}; > + > +struct camera2_sensor_dm { > + uint64_t exposuretime; > + uint64_t frameduration; > + uint32_t sensitivity; > + uint64_t timestamp; > +}; > + > +struct camera2_sensor_sm { > + uint32_t exposuretimerange[2]; > + uint32_t maxframeduration; > + /* list of available sensitivities. */ > + uint32_t availablesensitivities[10]; > + enum sensor_colorfilterarrangement colorfilterarrangement; > + float physicalsize[2]; > + uint32_t pixelarraysize[2]; > + uint32_t activearraysize[4]; > + uint32_t whitelevel; > + uint32_t blacklevelpattern[4]; > + struct rational colortransform1[9]; > + struct rational colortransform2[9]; > + enum sensor_ref_illuminant referenceilluminant1; > + enum sensor_ref_illuminant referenceilluminant2; > + struct rational forwardmatrix1[9]; > + struct rational forwardmatrix2[9]; > + struct rational calibrationtransform1[9]; > + struct rational calibrationtransform2[9]; > + struct rational basegainfactor; > + uint32_t maxanalogsensitivity; > + float noisemodelcoefficients[2]; > + uint32_t orientation; > +}; > + > + > + > +enum flash_mode { > + CAM2_FLASH_MODE_OFF = 1, > + CAM2_FLASH_MODE_SINGLE, > + CAM2_FLASH_MODE_TORCH, > + CAM2_FLASH_MODE_BEST > +}; > + > +struct camera2_flash_ctl { > + enum flash_mode flashmode; > + uint32_t firingpower; > + uint64_t firingtime; > +}; > + > +struct camera2_flash_dm { > + enum flash_mode flashmode; > + /*10 is max power*/ > + uint32_t firingpower; > + /*unit : microseconds*/ > + uint64_t firingtime; > + /*1 : stable, 0 : unstable*/ > + uint32_t firingstable; > + /*1 : success, 0 : fail*/ > + uint32_t decision; > +}; > + > +struct camera2_flash_sm { > + uint32_t available; > + uint64_t chargeduration; > +}; > + > +enum processing_mode { > + PROCESSING_MODE_OFF = 1, > + PROCESSING_MODE_FAST, > + PROCESSING_MODE_HIGH_QUALITY > +}; > + > + > +struct camera2_hotpixel_ctl { > + enum processing_mode mode; > +}; > + > +struct camera2_hotpixel_dm { > + enum processing_mode mode; > +}; > + > +struct camera2_demosaic_ctl { > + enum processing_mode mode; > +}; > + > +struct camera2_demosaic_dm { > + enum processing_mode mode; > +}; > + > +struct camera2_noisereduction_ctl { > + enum processing_mode mode; > + uint32_t strength; > +}; > + > +struct camera2_noisereduction_dm { > + enum processing_mode mode; > + uint32_t strength; > +}; > + > +struct camera2_shading_ctl { > + enum processing_mode mode; > +}; > + > +struct camera2_shading_dm { > + enum processing_mode mode; > +}; > + > +struct camera2_geometric_ctl { > + enum processing_mode mode; > +}; > + > +struct camera2_geometric_dm { > + enum processing_mode mode; > +}; > + > +enum colorcorrection_mode { > + COLORCORRECTION_MODE_FAST = 1, > + COLORCORRECTION_MODE_HIGH_QUALITY, > + COLORCORRECTION_MODE_TRANSFORM_MATRIX, > + COLORCORRECTION_MODE_EFFECT_MONO, > + COLORCORRECTION_MODE_EFFECT_NEGATIVE, > + COLORCORRECTION_MODE_EFFECT_SOLARIZE, > + COLORCORRECTION_MODE_EFFECT_SEPIA, > + COLORCORRECTION_MODE_EFFECT_POSTERIZE, > + COLORCORRECTION_MODE_EFFECT_WHITEBOARD, > + COLORCORRECTION_MODE_EFFECT_BLACKBOARD, > + COLORCORRECTION_MODE_EFFECT_AQUA > +}; > + > + > +struct camera2_colorcorrection_ctl { > + enum colorcorrection_mode mode; > + float transform[9]; > + uint32_t hue; > + uint32_t saturation; > + uint32_t brightness; > +}; > + > +struct camera2_colorcorrection_dm { > + enum colorcorrection_mode mode; > + float transform[9]; > + uint32_t hue; > + uint32_t saturation; > + uint32_t brightness; > +}; > + > +struct camera2_colorcorrection_sm { > + /*assuming 10 supported modes*/ > + uint8_t availablemodes[CAMERA2_MAX_AVAILABLE_MODE]; > + uint32_t huerange[2]; > + uint32_t saturationrange[2]; > + uint32_t brightnessrange[2]; > +}; > + > +enum tonemap_mode { > + TONEMAP_MODE_FAST = 1, > + TONEMAP_MODE_HIGH_QUALITY, > + TONEMAP_MODE_CONTRAST_CURVE > +}; > + > +struct camera2_tonemap_ctl { > + enum tonemap_mode mode; > + /* assuming maxCurvePoints = 64 */ > + float curvered[64]; > + float curvegreen[64]; > + float curveblue[64]; > +}; > + > +struct camera2_tonemap_dm { > + enum tonemap_mode mode; > + /* assuming maxCurvePoints = 64 */ > + float curvered[64]; > + float curvegreen[64]; > + float curveblue[64]; > +}; > + > +struct camera2_tonemap_sm { > + uint32_t maxcurvepoints; > +}; > + > +struct camera2_edge_ctl { > + enum processing_mode mode; > + uint32_t strength; > +}; > + > +struct camera2_edge_dm { > + enum processing_mode mode; > + uint32_t strength; > +}; > + > +enum scaler_availableformats { Perhaps just 'enum scaler_formats' ? > + SCALER_FORMAT_BAYER_RAW, > + SCALER_FORMAT_YV12, > + SCALER_FORMAT_NV21, > + SCALER_FORMAT_JPEG, > + SCALER_FORMAT_UNKNOWN > +}; > + > +struct camera2_scaler_ctl { > + uint32_t cropregion[3]; > +}; > + > +struct camera2_scaler_dm { > + uint32_t cropregion[3]; > +}; > + > +struct camera2_scaler_sm { > + enum scaler_availableformats availableformats[4]; > + /*assuming # of availableFormats = 4*/ nit: Can you please amend all comments in this driver so there are spaces after '/*' and before '*/' ? > + uint32_t availablerawsizes; > + uint64_t availablerawmindurations; > + /* needs check */ > + uint32_t availableprocessedsizes[8]; > + uint64_t availableprocessedmindurations[8]; > + uint32_t availablejpegsizes[8][2]; > + uint64_t availablejpegmindurations[8]; > + uint32_t availablemaxdigitalzoom[8]; > +}; > + > +struct camera2_jpeg_ctl { > + uint32_t quality; > + uint32_t thumbnailsize[2]; > + uint32_t thumbnailquality; > + double gpscoordinates[3]; > + uint32_t gpsprocessingcethod; > + uint64_t gpstimestamp; > + uint32_t orientation; > +}; > + > +struct camera2_jpeg_dm { > + uint32_t quality; > + uint32_t thumbnailsize[2]; > + uint32_t thumbnailquality; > + double gpscoordinates[3]; > + uint32_t gpsprocessingmethod; > + uint64_t gpstimestamp; > + uint32_t orientation; > +}; > + > +struct camera2_jpeg_sm { > + uint32_t availablethumbnailsizes[8][2]; > + uint32_t maxsize; > + /*assuming supported size=8*/ > +}; > + > +enum facedetect_mode { > + FACEDETECT_MODE_OFF = 1, > + FACEDETECT_MODE_SIMPLE, > + FACEDETECT_MODE_FULL > +}; > + > +enum stats_mode { > + STATS_MODE_OFF = 1, > + STATS_MODE_ON > +}; > + > +struct camera2_stats_ctl { > + enum facedetect_mode facedetectmode; > + enum stats_mode histogrammode; > + enum stats_mode sharpnessmapmode; > +}; > + > + > +struct camera2_stats_dm { > + enum facedetect_mode facedetectmode; > + uint32_t facerectangles[CAMERA2_MAX_FACES][4]; > + uint8_t facescores[CAMERA2_MAX_FACES]; > + uint32_t facelandmarks[CAMERA2_MAX_FACES][6]; > + uint32_t faceids[CAMERA2_MAX_FACES]; > + enum stats_mode histogrammode; > + uint32_t histogram[3 * 256]; > + enum stats_mode sharpnessmapmode; > +}; > + > + > +struct camera2_stats_sm { > + uint8_t availablefacedetectmodes[CAMERA2_MAX_AVAILABLE_MODE]; > + /*assuming supported modes = 3;*/ > + uint32_t maxfacecount; > + uint32_t histogrambucketcount; > + uint32_t maxhistogramcount; > + uint32_t sharpnessmapsize[2]; > + uint32_t maxsharpnessmapvalue; > +}; > + > +enum aa_capture_intent { > + AA_CAPTURE_INTENT_CUSTOM = 0, > + AA_CAPTURE_INTENT_PREVIEW, > + AA_CAPTURE_INTENT_STILL_CAPTURE, > + AA_CAPTURE_INTENT_VIDEO_RECORD, > + AA_CAPTURE_INTENT_VIDEO_SNAPSHOT, > + AA_CAPTURE_INTENT_ZERO_SHUTTER_LAG > +}; > + > +enum aa_mode { > + AA_CONTROL_OFF = 1, > + AA_CONTROL_AUTO, > + AA_CONTROL_USE_SCENE_MODE > +}; > + > +enum aa_scene_mode { > + AA_SCENE_MODE_UNSUPPORTED = 1, > + AA_SCENE_MODE_FACE_PRIORITY, > + AA_SCENE_MODE_ACTION, > + AA_SCENE_MODE_PORTRAIT, > + AA_SCENE_MODE_LANDSCAPE, > + AA_SCENE_MODE_NIGHT, > + AA_SCENE_MODE_NIGHT_PORTRAIT, > + AA_SCENE_MODE_THEATRE, > + AA_SCENE_MODE_BEACH, > + AA_SCENE_MODE_SNOW, > + AA_SCENE_MODE_SUNSET, > + AA_SCENE_MODE_STEADYPHOTO, > + AA_SCENE_MODE_FIREWORKS, > + AA_SCENE_MODE_SPORTS, > + AA_SCENE_MODE_PARTY, > + AA_SCENE_MODE_CANDLELIGHT, > + AA_SCENE_MODE_BARCODE, > + AA_SCENE_MODE_NIGHT_CAPTURE > +}; > + > +enum aa_effect_mode { > + AA_EFFECT_OFF = 1, > + AA_EFFECT_MONO, > + AA_EFFECT_NEGATIVE, > + AA_EFFECT_SOLARIZE, > + AA_EFFECT_SEPIA, > + AA_EFFECT_POSTERIZE, > + AA_EFFECT_WHITEBOARD, > + AA_EFFECT_BLACKBOARD, > + AA_EFFECT_AQUA > +}; > + > +enum aa_aemode { > + AA_AEMODE_OFF = 1, > + AA_AEMODE_LOCKED, > + AA_AEMODE_ON, > + AA_AEMODE_ON_AUTO_FLASH, > + AA_AEMODE_ON_ALWAYS_FLASH, > + AA_AEMODE_ON_AUTO_FLASH_REDEYE > +}; > + > +enum aa_ae_flashmode { > + /*all flash control stop*/ > + AA_FLASHMODE_OFF = 1, > + /*internal 3A can control flash*/ > + AA_FLASHMODE_ON, > + /*internal 3A can do auto flash algorithm*/ > + AA_FLASHMODE_AUTO, > + /*internal 3A can fire flash by auto result*/ > + AA_FLASHMODE_CAPTURE, > + /*internal 3A can control flash forced*/ > + AA_FLASHMODE_ON_ALWAYS > + > +}; > + > +enum aa_ae_antibanding_mode { > + AA_AE_ANTIBANDING_OFF = 1, > + AA_AE_ANTIBANDING_50HZ, > + AA_AE_ANTIBANDING_60HZ, > + AA_AE_ANTIBANDING_AUTO > +}; > + > +enum aa_awbmode { > + AA_AWBMODE_OFF = 1, > + AA_AWBMODE_LOCKED, > + AA_AWBMODE_WB_AUTO, > + AA_AWBMODE_WB_INCANDESCENT, > + AA_AWBMODE_WB_FLUORESCENT, > + AA_AWBMODE_WB_WARM_FLUORESCENT, > + AA_AWBMODE_WB_DAYLIGHT, > + AA_AWBMODE_WB_CLOUDY_DAYLIGHT, > + AA_AWBMODE_WB_TWILIGHT, > + AA_AWBMODE_WB_SHADE > +}; > + > +enum aa_afmode { > + AA_AFMODE_OFF = 1, > + AA_AFMODE_AUTO, > + AA_AFMODE_MACRO, > + AA_AFMODE_CONTINUOUS_VIDEO, > + AA_AFMODE_CONTINUOUS_PICTURE, > + AA_AFMODE_EDOF > +}; > + > +enum aa_afstate { > + AA_AFSTATE_INACTIVE = 1, > + AA_AFSTATE_PASSIVE_SCAN, > + AA_AFSTATE_ACTIVE_SCAN, > + AA_AFSTATE_AF_ACQUIRED_FOCUS, > + AA_AFSTATE_AF_FAILED_FOCUS > +}; > + > +enum ae_state { > + AE_STATE_INACTIVE = 1, > + AE_STATE_SEARCHING, > + AE_STATE_CONVERGED, > + AE_STATE_LOCKED, > + AE_STATE_FLASH_REQUIRED, > + AE_STATE_PRECAPTURE > +}; > + > +enum awb_state { > + AWB_STATE_INACTIVE = 1, > + AWB_STATE_SEARCHING, > + AWB_STATE_CONVERGED, > + AWB_STATE_LOCKED > +}; > + > +enum aa_isomode { > + AA_ISOMODE_AUTO = 1, > + AA_ISOMODE_MANUAL, > +}; > + > +struct camera2_aa_ctl { > + enum aa_capture_intent captureintent; > + enum aa_mode mode; > + /*enum aa_effect_mode effectMode;*/ > + enum aa_scene_mode scenemode; > + uint32_t videostabilizationmode; > + enum aa_aemode aemode; > + uint32_t aeregions[5]; > + /*5 per region(x1,y1,x2,y2,weight). currently assuming 1 region.*/ > + int32_t aeexpcompensation; > + uint32_t aetargetfpsrange[2]; > + enum aa_ae_antibanding_mode aeantibandingmode; > + enum aa_ae_flashmode aeflashmode; > + enum aa_awbmode awbmode; > + uint32_t awbregions[5]; > + /*5 per region(x1,y1,x2,y2,weight). currently assuming 1 region.*/ > + enum aa_afmode afmode; > + uint32_t afregions[5]; > + /*5 per region(x1,y1,x2,y2,weight). currently assuming 1 region.*/ > + uint32_t aftrigger; > + enum aa_isomode isomode; > + uint32_t isovalue; > + > +}; > + > +struct camera2_aa_dm { > + enum aa_mode mode; > + enum aa_effect_mode effectmode; > + enum aa_scene_mode scenemode; > + uint32_t videostabilizationmode; > + enum aa_aemode aemode; > + /*needs check*/ > + uint32_t aeregions[5]; > + /*5 per region(x1,y1,x2,y2,weight). currently assuming 1 region.*/ > + enum ae_state aestate; > + enum aa_ae_flashmode aeflashmode; > + /*needs check*/ > + enum aa_awbmode awbmode; > + uint32_t awbregions[5]; > + enum awb_state awbstate; > + /*5 per region(x1,y1,x2,y2,weight). currently assuming 1 region.*/ > + enum aa_afmode afmode; > + uint32_t afregions[5]; > + /*5 per region(x1,y1,x2,y2,weight). currently assuming 1 region*/ > + enum aa_afstate afstate; > + enum aa_isomode isomode; > + uint32_t isovalue; > +}; > + > +struct camera2_aa_sm { > + uint8_t availablescenemodes[CAMERA2_MAX_AVAILABLE_MODE]; > + uint8_t availableeffects[CAMERA2_MAX_AVAILABLE_MODE]; > + /*assuming # of available scene modes = 10*/ > + uint32_t maxregions; > + uint8_t aeavailablemodes[CAMERA2_MAX_AVAILABLE_MODE]; > + /*assuming # of available ae modes = 8*/ > + struct rational aecompensationstep; > + int32_t aecompensationrange[2]; > + uint32_t aeavailabletargetfpsranges[CAMERA2_MAX_AVAILABLE_MODE][2]; > + uint8_t aeavailableantibandingmodes[CAMERA2_MAX_AVAILABLE_MODE]; > + uint8_t awbavailablemodes[CAMERA2_MAX_AVAILABLE_MODE]; > + /*assuming # of awbAvailableModes = 10*/ > + uint8_t afavailablemodes[CAMERA2_MAX_AVAILABLE_MODE]; > + /*assuming # of afAvailableModes = 4*/ > + uint8_t availablevideostabilizationmodes[4]; > + /*assuming # of availableVideoStabilizationModes = 4*/ > + uint32_t isorange[2]; > +}; > + > +struct camera2_lens_usm { > + /** Frame delay between sending command and applying frame data */ s//**/*/, this applies to multiple places elsewhere in those patches. Please use correct comment style. > + uint32_t focusdistanceframedelay; > +}; > + > +struct camera2_sensor_usm { > + /** Frame delay between sending command and applying frame data */ > + uint32_t exposuretimeframedelay; > + uint32_t framedurationframedelay; > + uint32_t sensitivityframedelay; > +}; > + > +struct camera2_flash_usm { > + /** Frame delay between sending command and applying frame data */ > + uint32_t flashmodeframedelay; > + uint32_t firingpowerframedelay; > + uint64_t firingtimeframedelay; > +}; > + > +struct camera2_ctl { > + struct camera2_request_ctl request; > + struct camera2_lens_ctl lens; > + struct camera2_sensor_ctl sensor; > + struct camera2_flash_ctl flash; > + struct camera2_hotpixel_ctl hotpixel; > + struct camera2_demosaic_ctl demosaic; > + struct camera2_noisereduction_ctl noise; > + struct camera2_shading_ctl shading; > + struct camera2_geometric_ctl geometric; > + struct camera2_colorcorrection_ctl color; > + struct camera2_tonemap_ctl tonemap; > + struct camera2_edge_ctl edge; > + struct camera2_scaler_ctl scaler; > + struct camera2_jpeg_ctl jpeg; > + struct camera2_stats_ctl stats; > + struct camera2_aa_ctl aa; > +}; > + > +struct camera2_dm { > + struct camera2_request_dm request; > + struct camera2_lens_dm lens; > + struct camera2_sensor_dm sensor; > + struct camera2_flash_dm flash; > + struct camera2_hotpixel_dm hotpixel; > + struct camera2_demosaic_dm demosaic; > + struct camera2_noisereduction_dm noise; > + struct camera2_shading_dm shading; > + struct camera2_geometric_dm geometric; > + struct camera2_colorcorrection_dm color; > + struct camera2_tonemap_dm tonemap; > + struct camera2_edge_dm edge; > + struct camera2_scaler_dm scaler; > + struct camera2_jpeg_dm jpeg; > + struct camera2_stats_dm stats; > + struct camera2_aa_dm aa; > +}; > + > +struct camera2_sm { > + struct camera2_lens_sm lens; > + struct camera2_sensor_sm sensor; > + struct camera2_flash_sm flash; > + struct camera2_colorcorrection_sm color; > + struct camera2_tonemap_sm tonemap; > + struct camera2_scaler_sm scaler; > + struct camera2_jpeg_sm jpeg; > + struct camera2_stats_sm stats; > + struct camera2_aa_sm aa; > + > + /** User-defined(ispfw specific) static metadata. */ > + struct camera2_lens_usm lensud; > + struct camera2_sensor_usm sensorud; > + struct camera2_flash_usm flashud; > +}; > + > +/** > + User-defined control for lens. > +*/ > +struct camera2_lens_uctl { > + struct camera2_lens_ctl ctl; > + > + /** It depends by af algorithm(normally 255 or 1023) */ > + uint32_t maxpos; > + /** Some actuator support slew rate control. */ > + uint32_t slewrate; > +}; > + > +/** > + User-defined metadata for lens. > +*/ > +struct camera2_lens_udm { > + /** It depends by af algorithm(normally 255 or 1023) */ > + uint32_t maxpos; > + /** Some actuator support slew rate control. */ > + uint32_t slewrate; > +}; > + > +/** > + User-defined control for sensor. > +*/ > +struct camera2_sensor_uctl { > + struct camera2_sensor_ctl ctl; > + /** Dynamic frame duration. > + This feature is decided to max. value between > + 'sensor.exposureTime'+alpha and 'sensor.frameDuration'. > + */ Wrong comment style, should be: /* * Dynamic frame duration.... * ... */ > + uint64_t dynamicrrameduration; > +}; > + > +struct camera2_scaler_uctl { > + /* target address for next frame. > + [0] invalid address, stop > + [others] valid address > + */ > + uint32_t scctargetaddress[4]; > + uint32_t scptargetaddress[4]; > +}; > + > +struct camera2_flash_uctl { > + struct camera2_flash_ctl ctl; > +}; > + > +struct camera2_uctl { > + /* Set sensor, lens, flash control for next frame. > + This flag can be combined. > + [0 bit] lens > + [1 bit] sensor > + [2 bit] flash > + */ > + uint32_t uupdatebitmap; > + > + /** For debugging */ > + uint32_t uframenumber; > + > + /** isp fw specific control(user-defined) of lens. */ > + struct camera2_lens_uctl lensud; > + /** isp fw specific control(user-defined) of sensor. */ > + struct camera2_sensor_uctl sensorud; > + /** isp fw specific control(user-defined) of flash. */ > + struct camera2_flash_uctl flashud; > + > + struct camera2_scaler_uctl scalerud; > +}; > + > +struct camera2_udm { > + struct camera2_lens_udm lens; > +}; > + > +struct camera2_shot { > + /*standard area*/ > + struct camera2_ctl ctl; > + struct camera2_dm dm; > + /*user defined area*/ > + struct camera2_uctl uctl; > + struct camera2_udm udm; > + /*magic : 23456789*/ > + uint32_t magicnumber; > +}; > +#endif > diff --git a/drivers/media/platform/exynos5-is/fimc-is-param.h b/drivers/media/platform/exynos5-is/fimc-is-param.h > new file mode 100644 > index 0000000..8eec772 > --- /dev/null > +++ b/drivers/media/platform/exynos5-is/fimc-is-param.h > @@ -0,0 +1,1259 @@ > +/* > + * Samsung Exynos5 SoC series FIMC-IS driver > + * > + * Copyright (c) 2013 Samsung Electronics Co., Ltd > + * Kil-yeon Lim<kilyeon.im@samsung.com> > + * Arun Kumar K<arun.kk@samsung.com> > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 as > + * published by the Free Software Foundation. > + */ > + > +#ifndef FIMC_IS_PARAM_H > +#define FIMC_IS_PARAM_H > + > +#define IS_REGION_VER 145 /* IS REGION VERSION 1.45 */ > + > +/* MACROs */ > +#define IS_SET_PARAM_BIT(dev, num) \ > + (num>= 32 ? set_bit((num-32),&dev->p_region_index2) \ > + : set_bit(num,&dev->p_region_index1)) The bit operation could take a bitmask of arbitrary length, not only 32 bits. Could you rework this parameter bitmask handling as is done in this patch http://git.linuxtv.org/media_tree.git/commitdiff/0e761b21b9d6c7a95a8e2b858af85d07f6c62d99 ? Then some macros below could be removed. > +#define IS_INC_PARAM_NUM(dev) atomic_inc(&dev->p_region_num) > +#define IS_PARAM_GLOBAL(dev) (dev->is_p_region->parameter.global) > +#define IS_PARAM_ISP(dev) (dev->is_p_region->parameter.isp) > +#define IS_PARAM_DRC(dev) (dev->is_p_region->parameter.drc) > +#define IS_PARAM_FD(dev) (dev->is_p_region->parameter.fd) > +#define IS_HEADER(dev) (dev->is_p_region->header) > +#define IS_FACE(dev) (dev->is_p_region->face) > +#define IS_SHARED(dev) (dev->is_shared_region) > +#define IS_PARAM_SIZE (FIMC_IS_REGION_SIZE + 1) All these are unused. Please double check for any unused code, this driver has already 8k LOC, and only subset of features are supported :/ > +#define INC_BIT(bit) (bit<<1) > +#define INC_NUM(bit) (bit + 1) These two are unused, and a bit odd. Please remove. > +#define MAGIC_NUMBER 0x01020304 > + > +#define PARAMETER_MAX_SIZE 128 /* in byte */ > +#define PARAMETER_MAX_MEMBER (PARAMETER_MAX_SIZE/4) > + > +enum is_param_set_bit { > + PARAM_GLOBAL_SHOTMODE = 0, > + PARAM_SENSOR_CONTROL, > + PARAM_SENSOR_OTF_INPUT, > + PARAM_SENSOR_OTF_OUTPUT, > + PARAM_SENSOR_FRAME_RATE, > + PARAM_SENSOR_DMA_OUTPUT, > + PARAM_BUFFER_CONTROL, > + PARAM_BUFFER_OTF_INPUT, > + PARAM_BUFFER_OTF_OUTPUT, > + PARAM_ISP_CONTROL, > + PARAM_ISP_OTF_INPUT = 10, > + PARAM_ISP_DMA1_INPUT, > + PARAM_ISP_DMA2_INPUT, > + PARAM_ISP_AA, > + PARAM_ISP_FLASH, > + PARAM_ISP_AWB, > + PARAM_ISP_IMAGE_EFFECT, > + PARAM_ISP_ISO, > + PARAM_ISP_ADJUST, > + PARAM_ISP_METERING, > + PARAM_ISP_AFC = 20, > + PARAM_ISP_OTF_OUTPUT, > + PARAM_ISP_DMA1_OUTPUT, > + PARAM_ISP_DMA2_OUTPUT, > + PARAM_DRC_CONTROL, > + PARAM_DRC_OTF_INPUT, > + PARAM_DRC_DMA_INPUT, > + PARAM_DRC_OTF_OUTPUT, > + PARAM_SCALERC_CONTROL, > + PARAM_SCALERC_OTF_INPUT, > + PARAM_SCALERC_IMAGE_EFFECT = 30, > + PARAM_SCALERC_INPUT_CROP, > + PARAM_SCALERC_OUTPUT_CROP, > + PARAM_SCALERC_OTF_OUTPUT, > + PARAM_SCALERC_DMA_OUTPUT = 34, > + PARAM_ODC_CONTROL, > + PARAM_ODC_OTF_INPUT, > + PARAM_ODC_OTF_OUTPUT, > + PARAM_DIS_CONTROL, > + PARAM_DIS_OTF_INPUT, > + PARAM_DIS_OTF_OUTPUT = 40, > + PARAM_TDNR_CONTROL, > + PARAM_TDNR_OTF_INPUT, > + PARAM_TDNR_1ST_FRAME, > + PARAM_TDNR_OTF_OUTPUT, > + PARAM_TDNR_DMA_OUTPUT, > + PARAM_SCALERP_CONTROL, > + PARAM_SCALERP_OTF_INPUT, > + PARAM_SCALERP_IMAGE_EFFECT, > + PARAM_SCALERP_INPUT_CROP, > + PARAM_SCALERP_OUTPUT_CROP = 50, > + PARAM_SCALERP_ROTATION, > + PARAM_SCALERP_FLIP, > + PARAM_SCALERP_OTF_OUTPUT, > + PARAM_SCALERP_DMA_OUTPUT, > + PARAM_FD_CONTROL, > + PARAM_FD_OTF_INPUT, > + PARAM_FD_DMA_INPUT, > + PARAM_FD_CONFIG = 58, > + PARAM_END, > +}; > + > +#define ADDRESS_TO_OFFSET(start, end) ((uint32)end - (uint32)start) > +#define OFFSET_TO_NUM(offset) ((offset)>>6) > +#define IS_OFFSET_LOWBIT(offset) (OFFSET_TO_NUM(offset)>= \ > + 32 ? false : true) > +#define OFFSET_TO_BIT(offset) \ > + {(IS_OFFSET_LOWBIT(offset) ? (1<<OFFSET_TO_NUM(offset)) \ > + : (1<<(OFFSET_TO_NUM(offset)-32))} > +#define LOWBIT_OF_NUM(num) (num>= 32 ? 0 : BIT0<<num) > +#define HIGHBIT_OF_NUM(num) (num>= 32 ? BIT0<<(num-32) : 0) > + > +#define PARAM_LOW_MASK (0xFFFFFFFF) > +#define PARAM_HIGH_MASK (0x07FFFFFF) These guys are going to be redundant when you rework the parameter bitmask handling as suggested above. > + > +/* ---------------------- Input ----------------------------------- */ > +enum control_command { > + CONTROL_COMMAND_STOP = 0, > + CONTROL_COMMAND_START = 1, > + CONTROL_COMMAND_TEST = 2 > +}; > + > +enum bypass_command { > + CONTROL_BYPASS_DISABLE = 0, > + CONTROL_BYPASS_ENABLE = 1 > +}; > + > +enum control_error { > + CONTROL_ERROR_NO = 0 > +}; > + > +enum otf_input_command { > + OTF_INPUT_COMMAND_DISABLE = 0, > + OTF_INPUT_COMMAND_ENABLE = 1 > +}; > + > +enum otf_input_format { > + OTF_INPUT_FORMAT_BAYER = 0, /* 1 Channel */ > + OTF_INPUT_FORMAT_YUV444 = 1, /* 3 Channel */ > + OTF_INPUT_FORMAT_YUV422 = 2, /* 3 Channel */ > + OTF_INPUT_FORMAT_YUV420 = 3, /* 3 Channel */ > + OTF_INPUT_FORMAT_STRGEN_COLORBAR_BAYER = 10, > + OTF_INPUT_FORMAT_BAYER_DMA = 11, > +}; > + > +enum otf_input_bitwidth { > + OTF_INPUT_BIT_WIDTH_14BIT = 14, > + OTF_INPUT_BIT_WIDTH_12BIT = 12, > + OTF_INPUT_BIT_WIDTH_11BIT = 11, > + OTF_INPUT_BIT_WIDTH_10BIT = 10, > + OTF_INPUT_BIT_WIDTH_9BIT = 9, > + OTF_INPUT_BIT_WIDTH_8BIT = 8 > +}; > + > +enum otf_input_order { > + OTF_INPUT_ORDER_BAYER_GR_BG = 0, > + OTF_INPUT_ORDER_BAYER_RG_GB = 1, > + OTF_INPUT_ORDER_BAYER_BG_GR = 2, > + OTF_INPUT_ORDER_BAYER_GB_RG = 3 > +}; > + > +enum otf_intput_error { > + OTF_INPUT_ERROR_NO = 0 /* Input setting is done */ > +}; > + > +enum dma_input_command { > + DMA_INPUT_COMMAND_DISABLE = 0, > + DMA_INPUT_COMMAND_ENABLE = 1, > + DMA_INPUT_COMMAND_BUF_MNGR = 2, > + DMA_INPUT_COMMAND_RUN_SINGLE = 3, > +}; > + > +enum dma_inut_format { > + DMA_INPUT_FORMAT_BAYER = 0, > + DMA_INPUT_FORMAT_YUV444 = 1, > + DMA_INPUT_FORMAT_YUV422 = 2, > + DMA_INPUT_FORMAT_YUV420 = 3, > +}; > + > +enum dma_input_bitwidth { > + DMA_INPUT_BIT_WIDTH_14BIT = 14, > + DMA_INPUT_BIT_WIDTH_12BIT = 12, > + DMA_INPUT_BIT_WIDTH_11BIT = 11, > + DMA_INPUT_BIT_WIDTH_10BIT = 10, > + DMA_INPUT_BIT_WIDTH_9BIT = 9, > + DMA_INPUT_BIT_WIDTH_8BIT = 8 > +}; > + > +enum dma_input_plane { > + DMA_INPUT_PLANE_3 = 3, > + DMA_INPUT_PLANE_2 = 2, > + DMA_INPUT_PLANE_1 = 1 > +}; > + > +enum dma_input_order { > + /* (for DMA_INPUT_PLANE_3) */ > + DMA_INPUT_ORDER_NO = 0, > + /* (only valid at DMA_INPUT_PLANE_2) */ > + DMA_INPUT_ORDER_CBCR = 1, > + /* (only valid at DMA_INPUT_PLANE_2) */ > + DMA_INPUT_ORDER_CRCB = 2, > + /* (only valid at DMA_INPUT_PLANE_1& DMA_INPUT_FORMAT_YUV444) */ > + DMA_INPUT_ORDER_YCBCR = 3, > + /* (only valid at DMA_INPUT_FORMAT_YUV422& DMA_INPUT_PLANE_1) */ > + DMA_INPUT_ORDER_YYCBCR = 4, > + /* (only valid at DMA_INPUT_FORMAT_YUV422& DMA_INPUT_PLANE_1) */ > + DMA_INPUT_ORDER_YCBYCR = 5, > + /* (only valid at DMA_INPUT_FORMAT_YUV422& DMA_INPUT_PLANE_1) */ > + DMA_INPUT_ORDER_YCRYCB = 6, > + /* (only valid at DMA_INPUT_FORMAT_YUV422& DMA_INPUT_PLANE_1) */ > + DMA_INPUT_ORDER_CBYCRY = 7, > + /* (only valid at DMA_INPUT_FORMAT_YUV422& DMA_INPUT_PLANE_1) */ > + DMA_INPUT_ORDER_CRYCBY = 8, > + /* (only valid at DMA_INPUT_FORMAT_BAYER) */ > + DMA_INPUT_ORDER_GR_BG = 9 > +}; > + > +enum dma_input_error { > + DMA_INPUT_ERROR_NO = 0 /* DMA input setting is done */ > +}; > + > +/* ---------------------- Output ----------------------------------- */ > +enum otf_output_crop { > + OTF_OUTPUT_CROP_DISABLE = 0, > + OTF_OUTPUT_CROP_ENABLE = 1 > +}; > + > +enum otf_output_command { > + OTF_OUTPUT_COMMAND_DISABLE = 0, > + OTF_OUTPUT_COMMAND_ENABLE = 1 > +}; > + > +enum orf_output_format { > + OTF_OUTPUT_FORMAT_YUV444 = 1, > + OTF_OUTPUT_FORMAT_YUV422 = 2, > + OTF_OUTPUT_FORMAT_YUV420 = 3, > + OTF_OUTPUT_FORMAT_RGB = 4 > +}; > + > +enum otf_output_bitwidth { > + OTF_OUTPUT_BIT_WIDTH_14BIT = 14, > + OTF_OUTPUT_BIT_WIDTH_12BIT = 12, > + OTF_OUTPUT_BIT_WIDTH_11BIT = 11, > + OTF_OUTPUT_BIT_WIDTH_10BIT = 10, > + OTF_OUTPUT_BIT_WIDTH_9BIT = 9, > + OTF_OUTPUT_BIT_WIDTH_8BIT = 8 > +}; > + > +enum otf_output_order { > + OTF_OUTPUT_ORDER_BAYER_GR_BG = 0, > +}; > + > +enum otf_output_error { > + OTF_OUTPUT_ERROR_NO = 0 /* Output Setting is done */ > +}; > + > +enum dma_output_command { > + DMA_OUTPUT_COMMAND_DISABLE = 0, > + DMA_OUTPUT_COMMAND_ENABLE = 1, > + DMA_OUTPUT_COMMAND_BUF_MNGR = 2, > + DMA_OUTPUT_UPDATE_MASK_BITS = 3 > +}; > + > +enum dma_output_format { > + DMA_OUTPUT_FORMAT_BAYER = 0, > + DMA_OUTPUT_FORMAT_YUV444 = 1, > + DMA_OUTPUT_FORMAT_YUV422 = 2, > + DMA_OUTPUT_FORMAT_YUV420 = 3, > + DMA_OUTPUT_FORMAT_RGB = 4 > +}; > + > +enum dma_output_bitwidth { > + DMA_OUTPUT_BIT_WIDTH_14BIT = 14, > + DMA_OUTPUT_BIT_WIDTH_12BIT = 12, > + DMA_OUTPUT_BIT_WIDTH_11BIT = 11, > + DMA_OUTPUT_BIT_WIDTH_10BIT = 10, > + DMA_OUTPUT_BIT_WIDTH_9BIT = 9, > + DMA_OUTPUT_BIT_WIDTH_8BIT = 8 > +}; > + > +enum dma_output_plane { > + DMA_OUTPUT_PLANE_3 = 3, > + DMA_OUTPUT_PLANE_2 = 2, > + DMA_OUTPUT_PLANE_1 = 1 > +}; > + > +enum dma_output_order { > + DMA_OUTPUT_ORDER_NO = 0, > + /* (for DMA_OUTPUT_PLANE_3) */ > + DMA_OUTPUT_ORDER_CBCR = 1, > + /* (only valid at DMA_INPUT_PLANE_2) */ > + DMA_OUTPUT_ORDER_CRCB = 2, > + /* (only valid at DMA_OUTPUT_PLANE_2) */ > + DMA_OUTPUT_ORDER_YYCBCR = 3, > + /* (only valid at DMA_OUTPUT_FORMAT_YUV422& DMA_OUTPUT_PLANE_1) */ > + DMA_OUTPUT_ORDER_YCBYCR = 4, > + /* (only valid at DMA_OUTPUT_FORMAT_YUV422& DMA_OUTPUT_PLANE_1) */ > + DMA_OUTPUT_ORDER_YCRYCB = 5, > + /* (only valid at DMA_OUTPUT_FORMAT_YUV422& DMA_OUTPUT_PLANE_1) */ > + DMA_OUTPUT_ORDER_CBYCRY = 6, > + /* (only valid at DMA_OUTPUT_FORMAT_YUV422& DMA_OUTPUT_PLANE_1) */ > + DMA_OUTPUT_ORDER_CRYCBY = 7, > + /* (only valid at DMA_OUTPUT_FORMAT_YUV422& DMA_OUTPUT_PLANE_1) */ > + DMA_OUTPUT_ORDER_YCBCR = 8, > + /* (only valid at DMA_OUTPUT_FORMAT_YUV444& DMA_OUPUT_PLANE_1) */ > + DMA_OUTPUT_ORDER_CRYCB = 9, > + /* (only valid at DMA_OUTPUT_FORMAT_YUV444& DMA_OUPUT_PLANE_1) */ > + DMA_OUTPUT_ORDER_CRCBY = 10, > + /* (only valid at DMA_OUTPUT_FORMAT_YUV444& DMA_OUPUT_PLANE_1) */ > + DMA_OUTPUT_ORDER_CBYCR = 11, > + /* (only valid at DMA_OUTPUT_FORMAT_YUV444& DMA_OUPUT_PLANE_1) */ > + DMA_OUTPUT_ORDER_YCRCB = 12, > + /* (only valid at DMA_OUTPUT_FORMAT_YUV444& DMA_OUPUT_PLANE_1) */ > + DMA_OUTPUT_ORDER_CBCRY = 13, > + /* (only valid at DMA_OUTPUT_FORMAT_YUV444& DMA_OUPUT_PLANE_1) */ > + DMA_OUTPUT_ORDER_BGR = 14, > + /* (only valid at DMA_OUTPUT_FORMAT_RGB) */ > + DMA_OUTPUT_ORDER_GB_BG = 15 > + /* (only valid at DMA_OUTPUT_FORMAT_BAYER) */ > +}; > + > +enum dma_output_notify_dma_done { > + DMA_OUTPUT_NOTIFY_DMA_DONE_DISABLE = 0, > + DMA_OUTPUT_NOTIFY_DMA_DONE_ENBABLE = 1, > +}; > + > +enum dma_output_error { > + DMA_OUTPUT_ERROR_NO = 0 /* DMA output setting is done */ > +}; > + > +/* ---------------------- Global ----------------------------------- */ > +enum global_shotmode_error { > + GLOBAL_SHOTMODE_ERROR_NO = 0 /* shot-mode setting is done */ > +}; > + > +/* ------------------------- AA ------------------------------------ */ > +enum isp_lock_command { > + ISP_AA_COMMAND_START = 0, > + ISP_AA_COMMAND_STOP = 1 > +}; > + > +enum isp_lock_target { > + ISP_AA_TARGET_AF = 1, > + ISP_AA_TARGET_AE = 2, > + ISP_AA_TARGET_AWB = 4 > +}; > + > +enum isp_af_mode { > + ISP_AF_MANUAL = 0, > + ISP_AF_SINGLE, > + ISP_AF_CONTINUOUS, > + ISP_AF_REGION, > + ISP_AF_SLEEP, > + ISP_AF_INIT, > + ISP_AF_SET_CENTER_WINDOW, > + ISP_AF_SET_TOUCH_WINDOW, > + ISP_AF_SET_FACE_WINDOW > +}; > + > +enum isp_af_scene { > + ISP_AF_SCENE_NORMAL = 0, > + ISP_AF_SCENE_MACRO = 1 > +}; > + > +enum isp_af_touch { > + ISP_AF_TOUCH_DISABLE = 0, > + ISP_AF_TOUCH_ENABLE > +}; > + > +enum isp_af_face { > + ISP_AF_FACE_DISABLE = 0, > + ISP_AF_FACE_ENABLE > +}; > + > +enum isp_af_reponse { > + ISP_AF_RESPONSE_PREVIEW = 0, > + ISP_AF_RESPONSE_MOVIE > +}; > + > +enum isp_af_sleep { > + ISP_AF_SLEEP_OFF = 0, > + ISP_AF_SLEEP_ON = 1 > +}; > + > +enum isp_af_continuous { > + ISP_AF_CONTINUOUS_DISABLE = 0, > + ISP_AF_CONTINUOUS_ENABLE = 1 > +}; > + > +enum isp_af_error { > + ISP_AF_ERROR_NO = 0, /* AF mode change is done */ > + ISP_AF_EROOR_NO_LOCK_DONE = 1 /* AF lock is done */ > +}; > + > +/* ------------------------- Flash ------------------------------------- */ > +enum isp_flash_command { > + ISP_FLASH_COMMAND_DISABLE = 0, > + ISP_FLASH_COMMAND_MANUALON = 1, /* (forced flash) */ > + ISP_FLASH_COMMAND_AUTO = 2, > + ISP_FLASH_COMMAND_TORCH = 3, /* 3 sec */ > + ISP_FLASH_COMMAND_FLASH_ON = 4, > + ISP_FLASH_COMMAND_CAPTURE = 5, > + ISP_FLASH_COMMAND_TRIGGER = 6, > + ISP_FLASH_COMMAND_CALIBRATION = 7 > +}; > + > +enum isp_flash_redeye { > + ISP_FLASH_REDEYE_DISABLE = 0, > + ISP_FLASH_REDEYE_ENABLE = 1 > +}; > + > +enum isp_flash_error { > + ISP_FLASH_ERROR_NO = 0 /* Flash setting is done */ > +}; > + > +/* -------------------------- AWB ------------------------------------ */ > +enum isp_awb_command { > + ISP_AWB_COMMAND_AUTO = 0, > + ISP_AWB_COMMAND_ILLUMINATION = 1, > + ISP_AWB_COMMAND_MANUAL = 2 > +}; > + > +enum isp_awb_illumination { > + ISP_AWB_ILLUMINATION_DAYLIGHT = 0, > + ISP_AWB_ILLUMINATION_CLOUDY = 1, > + ISP_AWB_ILLUMINATION_TUNGSTEN = 2, > + ISP_AWB_ILLUMINATION_FLUORESCENT = 3 > +}; > + > +enum isp_awb_error { > + ISP_AWB_ERROR_NO = 0 /* AWB setting is done */ > +}; > + > +/* -------------------------- Effect ----------------------------------- */ > +enum isp_imageeffect_command { > + ISP_IMAGE_EFFECT_DISABLE = 0, > + ISP_IMAGE_EFFECT_MONOCHROME = 1, > + ISP_IMAGE_EFFECT_NEGATIVE_MONO = 2, > + ISP_IMAGE_EFFECT_NEGATIVE_COLOR = 3, > + ISP_IMAGE_EFFECT_SEPIA = 4, > + ISP_IMAGE_EFFECT_AQUA = 5, > + ISP_IMAGE_EFFECT_EMBOSS = 6, > + ISP_IMAGE_EFFECT_EMBOSS_MONO = 7, > + ISP_IMAGE_EFFECT_SKETCH = 8, > + ISP_IMAGE_EFFECT_RED_YELLOW_POINT = 9, > + ISP_IMAGE_EFFECT_GREEN_POINT = 10, > + ISP_IMAGE_EFFECT_BLUE_POINT = 11, > + ISP_IMAGE_EFFECT_MAGENTA_POINT = 12, > + ISP_IMAGE_EFFECT_WARM_VINTAGE = 13, > + ISP_IMAGE_EFFECT_COLD_VINTAGE = 14, > + ISP_IMAGE_EFFECT_POSTERIZE = 15, > + ISP_IMAGE_EFFECT_SOLARIZE = 16, > + ISP_IMAGE_EFFECT_WASHED = 17, > + ISP_IMAGE_EFFECT_CCM = 18, > +}; > + > +enum isp_imageeffect_error { > + ISP_IMAGE_EFFECT_ERROR_NO = 0 /* Image effect setting is done */ > +}; > + > +/* --------------------------- ISO ------------------------------------ */ > +enum isp_iso_command { > + ISP_ISO_COMMAND_AUTO = 0, > + ISP_ISO_COMMAND_MANUAL = 1 > +}; > + > +enum iso_error { > + ISP_ISO_ERROR_NO = 0 /* ISO setting is done */ > +}; > + > +/* -------------------------- Adjust ----------------------------------- */ > +enum iso_adjust_command { > + ISP_ADJUST_COMMAND_AUTO = 0, > + ISP_ADJUST_COMMAND_MANUAL_CONTRAST = (1<< 0), > + ISP_ADJUST_COMMAND_MANUAL_SATURATION = (1<< 1), > + ISP_ADJUST_COMMAND_MANUAL_SHARPNESS = (1<< 2), > + ISP_ADJUST_COMMAND_MANUAL_EXPOSURE = (1<< 3), > + ISP_ADJUST_COMMAND_MANUAL_BRIGHTNESS = (1<< 4), > + ISP_ADJUST_COMMAND_MANUAL_HUE = (1<< 5), > + ISP_ADJUST_COMMAND_MANUAL_HOTPIXEL = (1<< 6), > + ISP_ADJUST_COMMAND_MANUAL_NOISEREDUCTION = (1<< 7), > + ISP_ADJUST_COMMAND_MANUAL_SHADING = (1<< 8), > + ISP_ADJUST_COMMAND_MANUAL_GAMMA = (1<< 9), > + ISP_ADJUST_COMMAND_MANUAL_EDGEENHANCEMENT = (1<< 10), > + ISP_ADJUST_COMMAND_MANUAL_SCENE = (1<< 11), > + ISP_ADJUST_COMMAND_MANUAL_FRAMETIME = (1<< 12), > + ISP_ADJUST_COMMAND_MANUAL_ALL = 0x1FFF > +}; > + > +enum isp_adjust_scene_index { > + ISP_ADJUST_SCENE_NORMAL = 0, > + ISP_ADJUST_SCENE_NIGHT_PREVIEW = 1, > + ISP_ADJUST_SCENE_NIGHT_CAPTURE = 2 > +}; > + > + > +enum isp_adjust_error { > + ISP_ADJUST_ERROR_NO = 0 /* Adjust setting is done */ > +}; > + > +/* ------------------------- Metering ---------------------------------- */ > +enum isp_metering_command { > + ISP_METERING_COMMAND_AVERAGE = 0, > + ISP_METERING_COMMAND_SPOT = 1, > + ISP_METERING_COMMAND_MATRIX = 2, > + ISP_METERING_COMMAND_CENTER = 3, > + ISP_METERING_COMMAND_EXPOSURE_MODE = (1<< 8) > +}; > + > +enum isp_exposure_mode { > + ISP_EXPOSUREMODE_OFF = 1, > + ISP_EXPOSUREMODE_AUTO = 2 > +}; > + > +enum isp_metering_error { > + ISP_METERING_ERROR_NO = 0 /* Metering setting is done */ > +}; > + > +/* -------------------------- AFC ----------------------------------- */ > +enum isp_afc_command { > + ISP_AFC_COMMAND_DISABLE = 0, > + ISP_AFC_COMMAND_AUTO = 1, > + ISP_AFC_COMMAND_MANUAL = 2 > +}; > + > +enum isp_afc_manual { > + ISP_AFC_MANUAL_50HZ = 50, > + ISP_AFC_MANUAL_60HZ = 60 > +}; > + > +enum isp_afc_error { > + ISP_AFC_ERROR_NO = 0 /* AFC setting is done */ > +}; > + > +enum isp_scene_command { > + ISP_SCENE_NONE = 0, > + ISP_SCENE_PORTRAIT = 1, > + ISP_SCENE_LANDSCAPE = 2, > + ISP_SCENE_SPORTS = 3, > + ISP_SCENE_PARTYINDOOR = 4, > + ISP_SCENE_BEACHSNOW = 5, > + ISP_SCENE_SUNSET = 6, > + ISP_SCENE_DAWN = 7, > + ISP_SCENE_FALL = 8, > + ISP_SCENE_NIGHT = 9, > + ISP_SCENE_AGAINSTLIGHTWLIGHT = 10, > + ISP_SCENE_AGAINSTLIGHTWOLIGHT = 11, > + ISP_SCENE_FIRE = 12, > + ISP_SCENE_TEXT = 13, > + ISP_SCENE_CANDLE = 14 > +}; > + > +/* -------------------------- Scaler --------------------------------- */ > +enum scaler_imageeffect_command { > + SCALER_IMAGE_EFFECT_COMMNAD_DISABLE = 0, > + SCALER_IMAGE_EFFECT_COMMNAD_SEPIA_CB = 1, > + SCALER_IMAGE_EFFECT_COMMAND_SEPIA_CR = 2, > + SCALER_IMAGE_EFFECT_COMMAND_NEGATIVE = 3, > + SCALER_IMAGE_EFFECT_COMMAND_ARTFREEZE = 4, > + SCALER_IMAGE_EFFECT_COMMAND_EMBOSSING = 5, > + SCALER_IMAGE_EFFECT_COMMAND_SILHOUETTE = 6 > +}; > + > +enum scaler_imageeffect_error { > + SCALER_IMAGE_EFFECT_ERROR_NO = 0 > +}; > + > +enum scaler_crop_command { > + SCALER_CROP_COMMAND_DISABLE = 0, > + SCALER_CROP_COMMAND_ENABLE = 1 > +}; > + > +enum scaler_crop_error { > + SCALER_CROP_ERROR_NO = 0 /* crop setting is done */ > +}; > + > +enum scaler_scaling_command { > + SCALER_SCALING_COMMNAD_DISABLE = 0, > + SCALER_SCALING_COMMAND_UP = 1, > + SCALER_SCALING_COMMAND_DOWN = 2 > +}; > + > +enum scaler_scaling_error { > + SCALER_SCALING_ERROR_NO = 0 > +}; > + > +enum scaler_rotation_command { > + SCALER_ROTATION_COMMAND_DISABLE = 0, > + SCALER_ROTATION_COMMAND_CLOCKWISE90 = 1 > +}; > + > +enum scaler_rotation_error { > + SCALER_ROTATION_ERROR_NO = 0 > +}; > + > +enum scaler_flip_command { > + SCALER_FLIP_COMMAND_NORMAL = 0, > + SCALER_FLIP_COMMAND_X_MIRROR = 1, > + SCALER_FLIP_COMMAND_Y_MIRROR = 2, > + SCALER_FLIP_COMMAND_XY_MIRROR = 3 /* (180 rotation) */ > +}; > + > +enum scaler_flip_error { > + SCALER_FLIP_ERROR_NO = 0 /* flip setting is done */ > +}; > + > +/* -------------------------- 3DNR ----------------------------------- */ > +enum tdnr_1st_frame_command { > + TDNR_1ST_FRAME_COMMAND_NOPROCESSING = 0, > + TDNR_1ST_FRAME_COMMAND_2DNR = 1 > +}; > + > +enum tdnr_1st_frame_error { > + TDNR_1ST_FRAME_ERROR_NO = 0 > + /*1st frame setting is done*/ > +}; > + > +/* ---------------------------- FD ------------------------------------- */ > +enum fd_config_command { > + FD_CONFIG_COMMAND_MAXIMUM_NUMBER = 0x1, > + FD_CONFIG_COMMAND_ROLL_ANGLE = 0x2, > + FD_CONFIG_COMMAND_YAW_ANGLE = 0x4, > + FD_CONFIG_COMMAND_SMILE_MODE = 0x8, > + FD_CONFIG_COMMAND_BLINK_MODE = 0x10, > + FD_CONFIG_COMMAND_EYES_DETECT = 0x20, > + FD_CONFIG_COMMAND_MOUTH_DETECT = 0x40, > + FD_CONFIG_COMMAND_ORIENTATION = 0x80, > + FD_CONFIG_COMMAND_ORIENTATION_VALUE = 0x100 > +}; > + > +enum fd_config_roll_angle { > + FD_CONFIG_ROLL_ANGLE_BASIC = 0, > + FD_CONFIG_ROLL_ANGLE_PRECISE_BASIC = 1, > + FD_CONFIG_ROLL_ANGLE_SIDES = 2, > + FD_CONFIG_ROLL_ANGLE_PRECISE_SIDES = 3, > + FD_CONFIG_ROLL_ANGLE_FULL = 4, > + FD_CONFIG_ROLL_ANGLE_PRECISE_FULL = 5, > +}; > + > +enum fd_config_yaw_angle { > + FD_CONFIG_YAW_ANGLE_0 = 0, > + FD_CONFIG_YAW_ANGLE_45 = 1, > + FD_CONFIG_YAW_ANGLE_90 = 2, > + FD_CONFIG_YAW_ANGLE_45_90 = 3, > +}; > + > +enum fd_config_smile_mode { > + FD_CONFIG_SMILE_MODE_DISABLE = 0, > + FD_CONFIG_SMILE_MODE_ENABLE = 1 > +}; > + > +enum fd_config_blink_mode { > + FD_CONFIG_BLINK_MODE_DISABLE = 0, > + FD_CONFIG_BLINK_MODE_ENABLE = 1 > +}; > + > +enum fd_config_eye_result { > + FD_CONFIG_EYES_DETECT_DISABLE = 0, > + FD_CONFIG_EYES_DETECT_ENABLE = 1 > +}; > + > +enum fd_config_mouth_result { > + FD_CONFIG_MOUTH_DETECT_DISABLE = 0, > + FD_CONFIG_MOUTH_DETECT_ENABLE = 1 > +}; > + > +enum fd_config_orientation { > + FD_CONFIG_ORIENTATION_DISABLE = 0, > + FD_CONFIG_ORIENTATION_ENABLE = 1 > +}; > + > +struct param_control { > + u32 cmd; > + u32 bypass; > + u32 buffer_address; > + u32 buffer_number; > + /* 0: continuous, 1: single */ > + u32 run_mode; > + u32 reserved[PARAMETER_MAX_MEMBER-6]; > + u32 err; > +}; > + > +struct param_otf_input { > + u32 cmd; > + u32 width; > + u32 height; > + u32 format; > + u32 bitwidth; > + u32 order; > + u32 crop_offset_x; > + u32 crop_offset_y; > + u32 crop_width; > + u32 crop_height; > + u32 frametime_min; > + u32 frametime_max; > + u32 reserved[PARAMETER_MAX_MEMBER-13]; > + u32 err; > +}; > + > +struct param_dma_input { > + u32 cmd; > + u32 width; > + u32 height; > + u32 format; > + u32 bitwidth; > + u32 plane; > + u32 order; > + u32 buffer_number; > + u32 buffer_address; > + u32 bayer_crop_offset_x; > + u32 bayer_crop_offset_y; > + u32 bayer_crop_width; > + u32 bayer_crop_height; > + u32 dma_crop_offset_x; > + u32 dma_crop_offset_y; > + u32 dma_crop_width; > + u32 dma_crop_height; > + u32 user_min_frametime; > + u32 user_max_frametime; > + u32 wide_frame_gap; > + u32 frame_gap; > + u32 line_gap; > + u32 reserved[PARAMETER_MAX_MEMBER-23]; > + u32 err; > +}; > + > +struct param_otf_output { > + u32 cmd; > + u32 width; > + u32 height; > + u32 format; > + u32 bitwidth; > + u32 order; > + u32 crop_offset_x; > + u32 crop_offset_y; > + u32 reserved[PARAMETER_MAX_MEMBER-9]; > + u32 err; > +}; > + > +struct param_dma_output { > + u32 cmd; > + u32 width; > + u32 height; > + u32 format; > + u32 bitwidth; > + u32 plane; > + u32 order; > + u32 buffer_number; > + u32 buffer_address; > + u32 notify_dma_done; > + u32 dma_out_mask; > + u32 reserved[PARAMETER_MAX_MEMBER-12]; > + u32 err; > +}; > + > +struct param_global_shotmode { > + u32 cmd; > + u32 skip_frames; > + u32 reserved[PARAMETER_MAX_MEMBER-3]; > + u32 err; > +}; > + > +struct param_sensor_framerate { > + u32 frame_rate; > + u32 reserved[PARAMETER_MAX_MEMBER-2]; > + u32 err; > +}; > + > +struct param_isp_aa { > + u32 cmd; > + u32 target; > + u32 mode; > + u32 scene; > + u32 af_touch; > + u32 af_face; > + u32 af_response; > + u32 sleep; > + u32 touch_x; > + u32 touch_y; > + u32 manual_af_setting; > + /*0: Legacy, 1: Camera 2.0*/ > + u32 cam_api2p0; > + /* For android.control.afRegions in Camera 2.0, > + Resolution based on YUV output size*/ > + u32 af_region_left; > + /* For android.control.afRegions in Camera 2.0, > + Resolution based on YUV output size*/ > + u32 af_region_top; > + /* For android.control.afRegions in Camera 2.0, > + Resolution based on YUV output size*/ > + u32 af_region_right; > + /* For android.control.afRegions in Camera 2.0, > + Resolution based on YUV output size*/ > + u32 af_region_bottom; > + u32 reserved[PARAMETER_MAX_MEMBER-17]; > + u32 err; > +}; > + > +struct param_isp_flash { > + u32 cmd; > + u32 redeye; > + u32 flash_intensity; > + u32 reserved[PARAMETER_MAX_MEMBER-4]; > + u32 err; > +}; > + > +struct param_isp_awb { > + u32 cmd; > + u32 illumination; > + u32 reserved[PARAMETER_MAX_MEMBER-3]; > + u32 err; > +}; > + > +struct param_isp_imageeffect { > + u32 cmd; > + u32 reserved[PARAMETER_MAX_MEMBER-2]; > + u32 err; > +}; > + > +struct param_isp_iso { > + u32 cmd; > + u32 value; > + u32 reserved[PARAMETER_MAX_MEMBER-3]; > + u32 err; > +}; > + > +struct param_isp_adjust { > + u32 cmd; > + s32 contrast; > + s32 saturation; > + s32 sharpness; > + s32 exposure; > + s32 brightness; > + s32 hue; > + /* 0 or 1 */ > + u32 hotpixel_enable; > + /* -127 ~ 127 */ > + s32 noise_reduction_strength; > + /* 0 or 1 */ > + u32 shading_correction_enable; > + /* 0 or 1 */ > + u32 user_gamma_enable; > + /* -127 ~ 127 */ > + s32 edge_enhancement_strength; > + /* ISP_AdjustSceneIndexEnum */ > + u32 user_scene_mode; > + u32 min_frametime; > + u32 max_frametime; > + u32 reserved[PARAMETER_MAX_MEMBER-16]; > + u32 err; > +}; > + > +struct param_isp_metering { > + u32 cmd; > + u32 win_pos_x; > + u32 win_pos_y; > + u32 win_width; > + u32 win_height; > + u32 exposure_mode; > + /* 0: Legacy, 1: Camera 2.0 */ > + u32 cam_api2p0; > + u32 reserved[PARAMETER_MAX_MEMBER-8]; > + u32 err; > +}; > + > +struct param_isp_afc { > + u32 cmd; > + u32 manual; > + u32 reserved[PARAMETER_MAX_MEMBER-3]; > + u32 err; > +}; > + > +struct param_scaler_imageeffect { > + u32 cmd; > + u32 reserved[PARAMETER_MAX_MEMBER-2]; > + u32 err; > +}; > + > +struct param_scaler_input_crop { > + u32 cmd; > + u32 pos_x; > + u32 pos_y; > + u32 crop_width; > + u32 crop_height; > + u32 in_width; > + u32 in_height; > + u32 out_width; > + u32 out_height; > + u32 reserved[PARAMETER_MAX_MEMBER-10]; > + u32 err; > +}; > + > +struct param_scaler_output_crop { > + u32 cmd; > + u32 pos_x; > + u32 pos_y; > + u32 crop_width; > + u32 crop_height; > + u32 format; > + u32 reserved[PARAMETER_MAX_MEMBER-7]; > + u32 err; > +}; > + > +struct param_scaler_rotation { > + u32 cmd; > + u32 reserved[PARAMETER_MAX_MEMBER-2]; > + u32 err; > +}; > + > +struct param_scaler_flip { > + u32 cmd; > + u32 reserved[PARAMETER_MAX_MEMBER-2]; > + u32 err; > +}; > + > +struct param_3dnr_1stframe { > + u32 cmd; > + u32 reserved[PARAMETER_MAX_MEMBER-2]; > + u32 err; > +}; > + > +struct param_fd_config { > + u32 cmd; > + u32 max_number; > + u32 roll_angle; > + u32 yaw_angle; > + s32 smile_mode; > + s32 blink_mode; > + u32 eye_detect; > + u32 mouth_detect; > + u32 orientation; > + u32 orientation_value; > + u32 reserved[PARAMETER_MAX_MEMBER-11]; > + u32 err; > +}; > + > +struct global_param { > + struct param_global_shotmode shotmode; /* 0 */ > +}; > + > +/* To be added */ > +struct sensor_param { > + struct param_control control; > + struct param_otf_input otf_input; > + struct param_otf_output otf_output; > + struct param_sensor_framerate frame_rate; > + struct param_dma_output dma_output; > +}; > + > +struct buffer_param { > + struct param_control control; > + struct param_otf_input otf_input; > + struct param_otf_output otf_output; > +}; > + > +struct isp_param { > + struct param_control control; > + struct param_otf_input otf_input; > + struct param_dma_input dma1_input; > + struct param_dma_input dma2_input; > + struct param_isp_aa aa; > + struct param_isp_flash flash; > + struct param_isp_awb awb; > + struct param_isp_imageeffect effect; > + struct param_isp_iso iso; > + struct param_isp_adjust adjust; > + struct param_isp_metering metering; > + struct param_isp_afc afc; > + struct param_otf_output otf_output; > + struct param_dma_output dma1_output; > + struct param_dma_output dma2_output; > +}; > + > +struct drc_param { > + struct param_control control; > + struct param_otf_input otf_input; > + struct param_dma_input dma_input; > + struct param_otf_output otf_output; > +}; > + > +struct scalerc_param { > + struct param_control control; > + struct param_otf_input otf_input; > + struct param_scaler_imageeffect effect; > + struct param_scaler_input_crop input_crop; > + struct param_scaler_output_crop output_crop; > + struct param_otf_output otf_output; > + struct param_dma_output dma_output; > +}; > + > +struct odc_param { > + struct param_control control; > + struct param_otf_input otf_input; > + struct param_otf_output otf_output; > +}; > + > +struct dis_param { > + struct param_control control; > + struct param_otf_input otf_input; > + struct param_otf_output otf_output; > +}; > + > +struct tdnr_param { > + struct param_control control; > + struct param_otf_input otf_input; > + struct param_3dnr_1stframe frame; > + struct param_otf_output otf_output; > + struct param_dma_output dma_output; > +}; > + > +struct scalerp_param { > + struct param_control control; > + struct param_otf_input otf_input; > + struct param_scaler_imageeffect effect; > + struct param_scaler_input_crop input_crop; > + struct param_scaler_output_crop output_crop; > + struct param_scaler_rotation rotation; > + struct param_scaler_flip flip; > + struct param_otf_output otf_output; > + struct param_dma_output dma_output; > +}; > + > +struct fd_param { > + struct param_control control; > + struct param_otf_input otf_input; > + struct param_dma_input dma_input; > + struct param_fd_config config; > +}; > + > +struct is_param_region { > + struct global_param global; > + struct sensor_param sensor; > + struct buffer_param buf; > + struct isp_param isp; > + struct drc_param drc; > + struct scalerc_param scalerc; > + struct odc_param odc; > + struct dis_param dis; > + struct tdnr_param tdnr; > + struct scalerp_param scalerp; > + struct fd_param fd; > +}; > + > +#define NUMBER_OF_GAMMA_CURVE_POINTS 32 > + > +struct is_sensor_tune { > + u32 exposure; > + u32 analog_gain; > + u32 frame_rate; > + u32 actuator_pos; > +}; > + > +struct is_tune_gammacurve { > + u32 num_pts_x[NUMBER_OF_GAMMA_CURVE_POINTS]; > + u32 num_pts_y_r[NUMBER_OF_GAMMA_CURVE_POINTS]; > + u32 num_pts_y_g[NUMBER_OF_GAMMA_CURVE_POINTS]; > + u32 num_pts_y_b[NUMBER_OF_GAMMA_CURVE_POINTS]; > +}; > + > +struct is_isp_tune { > + /* Brightness level : range 0~100, default : 7 */ > + u32 brightness_level; > + /* Contrast level : range -127~127, default : 0 */ > + s32 contrast_level; > + /* Saturation level : range -127~127, default : 0 */ > + s32 saturation_level; > + s32 gamma_level; > + struct is_tune_gammacurve gamma_curve[4]; > + /* Hue : range -127~127, default : 0 */ > + s32 hue; > + /* Sharpness blur : range -127~127, default : 0 */ > + s32 sharpness_blur; > + /* Despeckle : range -127~127, default : 0 */ > + s32 despeckle; > + /* Edge color supression : range -127~127, default : 0 */ > + s32 edge_color_supression; > + /* Noise reduction : range -127~127, default : 0 */ > + s32 noise_reduction; > + /* (32*4 + 9)*4 = 548 bytes */ > +}; > + > +struct is_tune_region { > + struct is_sensor_tune sensor_tune; > + struct is_isp_tune isp_tune; > +}; > + > +struct rational_t { > + u32 num; > + u32 den; > +}; > + > +struct srational_t { > + s32 num; > + s32 den; > +}; > + > +#define FLASH_FIRED_SHIFT 0 > +#define FLASH_NOT_FIRED 0 > +#define FLASH_FIRED 1 > + > +#define FLASH_STROBE_SHIFT 1 > +#define FLASH_STROBE_NO_DETECTION 0 > +#define FLASH_STROBE_RESERVED 1 > +#define FLASH_STROBE_RETURN_LIGHT_NOT_DETECTED 2 > +#define FLASH_STROBE_RETURN_LIGHT_DETECTED 3 > + > +#define FLASH_MODE_SHIFT 3 > +#define FLASH_MODE_UNKNOWN 0 > +#define FLASH_MODE_COMPULSORY_FLASH_FIRING 1 > +#define FLASH_MODE_COMPULSORY_FLASH_SUPPRESSION 2 > +#define FLASH_MODE_AUTO_MODE 3 > + > +#define FLASH_FUNCTION_SHIFT 5 > +#define FLASH_FUNCTION_PRESENT 0 > +#define FLASH_FUNCTION_NONE 1 > + > +#define FLASH_RED_EYE_SHIFT 6 > +#define FLASH_RED_EYE_DISABLED 0 > +#define FLASH_RED_EYE_SUPPORTED 1 > + > +enum apex_aperture_value { > + F1_0 = 0, > + F1_4 = 1, > + F2_0 = 2, > + F2_8 = 3, > + F4_0 = 4, > + F5_6 = 5, > + F8_9 = 6, > + F11_0 = 7, > + F16_0 = 8, > + F22_0 = 9, > + F32_0 = 10, > +}; Exynos4 FIMC-IS driver has similar Flash and APEX aperture definitons. They looks like taken directly from EXIF standard. Perhaps we some EXIF definitions in a standard header file. > +struct exif_attribute { > + struct rational_t exposure_time; > + struct srational_t shutter_speed; > + u32 iso_speed_rating; > + u32 flash; > + struct srational_t brightness; > +}; > + > +struct is_frame_header { > + u32 valid; > + u32 bad_mark; > + u32 captured; > + u32 frame_number; > + struct exif_attribute exif; > +}; > + > +struct is_fd_rect { > + u32 offset_x; > + u32 offset_y; > + u32 width; > + u32 height; > +}; > + > +struct is_face_marker { > + u32 frame_number; > + struct is_fd_rect face; > + struct is_fd_rect left_eye; > + struct is_fd_rect right_eye; > + struct is_fd_rect mouth; > + u32 roll_angle; > + u32 yaw_angle; > + u32 confidence; > + u32 stracked; > + u32 tracked_faceid; > + u32 smile_level; > + u32 blink_level; > +}; > + > +#define MAX_FRAME_COUNT 8 > +#define MAX_FRAME_COUNT_PREVIEW 4 > +#define MAX_FRAME_COUNT_CAPTURE 1 > +#define MAX_FACE_COUNT 16 > + > +#define MAX_SHARED_COUNT 500 > + > +struct is_region { > + struct is_param_region parameter; > + struct is_tune_region tune; > + struct is_frame_header header[MAX_FRAME_COUNT]; > + struct is_face_marker face[MAX_FACE_COUNT]; > + u32 shared[MAX_SHARED_COUNT]; > +}; > + > +struct is_time_measure_us { > + u32 min_time_us; > + u32 max_time_us; > + u32 avrg_time_us; > + u32 current_time_us; > +}; > + > +struct is_debug_frame_descriptor { > + u32 sensor_frame_time; > + u32 sensor_exposure_time; > + u32 sensor_analog_gain; > + u32 req_lei; > +}; > + > +#define MAX_FRAMEDESCRIPTOR_CONTEXT_NUM (30 * 20) /* 600 frame */ s/frame/frames > +#define MAX_VERSION_DISPLAY_BUF (32) > + > +struct is_share_region { > + u32 frame_time; > + u32 exposure_time; > + u32 analog_gain; > + > + u32 r_gain; > + u32 g_gain; > + u32 b_gain; > + > + u32 af_position; > + u32 af_status; > + u32 af_scene_type; > + > + u32 frame_descp_onoff_control; > + u32 frame_descp_update_done; > + u32 frame_descp_idx; > + u32 frame_descp_max_idx; > + > + struct is_debug_frame_descriptor > + dbg_frame_descp_ctx[MAX_FRAMEDESCRIPTOR_CONTEXT_NUM]; > + > + u32 chip_id; > + u32 chip_rev_no; > + u8 ispfw_version_no[MAX_VERSION_DISPLAY_BUF]; > + u8 ispfw_version_date[MAX_VERSION_DISPLAY_BUF]; > + u8 sirc_sdk_version_no[MAX_VERSION_DISPLAY_BUF]; > + u8 sirc_sdk_revsion_no[MAX_VERSION_DISPLAY_BUF]; > + u8 sirc_sdk_version_date[MAX_VERSION_DISPLAY_BUF]; > + > + /*measure timing*/ > + struct is_time_measure_us isp_sdk_time; > +}; > + > +struct is_debug_control { > + u32 write_point; /* 0~500KB boundary*/ > + u32 assert_flag; /* 0:Not Inovked, 1:Invoked*/ s/Inovked/Invoked > + u32 pabort_flag; /* 0:Not Inovked, 1:Invoked*/ > + u32 dabort_flag; /* 0:Not Inovked, 1:Invoked*/ > + u32 pd_ready_flag; /* 0:Normal, 1:EnterIdle(Ready to power down)*/ > + u32 isp_frameerr; /* Frame Error Count.*/ s/frameerr/frame_err ? Is there a need to repeat same comment for all these fields ? Perhaps you could put at the first entry only, e.g. /* Frame error counters */ ? > + u32 drc_frame_err; /* Frame Error Count.*/ > + u32 scc_frame_err; /* Frame Error Count.*/ > + u32 odc_frame_err; /* Frame Error Count.*/ > + u32 dis_frame_err; /* Frame Error Count.*/ > + u32 tdnr_frame_err; /* Frame Error Count.*/ > + u32 scp_frame_err; /* Frame Error Count.*/ > + u32 fd_frame_err; /* Frame Error Count.*/ > + u32 isp_frame_drop; /* Frame Drop Count.*/ And similarly here /* Frame drop counters */ > + u32 drc_frame_drop; /* Frame Drop Count.*/ > + u32 dis_frame_drop; /* Frame Drop Count.*/ > + u32 uifdframedrop; > +}; > + > +#endif Guys, I was wondering how difficult would be to make a common driver for the Exynos4 and Exynos5 FIMC-IS ? My feeling is that it would allow to save significant amount of code, since the hardware has many similarities. I imagine it would be a lot of work, and testing would have been a bit difficult. But would it really to troublesome to make a common driver ? Could you list some arguments against it ? For the MFC we have same driver, handling different firmware versions. Similarly for the other media IPs. Only the FIMC-IS subsystems would have separate drivers. My intentions is really only to reduce the amount of code we would have to merge with this new driver, nothing else. But I'm not going to push for the common driver if this is too much trouble. Thanks, Sylwester ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [RFC v2 03/10] exynos5-fimc-is: Adds common driver header files 2013-06-20 22:46 ` [RFC v2 03/10] exynos5-fimc-is: Adds common driver header files Sylwester Nawrocki @ 2013-06-21 7:14 ` Arun Kumar K 2013-07-09 11:20 ` Arun Kumar K 1 sibling, 0 replies; 15+ messages in thread From: Arun Kumar K @ 2013-06-21 7:14 UTC (permalink / raw) To: Sylwester Nawrocki Cc: Arun Kumar K, LMML, Sylwester Nawrocki, kilyeon.im, shaik.ameer, linux-samsung-soc Hi Sylwester, On Fri, Jun 21, 2013 at 4:16 AM, Sylwester Nawrocki <sylvester.nawrocki@gmail.com> wrote: > Guys, I was wondering how difficult would be to make a common driver > for the Exynos4 and Exynos5 FIMC-IS ? My feeling is that it would allow > to save significant amount of code, since the hardware has many > similarities. I imagine it would be a lot of work, and testing would have > been a bit difficult. But would it really to troublesome to make a common > driver ? Could you list some arguments against it ? For the MFC we have > same driver, handling different firmware versions. Similarly for the other > media IPs. Only the FIMC-IS subsystems would have separate drivers. > My intentions is really only to reduce the amount of code we would have > to merge with this new driver, nothing else. But I'm not going to push > for the common driver if this is too much trouble. We have thought about it while starting the development and major arguments against common driver are : - FIMC-IS IP has significantly changed from Exynos4. In Exynos4, it has sub-components ISP, DRC and FD where as in exynos5, it has ISP, DRC, SCC, ODC, DIS. 3DNR, SCP and FD. - The FW design has changed considerably to make use of camera2 api interface. Most of the code in the new driver is for this FW interface which are done in fimc_is_pipeline.* and fimc_is_interface.*. This is the major reason against a common driver as the new FW expects each input frame to be passed along with the controls in a SHOT command. It is a request-response mode handled per-frame by the FW which is a major design philosophy change from exynos4. - Two scalers introduced in the pipeline capable of DMA out which again changes the pipeline design considerably compared to exynos4. - The only common part of code between exynos 4 and 5 now is in the fimc-isp.c and fimc-is-sensor.c and some control structures in header files. If re-used, only some user controls part can be re-used and most of the code will still be different. >From the exynos5 driver, still the fimc-is-scaler.*, fimc-is-pipeline.*, fimc-is-interface.* has to be retained which constitutes majority of the LOC. Regards Arun ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [RFC v2 03/10] exynos5-fimc-is: Adds common driver header files 2013-06-20 22:46 ` [RFC v2 03/10] exynos5-fimc-is: Adds common driver header files Sylwester Nawrocki 2013-06-21 7:14 ` Arun Kumar K @ 2013-07-09 11:20 ` Arun Kumar K 1 sibling, 0 replies; 15+ messages in thread From: Arun Kumar K @ 2013-07-09 11:20 UTC (permalink / raw) To: Sylwester Nawrocki Cc: Arun Kumar K, LMML, Sylwester Nawrocki, kilyeon.im, shaik.ameer, linux-samsung-soc Hi Sylwester, Thank you for the review. On Fri, Jun 21, 2013 at 4:16 AM, Sylwester Nawrocki <sylvester.nawrocki@gmail.com> wrote: > On 05/31/2013 03:03 PM, Arun Kumar K wrote: >> >> This patch adds all the common header files used by the fimc-is >> driver. It includes the commands for interfacing with the firmware >> and error codes from IS firmware, metadata and command parameter >> definitions. >> >> Signed-off-by: Arun Kumar K<arun.kk@samsung.com> >> Signed-off-by: Kilyeon Im<kilyeon.im@samsung.com> >> --- >> drivers/media/platform/exynos5-is/fimc-is-cmd.h | 201 ++++ >> drivers/media/platform/exynos5-is/fimc-is-err.h | 261 ++++ >> .../media/platform/exynos5-is/fimc-is-metadata.h | 771 ++++++++++++ >> drivers/media/platform/exynos5-is/fimc-is-param.h | 1259 >> ++++++++++++++++++++ >> 4 files changed, 2492 insertions(+) >> create mode 100644 drivers/media/platform/exynos5-is/fimc-is-cmd.h >> create mode 100644 drivers/media/platform/exynos5-is/fimc-is-err.h >> create mode 100644 drivers/media/platform/exynos5-is/fimc-is-metadata.h >> create mode 100644 drivers/media/platform/exynos5-is/fimc-is-param.h >> >> diff --git a/drivers/media/platform/exynos5-is/fimc-is-cmd.h >> b/drivers/media/platform/exynos5-is/fimc-is-cmd.h >> new file mode 100644 >> index 0000000..4adf832 >> --- /dev/null >> +++ b/drivers/media/platform/exynos5-is/fimc-is-cmd.h >> @@ -0,0 +1,201 @@ >> +/* >> + * Samsung Exynos5 SoC series FIMC-IS driver >> + * >> + * Copyright (c) 2013 Samsung Electronics Co., Ltd >> + * Kil-yeon Lim<kilyeon.im@samsung.com> >> + * >> + * This program is free software; you can redistribute it and/or modify >> + * it under the terms of the GNU General Public License version 2 as >> + * published by the Free Software Foundation. >> + */ >> + >> +#ifndef FIMC_IS_CMD_H >> +#define FIMC_IS_CMD_H >> + >> +#define IS_COMMAND_VER 122 /* IS COMMAND VERSION 1.22 */ >> + >> +enum is_cmd { >> + /* HOST -> IS */ >> + HIC_PREVIEW_STILL = 0x1, >> + HIC_PREVIEW_VIDEO, >> + HIC_CAPTURE_STILL, >> + HIC_CAPTURE_VIDEO, >> + HIC_PROCESS_START, >> + HIC_PROCESS_STOP, >> + HIC_STREAM_ON, >> + HIC_STREAM_OFF, >> + HIC_SHOT, >> + HIC_GET_STATIC_METADATA, >> + HIC_SET_CAM_CONTROL, >> + HIC_GET_CAM_CONTROL, >> + HIC_SET_PARAMETER, >> + HIC_GET_PARAMETER, >> + HIC_SET_A5_MEM_ACCESS, >> + RESERVED2, >> + HIC_GET_STATUS, >> + /* SENSOR PART*/ >> + HIC_OPEN_SENSOR, >> + HIC_CLOSE_SENSOR, >> + HIC_SIMMIAN_INIT, >> + HIC_SIMMIAN_WRITE, >> + HIC_SIMMIAN_READ, >> + HIC_POWER_DOWN, >> + HIC_GET_SET_FILE_ADDR, >> + HIC_LOAD_SET_FILE, >> + HIC_MSG_CONFIG, >> + HIC_MSG_TEST, >> + /* IS -> HOST */ >> + IHC_GET_SENSOR_NUMBER = 0x1000, >> + /* Parameter1 : Address of space to copy a setfile */ >> + /* Parameter2 : Space szie */ >> + IHC_SET_SHOT_MARK, >> + /* PARAM1 : a frame number */ >> + /* PARAM2 : confidence level(smile 0~100) */ >> + /* PARMA3 : confidence level(blink 0~100) */ >> + IHC_SET_FACE_MARK, >> + /* PARAM1 : coordinate count */ >> + /* PARAM2 : coordinate buffer address */ >> + IHC_FRAME_DONE, >> + /* PARAM1 : frame start number */ >> + /* PARAM2 : frame count */ >> + IHC_AA_DONE, >> + IHC_NOT_READY, >> + IHC_FLASH_READY >> +}; >> + >> +enum is_reply { >> + ISR_DONE = 0x2000, >> + ISR_NDONE >> +}; >> + >> +enum is_scenario_id { >> + ISS_PREVIEW_STILL, >> + ISS_PREVIEW_VIDEO, >> + ISS_CAPTURE_STILL, >> + ISS_CAPTURE_VIDEO, >> + ISS_END >> +}; >> + >> +enum is_subscenario_id { >> + ISS_SUB_SCENARIO_STILL, >> + ISS_SUB_SCENARIO_VIDEO, >> + ISS_SUB_SCENARIO_SCENE1, >> + ISS_SUB_SCENARIO_SCENE2, >> + ISS_SUB_SCENARIO_SCENE3, >> + ISS_SUB_END >> +}; >> + >> +struct is_setfile_header_element { >> + u32 binary_addr; >> + u32 binary_size; >> +}; >> + >> +struct is_setfile_header { >> + struct is_setfile_header_element isp[ISS_END]; >> + struct is_setfile_header_element drc[ISS_END]; >> + struct is_setfile_header_element fd[ISS_END]; >> +}; >> + >> +struct is_common_reg { >> + u32 hicmd; >> + u32 hic_sensorid; >> + u32 hic_param1; >> + u32 hic_param2; >> + u32 hic_param3; >> + u32 hic_param4; > > > How about replacing the above 4 fields with > > u32 hic_param[4]; > > ? Ok. >> >> + u32 reserved1[3]; >> + >> + u32 ihcmd_iflag; >> + u32 ihcmd; >> + u32 ihc_sensorid; >> + u32 ihc_param1; >> + u32 ihc_param2; >> + u32 ihc_param3; >> + u32 ihc_param4; > > > Similarly, > > u32 ihc_param[4]; > > and for other groups of fields below ? > Will make this change. >> + >> + u32 reserved2[3]; >> + >> + u32 isp_bayer_iflag; >> + u32 isp_bayer_sensor_id; >> diff --git a/drivers/media/platform/exynos5-is/fimc-is-err.h >> b/drivers/media/platform/exynos5-is/fimc-is-err.h >> new file mode 100644 >> index 0000000..49d7cf5 >> --- /dev/null >> +++ b/drivers/media/platform/exynos5-is/fimc-is-err.h >> @@ -0,0 +1,261 @@ >> +/* >> + * Samsung Exynos5 SoC series FIMC-IS driver >> + * >> + * Copyright (c) 2013 Samsung Electronics Co., Ltd >> + * Arun Kumar K<arun.kk@samsung.com> >> + * Kil-yeon Lim<kilyeon.im@samsung.com> >> + * >> + * This program is free software; you can redistribute it and/or modify >> + * it under the terms of the GNU General Public License version 2 as >> + * published by the Free Software Foundation. >> + */ >> + >> +#ifndef FIMC_IS_ERR_H >> +#define FIMC_IS_ERR_H >> + >> +#define IS_ERROR_VER 012 /* IS ERROR VERSION 0.07 */ >> + >> +/* IS error enum */ >> +enum is_error { >> + >> + IS_ERROR_SUCCESS = 0, >> + >> + /* General 1 ~ 100 */ >> + IS_ERROR_INVALID_COMMAND = 1, >> + IS_ERROR_REQUEST_FAIL, >> + IS_ERROR_INVALID_SCENARIO, >> + IS_ERROR_INVALID_SENSORID, >> + IS_ERROR_INVALID_MODE_CHANGE, >> + IS_ERROR_INVALID_MAGIC_NUMBER, >> + IS_ERROR_INVALID_SETFILE_HDR, >> + IS_ERROR_ISP_SETFILE_VERSION_MISMATCH, >> + IS_ERROR_ISP_SETFILE_REVISION_MISMATCH, >> + IS_ERROR_BUSY, >> + IS_ERROR_SET_PARAMETER, >> + IS_ERROR_INVALID_PATH, >> + IS_ERROR_OPEN_SENSOR_FAIL, >> + IS_ERROR_ENTRY_MSG_THREAD_DOWN, >> + IS_ERROR_ISP_FRAME_END_NOT_DONE, >> + IS_ERROR_DRC_FRAME_END_NOT_DONE, >> + IS_ERROR_SCALERC_FRAME_END_NOT_DONE, >> + IS_ERROR_ODC_FRAME_END_NOT_DONE, >> + IS_ERROR_DIS_FRAME_END_NOT_DONE, >> + IS_ERROR_TDNR_FRAME_END_NOT_DONE, >> + IS_ERROR_SCALERP_FRAME_END_NOT_DONE, >> + IS_ERROR_WAIT_STREAM_OFF_NOT_DONE, >> + IS_ERROR_NO_MSG_IS_RECEIVED, >> + IS_ERROR_SENSOR_MSG_FAIL, >> + IS_ERROR_ISP_MSG_FAIL, >> + IS_ERROR_DRC_MSG_FAIL, >> + IS_ERROR_SCALERC_MSG_FAIL, >> + IS_ERROR_ODC_MSG_FAIL, >> + IS_ERROR_DIS_MSG_FAIL, >> + IS_ERROR_TDNR_MSG_FAIL, >> + IS_ERROR_SCALERP_MSG_FAIL, >> + IS_ERROR_LHFD_MSG_FAIL, >> + IS_ERROR_INTERNAL_STOP, >> + IS_ERROR_UNKNOWN, >> + IS_ERROR_TIME_OUT_FLAG, >> + >> + /* Sensor 100 ~ 200 */ >> + IS_ERROR_SENSOR_PWRDN_FAIL = 100, >> + IS_ERROR_SENSOR_STREAM_ON_FAIL, >> + IS_ERROR_SENSOR_STREAM_OFF_FAIL, >> + >> + /* ISP 200 ~ 300 */ >> + IS_ERROR_ISP_PWRDN_FAIL = 200, >> + IS_ERROR_ISP_MULTIPLE_INPUT, >> + IS_ERROR_ISP_ABSENT_INPUT, >> + IS_ERROR_ISP_ABSENT_OUTPUT, >> + IS_ERROR_ISP_NONADJACENT_OUTPUT, >> + IS_ERROR_ISP_FORMAT_MISMATCH, >> + IS_ERROR_ISP_WIDTH_MISMATCH, >> + IS_ERROR_ISP_HEIGHT_MISMATCH, >> + IS_ERROR_ISP_BITWIDTH_MISMATCH, >> + IS_ERROR_ISP_FRAME_END_TIME_OUT, >> + >> + /* DRC 300 ~ 400 */ >> + IS_ERROR_DRC_PWRDN_FAIL = 300, >> + IS_ERROR_DRC_MULTIPLE_INPUT, >> + IS_ERROR_DRC_ABSENT_INPUT, >> + IS_ERROR_DRC_NONADJACENT_INTPUT, >> + IS_ERROR_DRC_ABSENT_OUTPUT, >> + IS_ERROR_DRC_NONADJACENT_OUTPUT, >> + IS_ERROR_DRC_FORMAT_MISMATCH, >> + IS_ERROR_DRC_WIDTH_MISMATCH, >> + IS_ERROR_DRC_HEIGHT_MISMATCH, >> + IS_ERROR_DRC_BITWIDTH_MISMATCH, >> + IS_ERROR_DRC_FRAME_END_TIME_OUT, >> + >> + /*SCALERC(400~500)*/ >> + IS_ERROR_SCALERC_PWRDN_FAIL = 400, >> + >> + /*ODC(500~600)*/ >> + IS_ERROR_ODC_PWRDN_FAIL = 500, >> + >> + /*DIS(600~700)*/ >> + IS_ERROR_DIS_PWRDN_FAIL = 600, >> + >> + /*TDNR(700~800)*/ >> + IS_ERROR_TDNR_PWRDN_FAIL = 700, >> + >> + /*SCALERP(800~900)*/ >> + IS_ERROR_SCALERP_PWRDN_FAIL = 800, >> + >> + /*FD(900~1000)*/ >> + IS_ERROR_FD_PWRDN_FAIL = 900, >> + IS_ERROR_FD_MULTIPLE_INPUT, >> + IS_ERROR_FD_ABSENT_INPUT, >> + IS_ERROR_FD_NONADJACENT_INPUT, >> + IS_ERROR_LHFD_FRAME_END_TIME_OUT, >> +}; >> + >> +/* Set parameter error enum */ >> +enum error { >> + /* Common error (0~99) */ >> + ERROR_COMMON_NO = 0, > > > How about renaming all those ERROR_*_NO symbols to ERROR_*_NONE ? > Ok. >> + ERROR_COMMON_CMD = 1, /* Invalid command*/ >> + ERROR_COMMON_PARAMETER = 2, /* Invalid parameter*/ >> + /* setfile is not loaded before adjusting */ [snip] >> diff --git a/drivers/media/platform/exynos5-is/fimc-is-metadata.h >> b/drivers/media/platform/exynos5-is/fimc-is-metadata.h >> new file mode 100644 >> index 0000000..9738d7d >> --- /dev/null >> +++ b/drivers/media/platform/exynos5-is/fimc-is-metadata.h >> @@ -0,0 +1,771 @@ >> +/* >> + * Samsung EXYNOS5 FIMC-IS (Imaging Subsystem) driver >> + * >> + * Copyright (C) 2013 Samsung Electronics Co., Ltd. >> + * Kil-yeon Lim<kilyeon.im@samsung.com> >> + * Arun Kumar K<arun.kk@samsung.com> >> + * >> + * This program is free software; you can redistribute it and/or modify >> + * it under the terms of the GNU General Public License version 2 as >> + * published by the Free Software Foundation. >> + */ >> + >> +#ifndef FIMC_IS_METADATA_H_ >> +#define FIMC_IS_METADATA_H_ >> + >> +struct rational { >> + uint32_t num; >> + uint32_t den; >> +}; >> + >> +#define CAMERA2_MAX_AVAILABLE_MODE 21 >> +#define CAMERA2_MAX_FACES 16 >> + >> +/* >> + *controls/dynamic metadata >> +*/ >> + >> +enum metadata_mode { >> + METADATA_MODE_NONE, >> + METADATA_MODE_FULL >> +}; >> + >> +struct camera2_request_ctl { >> + uint32_t id; >> + enum metadata_mode metadatamode; >> + uint8_t outputstreams[16]; >> + uint32_t framecount; >> +}; >> + >> +struct camera2_request_dm { >> + uint32_t id; >> + enum metadata_mode metadatamode; >> + uint32_t framecount; >> +}; >> + >> + >> + >> +enum optical_stabilization_mode { >> + OPTICAL_STABILIZATION_MODE_OFF, >> + OPTICAL_STABILIZATION_MODE_ON >> +}; >> + >> +enum lens_facing { >> + LENS_FACING_BACK, >> + LENS_FACING_FRONT >> +}; >> + >> +struct camera2_lens_ctl { >> + uint32_t focusdistance; >> + float aperture; >> + float focallength; >> + float filterdensity; >> + enum optical_stabilization_mode opticalstabilizationmode; >> + > > > Unnecessary empty line. > > Huh, flat number in the kernel ? What are we going to do with those ? > Is this structure going to be needed to be exposed to user space somehow ? > It was used like that in the reference driver from where this include is used as it is. Will remove these as we no longer do that kind of stuff in this re-worked driver. >> +}; >> + >> +struct camera2_lens_dm { >> + uint32_t focusdistance; >> + float aperture; >> + float focalilength; >> + float filterdensity; >> + enum optical_stabilization_mode opticalstabilizationmode; >> + float focusrange[2]; >> +}; >> + >> +struct camera2_lens_sm { >> + float minimumfocusdistance; >> + float hyperfocaldistance; >> + float availablefocalLength[2]; >> + float availableapertures; >> + /*assuming 1 aperture*/ >> + float availablefilterdensities; >> + /*assuming 1 ND filter value*/ >> + enum optical_stabilization_mode availableopticalstabilization; >> + /*assuming 1*/ >> + uint32_t shadingmapsize; >> + float shadingmap[3][40][30]; >> + uint32_t geometriccorrectionmapsize; >> + float >> geometriccorrectionmap[2][3][40][30]; >> + enum lens_facing facing; >> + float position[2]; >> +}; >> + >> +enum sensor_colorfilterarrangement { >> + SENSOR_COLORFILTERARRANGEMENT_RGGB, >> + SENSOR_COLORFILTERARRANGEMENT_GRBG, >> + SENSOR_COLORFILTERARRANGEMENT_GBRG, >> + SENSOR_COLORFILTERARRANGEMENT_BGGR, >> + SENSOR_COLORFILTERARRANGEMENT_RGB > > > Iwonderwhathappenedwithspacesinthoseenumdefinitions.... > Will change it. Had a very good laugh by seeing your comment :) [snip] >> + >> +struct camera2_edge_ctl { >> + enum processing_mode mode; >> + uint32_t strength; >> +}; >> + >> +struct camera2_edge_dm { >> + enum processing_mode mode; >> + uint32_t strength; >> +}; >> + >> +enum scaler_availableformats { > > > Perhaps just 'enum scaler_formats' ? > Ok. >> + SCALER_FORMAT_BAYER_RAW, >> + SCALER_FORMAT_YV12, >> + SCALER_FORMAT_NV21, >> + SCALER_FORMAT_JPEG, >> + SCALER_FORMAT_UNKNOWN >> +}; >> + >> +struct camera2_scaler_ctl { >> + uint32_t cropregion[3]; >> +}; >> + >> +struct camera2_scaler_dm { >> + uint32_t cropregion[3]; >> +}; >> + >> +struct camera2_scaler_sm { >> + enum scaler_availableformats availableformats[4]; >> + /*assuming # of availableFormats = 4*/ > > > nit: Can you please amend all comments in this driver so there are > spaces after '/*' and before '*/' ? > Yes will correct all these comments. >> + uint32_t availablerawsizes; >> + uint64_t availablerawmindurations; >> + /* needs check */ >> + uint32_t availableprocessedsizes[8]; >> + uint64_t availableprocessedmindurations[8]; >> + uint32_t availablejpegsizes[8][2]; >> + uint64_t availablejpegmindurations[8]; >> + uint32_t availablemaxdigitalzoom[8]; >> +}; >> + [snip] >> + >> +/** >> + User-defined control for sensor. >> +*/ >> +struct camera2_sensor_uctl { >> + struct camera2_sensor_ctl ctl; >> + /** Dynamic frame duration. >> + This feature is decided to max. value between >> + 'sensor.exposureTime'+alpha and 'sensor.frameDuration'. >> + */ > > > Wrong comment style, should be: > > /* > * Dynamic frame duration.... > * ... > */ > Ok will change. >> + uint64_t dynamicrrameduration; >> +}; >> + >> +struct camera2_scaler_uctl { >> + /* target address for next frame. >> + [0] invalid address, stop >> + [others] valid address >> + */ >> + uint32_t scctargetaddress[4]; >> + uint32_t scptargetaddress[4]; >> +}; >> + >> +struct camera2_flash_uctl { >> + struct camera2_flash_ctl ctl; >> +}; >> + >> +struct camera2_uctl { >> + /* Set sensor, lens, flash control for next frame. >> + This flag can be combined. >> + [0 bit] lens >> + [1 bit] sensor >> + [2 bit] flash >> + */ >> + uint32_t uupdatebitmap; >> + >> + /** For debugging */ >> + uint32_t uframenumber; >> + >> + /** isp fw specific control(user-defined) of lens. */ >> + struct camera2_lens_uctl lensud; >> + /** isp fw specific control(user-defined) of sensor. */ >> + struct camera2_sensor_uctl sensorud; >> + /** isp fw specific control(user-defined) of flash. */ >> + struct camera2_flash_uctl flashud; >> + >> + struct camera2_scaler_uctl scalerud; >> +}; >> + >> +struct camera2_udm { >> + struct camera2_lens_udm lens; >> +}; >> + >> +struct camera2_shot { >> + /*standard area*/ >> + struct camera2_ctl ctl; >> + struct camera2_dm dm; >> + /*user defined area*/ >> + struct camera2_uctl uctl; >> + struct camera2_udm udm; >> + /*magic : 23456789*/ >> + uint32_t magicnumber; >> +}; >> +#endif >> diff --git a/drivers/media/platform/exynos5-is/fimc-is-param.h >> b/drivers/media/platform/exynos5-is/fimc-is-param.h >> new file mode 100644 >> index 0000000..8eec772 >> --- /dev/null >> +++ b/drivers/media/platform/exynos5-is/fimc-is-param.h >> @@ -0,0 +1,1259 @@ >> +/* >> + * Samsung Exynos5 SoC series FIMC-IS driver >> + * >> + * Copyright (c) 2013 Samsung Electronics Co., Ltd >> + * Kil-yeon Lim<kilyeon.im@samsung.com> >> + * Arun Kumar K<arun.kk@samsung.com> >> + * >> + * This program is free software; you can redistribute it and/or modify >> + * it under the terms of the GNU General Public License version 2 as >> + * published by the Free Software Foundation. >> + */ >> + >> +#ifndef FIMC_IS_PARAM_H >> +#define FIMC_IS_PARAM_H >> + >> +#define IS_REGION_VER 145 /* IS REGION VERSION 1.45 */ >> + >> +/* MACROs */ >> +#define IS_SET_PARAM_BIT(dev, num) \ >> + (num>= 32 ? set_bit((num-32),&dev->p_region_index2) \ >> + : set_bit(num,&dev->p_region_index1)) > > > The bit operation could take a bitmask of arbitrary length, not only 32 > bits. > Could you rework this parameter bitmask handling as is done in this patch > http://git.linuxtv.org/media_tree.git/commitdiff/0e761b21b9d6c7a95a8e2b858af85d07f6c62d99 > ? > > Then some macros below could be removed. > Ok will do that. >> +#define IS_INC_PARAM_NUM(dev) atomic_inc(&dev->p_region_num) >> +#define IS_PARAM_GLOBAL(dev) >> (dev->is_p_region->parameter.global) >> +#define IS_PARAM_ISP(dev) (dev->is_p_region->parameter.isp) >> +#define IS_PARAM_DRC(dev) (dev->is_p_region->parameter.drc) >> +#define IS_PARAM_FD(dev) (dev->is_p_region->parameter.fd) >> +#define IS_HEADER(dev) (dev->is_p_region->header) >> +#define IS_FACE(dev) (dev->is_p_region->face) >> +#define IS_SHARED(dev) (dev->is_shared_region) >> +#define IS_PARAM_SIZE (FIMC_IS_REGION_SIZE + 1) > > > All these are unused. Please double check for any unused code, this driver > has already 8k LOC, and only subset of features are supported :/ > Ok will remove un-used code. >> +#define INC_BIT(bit) (bit<<1) >> +#define INC_NUM(bit) (bit + 1) > > > These two are unused, and a bit odd. Please remove. > Ok. >> +#define MAGIC_NUMBER 0x01020304 >> + >> +#define PARAMETER_MAX_SIZE 128 /* in byte */ >> +#define PARAMETER_MAX_MEMBER (PARAMETER_MAX_SIZE/4) >> + >> +enum is_param_set_bit { >> + PARAM_GLOBAL_SHOTMODE = 0, >> + PARAM_SENSOR_CONTROL, >> + PARAM_SENSOR_OTF_INPUT, >> + PARAM_SENSOR_OTF_OUTPUT, >> + PARAM_SENSOR_FRAME_RATE, >> + PARAM_SENSOR_DMA_OUTPUT, >> + PARAM_BUFFER_CONTROL, >> + PARAM_BUFFER_OTF_INPUT, >> + PARAM_BUFFER_OTF_OUTPUT, >> + PARAM_ISP_CONTROL, >> + PARAM_ISP_OTF_INPUT = 10, >> + PARAM_ISP_DMA1_INPUT, >> + PARAM_ISP_DMA2_INPUT, >> + PARAM_ISP_AA, >> + PARAM_ISP_FLASH, >> + PARAM_ISP_AWB, >> + PARAM_ISP_IMAGE_EFFECT, >> + PARAM_ISP_ISO, >> + PARAM_ISP_ADJUST, >> + PARAM_ISP_METERING, >> + PARAM_ISP_AFC = 20, >> + PARAM_ISP_OTF_OUTPUT, >> + PARAM_ISP_DMA1_OUTPUT, >> + PARAM_ISP_DMA2_OUTPUT, >> + PARAM_DRC_CONTROL, >> + PARAM_DRC_OTF_INPUT, >> + PARAM_DRC_DMA_INPUT, >> + PARAM_DRC_OTF_OUTPUT, >> + PARAM_SCALERC_CONTROL, >> + PARAM_SCALERC_OTF_INPUT, >> + PARAM_SCALERC_IMAGE_EFFECT = 30, >> + PARAM_SCALERC_INPUT_CROP, >> + PARAM_SCALERC_OUTPUT_CROP, >> + PARAM_SCALERC_OTF_OUTPUT, >> + PARAM_SCALERC_DMA_OUTPUT = 34, >> + PARAM_ODC_CONTROL, >> + PARAM_ODC_OTF_INPUT, >> + PARAM_ODC_OTF_OUTPUT, >> + PARAM_DIS_CONTROL, >> + PARAM_DIS_OTF_INPUT, >> + PARAM_DIS_OTF_OUTPUT = 40, >> + PARAM_TDNR_CONTROL, >> + PARAM_TDNR_OTF_INPUT, >> + PARAM_TDNR_1ST_FRAME, >> + PARAM_TDNR_OTF_OUTPUT, >> + PARAM_TDNR_DMA_OUTPUT, >> + PARAM_SCALERP_CONTROL, >> + PARAM_SCALERP_OTF_INPUT, >> + PARAM_SCALERP_IMAGE_EFFECT, >> + PARAM_SCALERP_INPUT_CROP, >> + PARAM_SCALERP_OUTPUT_CROP = 50, >> + PARAM_SCALERP_ROTATION, >> + PARAM_SCALERP_FLIP, >> + PARAM_SCALERP_OTF_OUTPUT, >> + PARAM_SCALERP_DMA_OUTPUT, >> + PARAM_FD_CONTROL, >> + PARAM_FD_OTF_INPUT, >> + PARAM_FD_DMA_INPUT, >> + PARAM_FD_CONFIG = 58, >> + PARAM_END, >> +}; >> + >> +#define ADDRESS_TO_OFFSET(start, end) ((uint32)end - (uint32)start) >> +#define OFFSET_TO_NUM(offset) ((offset)>>6) >> +#define IS_OFFSET_LOWBIT(offset) (OFFSET_TO_NUM(offset)>= \ >> + 32 ? false : true) >> +#define OFFSET_TO_BIT(offset) \ >> + {(IS_OFFSET_LOWBIT(offset) ? (1<<OFFSET_TO_NUM(offset)) \ >> + : (1<<(OFFSET_TO_NUM(offset)-32))} >> +#define LOWBIT_OF_NUM(num) (num>= 32 ? 0 : BIT0<<num) >> +#define HIGHBIT_OF_NUM(num) (num>= 32 ? BIT0<<(num-32) : 0) >> + >> +#define PARAM_LOW_MASK (0xFFFFFFFF) >> +#define PARAM_HIGH_MASK (0x07FFFFFF) > > > These guys are going to be redundant when you rework the parameter bitmask > handling as suggested above. > Ok. Regards Arun ^ permalink raw reply [flat|nested] 15+ messages in thread
[parent not found: <1370005408-10853-6-git-send-email-arun.kk@samsung.com>]
* Re: [RFC v2 05/10] exynos5-fimc-is: Adds the sensor subdev [not found] ` <1370005408-10853-6-git-send-email-arun.kk@samsung.com> @ 2013-06-20 23:04 ` Sylwester Nawrocki 2013-07-09 12:01 ` Arun Kumar K 0 siblings, 1 reply; 15+ messages in thread From: Sylwester Nawrocki @ 2013-06-20 23:04 UTC (permalink / raw) To: Arun Kumar K Cc: linux-media, s.nawrocki, kilyeon.im, shaik.ameer, arunkk.samsung, linux-samsung-soc On 05/31/2013 03:03 PM, Arun Kumar K wrote: > FIMC-IS uses certain sensors which are exclusively controlled > from the IS firmware. This patch adds the sensor subdev for the > fimc-is sensors. > > Signed-off-by: Arun Kumar K<arun.kk@samsung.com> > Signed-off-by: Kilyeon Im<kilyeon.im@samsung.com> > --- > drivers/media/platform/exynos5-is/fimc-is-sensor.c | 463 ++++++++++++++++++++ > drivers/media/platform/exynos5-is/fimc-is-sensor.h | 168 +++++++ > 2 files changed, 631 insertions(+) > create mode 100644 drivers/media/platform/exynos5-is/fimc-is-sensor.c > create mode 100644 drivers/media/platform/exynos5-is/fimc-is-sensor.h > > diff --git a/drivers/media/platform/exynos5-is/fimc-is-sensor.c b/drivers/media/platform/exynos5-is/fimc-is-sensor.c > new file mode 100644 > index 0000000..b8fb834 > --- /dev/null > +++ b/drivers/media/platform/exynos5-is/fimc-is-sensor.c > @@ -0,0 +1,463 @@ > +/* > + * Samsung EXYNOS5250 FIMC-IS (Imaging Subsystem) driver > + * > + * Copyright (C) 2013 Samsung Electronics Co., Ltd. > + * Arun Kumar K<arun.kk@samsung.com> > + * Kil-yeon Lim<kilyeon.im@samsung.com> > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 as > + * published by the Free Software Foundation. > + */ > + > +#include<linux/gpio.h> > +#include<linux/of_gpio.h> > +#include<linux/i2c.h> > +#include<linux/of.h> > +#include<linux/of_platform.h> > +#include<media/v4l2-of.h> > +#include "fimc-is-sensor.h" > +#include "fimc-is.h" > + > +#define DRIVER_NAME "fimc-is-sensor" > + > +static char *sensor_clock_name[] = { > + [SCLK_BAYER] = "sclk_bayer", > + [SCLK_CAM0] = "sclk_cam0", > + [SCLK_CAM1] = "sclk_cam1", > +}; > + > +/* Sensor supported formats */ > +static struct v4l2_mbus_framefmt sensor_formats[FIMC_IS_MAX_SENSORS] = { > + [SENSOR_S5K4E5] = { > + .width = SENSOR_4E5_WIDTH + 16, > + .height = SENSOR_4E5_HEIGHT + 10, > + .code = V4L2_MBUS_FMT_SGRBG10_1X10, > + .field = V4L2_FIELD_NONE, > + .colorspace = V4L2_COLORSPACE_SRGB, > + }, > + [SENSOR_S5K6A3] = { > + .width = SENSOR_6A3_WIDTH + 16, > + .height = SENSOR_6A3_HEIGHT + 10, > + .code = V4L2_MBUS_FMT_SGRBG10_1X10, > + .field = V4L2_FIELD_NONE, > + .colorspace = V4L2_COLORSPACE_SRGB, > + }, > +}; > + > +static struct fimc_is_sensor *sd_to_fimc_is_sensor(struct v4l2_subdev *sd) > +{ > + return container_of(sd, struct fimc_is_sensor, subdev); > +} > + > +static void sensor_clk_put(struct fimc_is_sensor *sensor) > +{ > + int i; > + > + for (i = 0; i< SCLK_MAX_NUM; i++) { > + if (IS_ERR(sensor->clock[i])) > + continue; > + clk_unprepare(sensor->clock[i]); > + clk_put(sensor->clock[i]); > + sensor->clock[i] = ERR_PTR(-EINVAL); > + } > +} > + > +static int sensor_clk_init(struct fimc_is_sensor *sensor) > +{ > + int i, ret; > + > + /* Get CAM clocks */ > + for (i = 0; i< SCLK_MAX_NUM; i++) { > + sensor->clock[i] = clk_get(NULL, sensor_clock_name[i]); > + if (IS_ERR(sensor->clock[i])) > + goto err; > + ret = clk_prepare(sensor->clock[i]); > + if (ret< 0) { > + clk_put(sensor->clock[i]); > + sensor->clock[i] = ERR_PTR(-EINVAL); > + goto err; > + } > + } > + > + /* Set clock rates */ > + ret = clk_set_rate(sensor->clock[SCLK_CAM0], 24 * 1000000); > + ret |= clk_set_rate(sensor->clock[SCLK_BAYER], 24 * 1000000); Please don't obfuscate the return value. > + if (ret) { > + pr_err("Failed to set cam clock rates\n"); > + goto err; > + } > + return 0; > +err: > + sensor_clk_put(sensor); > + pr_err("Failed to init sensor clock\n"); > + return -ENXIO; > +} > + > +static int sensor_clk_enable(struct fimc_is_sensor *sensor) > +{ > + int ret = 0, i; > + > + for (i = 0; i< SCLK_MAX_NUM; i++) { > + ret = clk_enable(sensor->clock[i]); > + if (ret) > + return ret; > + } Oh, so you enable all clocks in this driver ? Is it really flexible enough ? What if one of these clocks is connected to some external sensor with an ISP ? Are this clocks going to be managed/exposed by the media device driver as well ? > + return ret; > +} > + > +static void sensor_clk_disable(struct fimc_is_sensor *sensor) > +{ > + int i; > + > + for (i = 0; i< SCLK_MAX_NUM; i++) > + clk_disable(sensor->clock[i]); > +} > + > +static int sensor_enum_mbus_code(struct v4l2_subdev *sd, > + struct v4l2_subdev_fh *fh, > + struct v4l2_subdev_mbus_code_enum *code) > +{ > + struct fimc_is_sensor *sensor = sd_to_fimc_is_sensor(sd); > + struct fimc_is_sensor_drv_data *sdata = sensor->drvdata; > + > + if (!code) > + return -EINVAL; > + > + code->code = sensor_formats[sdata->sensor_id].code; > + return 0; > +} > + > +static int sensor_set_fmt(struct v4l2_subdev *sd, > + struct v4l2_subdev_fh *fh, > + struct v4l2_subdev_format *fmt) > +{ > + struct fimc_is_sensor *sensor = sd_to_fimc_is_sensor(sd); > + struct fimc_is_sensor_drv_data *sdata = sensor->drvdata; > + struct v4l2_mbus_framefmt *sfmt =&fmt->format; > + > + if ((sfmt->width != sensor_formats[sdata->sensor_id].width) || > + (sfmt->height != sensor_formats[sdata->sensor_id].height) || > + (sfmt->code != sensor_formats[sdata->sensor_id].code)) Couldn't this check be just dropped ? > + *sfmt = sensor_formats[sdata->sensor_id]; > + > + return 0; > +} > + > +static int sensor_get_fmt(struct v4l2_subdev *sd, > + struct v4l2_subdev_fh *fh, > + struct v4l2_subdev_format *fmt) > +{ > + struct fimc_is_sensor *sensor = sd_to_fimc_is_sensor(sd); > + struct fimc_is_sensor_drv_data *sdata = sensor->drvdata; > + > + fmt->format = sensor_formats[sdata->sensor_id]; > + return 0; > +} > + > +static struct v4l2_subdev_pad_ops sensor_pad_ops = { > + .enum_mbus_code = sensor_enum_mbus_code, > + .get_fmt = sensor_get_fmt, > + .set_fmt = sensor_set_fmt, > +}; > + > +static int sensor_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) > +{ > + struct v4l2_mbus_framefmt *format = v4l2_subdev_get_try_format(fh, 0); > + > + *format = sensor_formats[0]; > + return 0; > +} > + > +static const struct v4l2_subdev_internal_ops sensor_sd_internal_ops = { > + .open = sensor_open, > +}; > + > +static int sensor_s_power(struct v4l2_subdev *sd, int on) > +{ > + struct fimc_is_sensor *sensor = sd_to_fimc_is_sensor(sd); > + > + if (on) { > + /* Power on sensor */ > + sensor_clk_enable(sensor); The return value from at least this function should not be ignored. > + gpio_set_value(sensor->gpio_reset, 1); > + } else { > + /* Power off sensor */ > + gpio_set_value(sensor->gpio_reset, 0); > + sensor_clk_disable(sensor); > + } > + return 0; > +} > + > +static struct v4l2_subdev_core_ops sensor_core_ops = { > + .s_power = sensor_s_power, > +}; > + > +static int sensor_s_stream(struct v4l2_subdev *sd, int enable) > +{ > + struct fimc_is_sensor *sensor = sd_to_fimc_is_sensor(sd); > + int ret; > + > + if (enable) { > + pr_debug("Stream ON\n"); > + /* Open pipeline */ > + ret = fimc_is_pipeline_open(sensor->pipeline, sensor); > + if (ret< 0) { > + pr_err("Pipeline already opened.\n"); > + return -EBUSY; > + } 'fimc_is_pipeline_' might be a bit confusing prefix for these FIMC-IS firmware interface functions, perhaps fimc_ischain_ or something similar would be more explicit. But that's just my personal impression, let's don't bother with it. > + /* Start IS pipeline */ > + ret = fimc_is_pipeline_start(sensor->pipeline); OK, using the FIMC-IS firmware interface calls from within the subdev drivers is fine. But does the whole pipeline need to be initialized, the firmware and the setfile loaded and devices powered on from within the sensor's subdev s_stream() operation ? This is what really bother me most in the current design. Why couldn't the media device driver handle dependencies between the subdevs, e.g. when sensor -> mipi-csis -> fimc-lite -> memory processing pipeline is started, couldn't it call s_power/s_stream on the ISP subdev when those calls are made on the sensor subdev ? > + if (ret< 0) { > + pr_err("Pipeline start failed.\n"); > + return -EINVAL; return ret; ? > + } > + } else { > + pr_debug("Stream OFF\n"); > + /* Stop IS pipeline */ > + ret = fimc_is_pipeline_stop(sensor->pipeline); > + if (ret< 0) { > + pr_err("Pipeline stop failed.\n"); > + return -EINVAL; return ret; ? > + } > + > + /* Close pipeline */ > + ret = fimc_is_pipeline_close(sensor->pipeline); > + if (ret< 0) { > + pr_err("Pipeline close failed\n"); > + return -EBUSY; > + } > + } > + > + return 0; > +} > + > +static const struct v4l2_subdev_video_ops sensor_video_ops = { > + .s_stream = sensor_s_stream, > +}; > + > +static struct v4l2_subdev_ops sensor_subdev_ops = { > + .core =&sensor_core_ops, > + .pad =&sensor_pad_ops, > + .video =&sensor_video_ops, > +}; > + > +static int sensor_parse_dt(struct fimc_is_sensor *sensor, > + struct device_node *sensor_node) > +{ > + struct device_node *port, *ep, *remote, *fimc_is_node, *camera; > + struct fimc_is *is_data; > + struct platform_device *pdev_is; > + struct v4l2_of_endpoint endpoint; > + /* Parse ports */ > + port = sensor_node; > + while ((port = of_get_next_child(port, NULL))) { > + if (!of_node_cmp(port->name, "port")) > + break; > + of_node_put(port); > + }; > + if (!port) { > + pr_err("Sensor port undefined\n"); > + return -EINVAL; > + } > + > + ep = of_get_next_child(port, NULL); > + if (!ep) > + return -EINVAL; > + > + port = of_parse_phandle(ep, "remote-endpoint", 0); > + if (port) { > + v4l2_of_parse_endpoint(port,&endpoint); > + sensor->i2c_ch = (endpoint.port>> 2)& 0x1; > + } Couldn't some of this code be replaced with v4l2_of_get_next_endpoint() ? > + remote = v4l2_of_get_remote_port_parent(ep); > + of_node_put(ep); > + > + if (!remote) > + return -EINVAL; > + > + camera = of_get_parent(remote); > + fimc_is_node = NULL; > + while ((fimc_is_node = of_get_next_child(camera, fimc_is_node))) { > + if (!of_node_cmp(fimc_is_node->name, "fimc-is")) > + break; > + of_node_put(fimc_is_node); > + }; > + of_node_put(camera); > + > + if (!fimc_is_node) > + return -EINVAL; > + > + /* Get the IS pipeline context */ > + pdev_is = of_find_device_by_node(fimc_is_node); > + is_data = dev_get_drvdata(&pdev_is->dev); > + > + if (!is_data) > + return -EINVAL; > + > + sensor->pipeline =&is_data->pipeline; > + > + return 0; > +} > + > +static const struct of_device_id fimc_is_sensor_of_match[]; > + > +static int fimc_is_sensor_probe(struct i2c_client *client, > + const struct i2c_device_id *id) > +{ > + struct device *dev =&client->dev; > + struct fimc_is_sensor *sensor; > + const struct of_device_id *of_id; > + struct v4l2_subdev *sd; > + int gpio, ret; > + unsigned int sensor_id; > + > + sensor = devm_kzalloc(dev, sizeof(*sensor), GFP_KERNEL); > + if (!sensor) > + return -ENOMEM; > + > + sensor->gpio_reset = -EINVAL; > + > + gpio = of_get_gpio_flags(dev->of_node, 0, NULL); > + if (gpio_is_valid(gpio)) { > + ret = gpio_request_one(gpio, GPIOF_OUT_INIT_LOW, DRIVER_NAME); You could use devm_gpio_request_one, so the GPIO is properly freed on the driver's removal. You should test this driver built as a module as well. > + if (ret< 0) > + return ret; > + } > + pr_err("GPIO Request success : %d", gpio); pr_debug() or needs to be removed. > + sensor->gpio_reset = gpio; > + > + of_id = of_match_node(fimc_is_sensor_of_match, dev->of_node); > + if (!of_id) { > + ret = -ENODEV; > + goto err_gpio; > + } > + > + sensor->drvdata = (struct fimc_is_sensor_drv_data *) of_id->data; No need for casting. Just make struct fimc_is_sensor:drvdata 'const'. > + sensor->dev = dev; > + > + /* Get FIMC-IS context */ > + ret = sensor_parse_dt(sensor, dev->of_node); > + if (ret) { > + pr_err("Unable to obtain IS context\n"); > + ret = -ENODEV; Is overwriting ret really needed ? > + goto err_gpio; > + } > + > + sd =&sensor->subdev; > + v4l2_i2c_subdev_init(sd, client,&sensor_subdev_ops); > + snprintf(sd->name, sizeof(sd->name), sensor->drvdata->sensor_name); > + sensor->subdev.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE; > + > + sensor_id = sensor->drvdata->sensor_id; > + sensor->format.code = sensor_formats[sensor_id].code; > + sensor->format.width = sensor_formats[sensor_id].width; > + sensor->format.height = sensor_formats[sensor_id].height; > + > + sensor->pad.flags = MEDIA_PAD_FL_SOURCE; > + ret = media_entity_init(&sd->entity, 1,&sensor->pad, 0); > + if (ret< 0) > + goto err_gpio; > + > + v4l2_set_subdevdata(sd, sensor); > + i2c_set_clientdata(client,&sensor->subdev); > + > + pm_runtime_no_callbacks(dev); > + pm_runtime_enable(dev); > + sensor_clk_init(sensor); > + > + return 0; > +err_gpio: > + if (gpio_is_valid(sensor->gpio_reset)) > + gpio_free(sensor->gpio_reset); > + return ret; > +} > + > +static int fimc_is_sensor_remove(struct i2c_client *client) > +{ > + struct v4l2_subdev *sd = i2c_get_clientdata(client); > + struct fimc_is_sensor *sensor = sd_to_fimc_is_sensor(sd); > + > + media_entity_cleanup(&sensor->subdev.entity); > + sensor_clk_put(sensor); > + > + return 0; > +} > + > +static const struct i2c_device_id fimc_is_sensor_ids[] = { > + { } > +}; > + > +static const struct fimc_is_sensor_drv_data s5k4e5_drvdata = { > + .sensor_id = SENSOR_S5K4E5, > + .sensor_name = "s5k4e5", > + .pixel_width = SENSOR_4E5_WIDTH + 16, > + .pixel_height = SENSOR_4E5_HEIGHT + 10, > + .active_width = SENSOR_4E5_WIDTH, > + .active_height = SENSOR_4E5_HEIGHT, > + .max_framerate = 30, > + .setfile_name = "setfile_4e5.bin", > + .ext = { > + .actuator_con = { > + .product_name = ACTUATOR_NAME_DWXXXX, > + .peri_type = SE_I2C, > + .peri_setting.i2c.channel = SENSOR_CONTROL_I2C0, > + }, > + .flash_con = { > + .product_name = FLADRV_NAME_KTD267, > + .peri_type = SE_GPIO, > + .peri_setting.gpio.first_gpio_port_no = 1, > + .peri_setting.gpio.second_gpio_port_no = 2, > + }, > + .from_con.product_name = FROMDRV_NAME_NOTHING, > + .mclk = 0, > + .mipi_lane_num = 0, > + .mipi_speed = 0, > + .fast_open_sensor = 0, > + .self_calibration_mode = 0, > + }, > +}; > + > +static const struct fimc_is_sensor_drv_data s5k6a3_drvdata = { > + .sensor_id = SENSOR_S5K6A3, > + .sensor_name = "s5k6a3", > + .pixel_width = SENSOR_6A3_WIDTH + 16, > + .pixel_height = SENSOR_6A3_HEIGHT + 10, > + .active_width = SENSOR_6A3_WIDTH, > + .active_height = SENSOR_6A3_HEIGHT, > + .max_framerate = 30, > + .setfile_name = "setfile_6a3.bin", > +}; > + > +static const struct of_device_id fimc_is_sensor_of_match[] = { > + { > + .compatible = "samsung,s5k4e5", > + .data =&s5k4e5_drvdata, > + }, > + { > + .compatible = "samsung,s5k6a3", > + .data =&s5k6a3_drvdata, > + }, > + { } > +}; > +MODULE_DEVICE_TABLE(of, fimc_is_sensor_of_match); > + > +static struct i2c_driver fimc_is_sensor_driver = { > + .driver = { > + .of_match_table = fimc_is_sensor_of_match, > + .name = DRIVER_NAME, > + .owner = THIS_MODULE, > + }, > + .probe = fimc_is_sensor_probe, > + .remove = fimc_is_sensor_remove, > + .id_table = fimc_is_sensor_ids, > +}; > + > +module_i2c_driver(fimc_is_sensor_driver); > + > +MODULE_AUTHOR("Arun Kumar K<arun.kk@samsung.com>"); > +MODULE_DESCRIPTION("Exynos5 FIMC-IS sensor subdev driver"); > +MODULE_LICENSE("GPL"); > diff --git a/drivers/media/platform/exynos5-is/fimc-is-sensor.h b/drivers/media/platform/exynos5-is/fimc-is-sensor.h > new file mode 100644 > index 0000000..75e5f20 > --- /dev/null > +++ b/drivers/media/platform/exynos5-is/fimc-is-sensor.h > @@ -0,0 +1,168 @@ > +/* > + * Samsung EXYNOS5250 FIMC-IS (Imaging Subsystem) driver > + * > + * Copyright (C) 2013 Samsung Electronics Co., Ltd. > + * Arun Kumar K<arun.kk@samsung.com> > + * Kil-yeon Lim<kilyeon.im@samsung.com> > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 as > + * published by the Free Software Foundation. > + */ > +#ifndef FIMC_IS_SENSOR_H_ > +#define FIMC_IS_SENSOR_H_ > + > +#include<linux/clk.h> > +#include<linux/device.h> > +#include<linux/kernel.h> > +#include<linux/platform_device.h> > +#include<linux/regulator/consumer.h> > +#include<linux/videodev2.h> > +#include<media/v4l2-subdev.h> > + > +#include "fimc-is-pipeline.h" > + > +#define FIMC_IS_MAX_CAMIF_CLIENTS 2 > +#define FIMC_IS_MAX_NAME_LEN 32 > +#define FIMC_IS_MAX_GPIO_NUM 32 > +#define UART_ISP_SEL 0 > +#define UART_ISP_RATIO 1 > + > +#define FIMC_IS_MAX_SENSORS 4 > + > +#define SENSOR_4E5_WIDTH 2560 > +#define SENSOR_4E5_HEIGHT 1920 > +#define SENSOR_6A3_WIDTH 1392 > +#define SENSOR_6A3_HEIGHT 1392 > + > +enum sensor_id { > + SENSOR_S5K3H2 = 1, > + SENSOR_S5K6A3 = 2, > + SENSOR_S5K4E5 = 3, > + SENSOR_S5K3H7 = 4, > + SENSOR_CUSTOM = 100, > + SENSOR_END > +}; > + > +enum sensor_channel { > + SENSOR_CONTROL_I2C0 = 0, > + SENSOR_CONTROL_I2C1 = 1 > +}; > + > +enum actuator_name { > + ACTUATOR_NAME_AD5823 = 1, > + ACTUATOR_NAME_DWXXXX = 2, > + ACTUATOR_NAME_AK7343 = 3, > + ACTUATOR_NAME_HYBRIDVCA = 4, > + ACTUATOR_NAME_NOTHING = 100, > + ACTUATOR_NAME_END > +}; > + > +enum flash_drv_name { > + FLADRV_NAME_KTD267 = 1, > + FLADRV_NAME_NOTHING = 100, > + FLADRV_NAME_END > +}; > + > +enum from_name { > + FROMDRV_NAME_W25Q80BW = 1, > + FROMDRV_NAME_NOTHING > +}; > + > +enum sensor_peri_type { > + SE_I2C, > + SE_SPI, > + SE_GPIO, > + SE_MPWM, > + SE_ADC, > + SE_NULL > +}; > + > +struct i2c_type { > + u32 channel; > + u32 slave_address; > + u32 speed; > +}; > + > +struct spi_type { > + u32 channel; > +}; > + > +struct gpio_type { > + u32 first_gpio_port_no; > + u32 second_gpio_port_no; > +}; > + > +union sensor_peri_format { > + struct i2c_type i2c; > + struct spi_type spi; > + struct gpio_type gpio; > +}; > + > +struct sensor_protocol { > + unsigned int product_name; > + enum sensor_peri_type peri_type; > + union sensor_peri_format peri_setting; > +}; > + > +struct fimc_is_sensor_ext { > + struct sensor_protocol actuator_con; > + struct sensor_protocol flash_con; > + struct sensor_protocol from_con; > + > + unsigned int mclk; > + unsigned int mipi_lane_num; > + unsigned int mipi_speed; > + unsigned int fast_open_sensor; > + unsigned int self_calibration_mode; > +}; > + > +struct fimc_is_sensor_drv_data { > + unsigned int sensor_id; > + char *sensor_name; > + unsigned int pixel_width; > + unsigned int pixel_height; > + unsigned int active_width; > + unsigned int active_height; > + unsigned int max_framerate; > + struct fimc_is_sensor_ext ext; > + char *setfile_name; > +}; > + > +enum sensor_clks { > + SCLK_BAYER, > + SCLK_CAM0, > + SCLK_CAM1, > + SCLK_MAX_NUM, > +}; > + > +struct sensor_pix_format { > + enum v4l2_mbus_pixelcode code; > +}; > + > +/** > + * struct fimc_is_sensor - fimc-is sensor context > + * @pad: media pad > + * @subdev: sensor subdev > + * @clock: sensor clocks array > + * @dev: sensor device ptr > + * @pipeline: is pipeline context pointer > + * @drvdata: sensor specific driver data > + * @format: v4l2 mbus format for the subdev > + * @gpio_reset: gpio pin to be used for sensor power on/off > + * @i2c_ch: sensor's i2c channel number > + */ > +struct fimc_is_sensor { > + struct media_pad pad; > + struct v4l2_subdev subdev; > + struct clk *clock[SCLK_MAX_NUM]; > + struct device *dev; > + > + struct fimc_is_pipeline *pipeline; > + struct fimc_is_sensor_drv_data *drvdata; > + struct v4l2_mbus_framefmt format; > + int gpio_reset; > + unsigned int i2c_ch; > +}; > + > +#endif /* FIMC_IS_SENSOR_H_ */ Thanks, Sylwester ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [RFC v2 05/10] exynos5-fimc-is: Adds the sensor subdev 2013-06-20 23:04 ` [RFC v2 05/10] exynos5-fimc-is: Adds the sensor subdev Sylwester Nawrocki @ 2013-07-09 12:01 ` Arun Kumar K 0 siblings, 0 replies; 15+ messages in thread From: Arun Kumar K @ 2013-07-09 12:01 UTC (permalink / raw) To: Sylwester Nawrocki Cc: Arun Kumar K, LMML, Sylwester Nawrocki, kilyeon.im, shaik.ameer, linux-samsung-soc Hi Sylwester, Thank you for the review. On Fri, Jun 21, 2013 at 4:34 AM, Sylwester Nawrocki <sylvester.nawrocki@gmail.com> wrote: > On 05/31/2013 03:03 PM, Arun Kumar K wrote: >> >> FIMC-IS uses certain sensors which are exclusively controlled >> from the IS firmware. This patch adds the sensor subdev for the >> fimc-is sensors. >> >> Signed-off-by: Arun Kumar K<arun.kk@samsung.com> >> Signed-off-by: Kilyeon Im<kilyeon.im@samsung.com> >> --- >> drivers/media/platform/exynos5-is/fimc-is-sensor.c | 463 >> ++++++++++++++++++++ >> drivers/media/platform/exynos5-is/fimc-is-sensor.h | 168 +++++++ >> 2 files changed, 631 insertions(+) >> create mode 100644 drivers/media/platform/exynos5-is/fimc-is-sensor.c >> create mode 100644 drivers/media/platform/exynos5-is/fimc-is-sensor.h >> >> diff --git a/drivers/media/platform/exynos5-is/fimc-is-sensor.c >> b/drivers/media/platform/exynos5-is/fimc-is-sensor.c >> new file mode 100644 >> index 0000000..b8fb834 >> --- /dev/null >> +++ b/drivers/media/platform/exynos5-is/fimc-is-sensor.c >> @@ -0,0 +1,463 @@ >> +/* >> + * Samsung EXYNOS5250 FIMC-IS (Imaging Subsystem) driver >> + * >> + * Copyright (C) 2013 Samsung Electronics Co., Ltd. >> + * Arun Kumar K<arun.kk@samsung.com> >> + * Kil-yeon Lim<kilyeon.im@samsung.com> >> + * >> + * This program is free software; you can redistribute it and/or modify >> + * it under the terms of the GNU General Public License version 2 as >> + * published by the Free Software Foundation. >> + */ >> + >> +#include<linux/gpio.h> >> +#include<linux/of_gpio.h> >> +#include<linux/i2c.h> >> +#include<linux/of.h> >> +#include<linux/of_platform.h> >> +#include<media/v4l2-of.h> >> +#include "fimc-is-sensor.h" >> +#include "fimc-is.h" >> + >> +#define DRIVER_NAME "fimc-is-sensor" >> + >> +static char *sensor_clock_name[] = { >> + [SCLK_BAYER] = "sclk_bayer", >> + [SCLK_CAM0] = "sclk_cam0", >> + [SCLK_CAM1] = "sclk_cam1", >> +}; >> + >> +/* Sensor supported formats */ >> +static struct v4l2_mbus_framefmt sensor_formats[FIMC_IS_MAX_SENSORS] = { >> + [SENSOR_S5K4E5] = { >> + .width = SENSOR_4E5_WIDTH + 16, >> + .height = SENSOR_4E5_HEIGHT + 10, >> + .code = V4L2_MBUS_FMT_SGRBG10_1X10, >> + .field = V4L2_FIELD_NONE, >> + .colorspace = V4L2_COLORSPACE_SRGB, >> + }, >> + [SENSOR_S5K6A3] = { >> + .width = SENSOR_6A3_WIDTH + 16, >> + .height = SENSOR_6A3_HEIGHT + 10, >> + .code = V4L2_MBUS_FMT_SGRBG10_1X10, >> + .field = V4L2_FIELD_NONE, >> + .colorspace = V4L2_COLORSPACE_SRGB, >> + }, >> +}; >> + >> +static struct fimc_is_sensor *sd_to_fimc_is_sensor(struct v4l2_subdev >> *sd) >> +{ >> + return container_of(sd, struct fimc_is_sensor, subdev); >> +} >> + >> +static void sensor_clk_put(struct fimc_is_sensor *sensor) >> +{ >> + int i; >> + >> + for (i = 0; i< SCLK_MAX_NUM; i++) { >> + if (IS_ERR(sensor->clock[i])) >> + continue; >> + clk_unprepare(sensor->clock[i]); >> + clk_put(sensor->clock[i]); >> + sensor->clock[i] = ERR_PTR(-EINVAL); >> + } >> +} >> + >> +static int sensor_clk_init(struct fimc_is_sensor *sensor) >> +{ >> + int i, ret; >> + >> + /* Get CAM clocks */ >> + for (i = 0; i< SCLK_MAX_NUM; i++) { >> + sensor->clock[i] = clk_get(NULL, sensor_clock_name[i]); >> + if (IS_ERR(sensor->clock[i])) >> + goto err; >> + ret = clk_prepare(sensor->clock[i]); >> + if (ret< 0) { >> + clk_put(sensor->clock[i]); >> + sensor->clock[i] = ERR_PTR(-EINVAL); >> + goto err; >> + } >> + } >> + >> + /* Set clock rates */ >> + ret = clk_set_rate(sensor->clock[SCLK_CAM0], 24 * 1000000); >> + ret |= clk_set_rate(sensor->clock[SCLK_BAYER], 24 * 1000000); > > > Please don't obfuscate the return value. > > Ok >> + if (ret) { >> + pr_err("Failed to set cam clock rates\n"); >> + goto err; >> + } >> + return 0; >> +err: >> + sensor_clk_put(sensor); >> + pr_err("Failed to init sensor clock\n"); >> + return -ENXIO; > > >> +} >> + >> +static int sensor_clk_enable(struct fimc_is_sensor *sensor) >> +{ >> + int ret = 0, i; >> + >> + for (i = 0; i< SCLK_MAX_NUM; i++) { >> + ret = clk_enable(sensor->clock[i]); >> + if (ret) >> + return ret; >> + } > > > Oh, so you enable all clocks in this driver ? Is it really flexible > enough ? What if one of these clocks is connected to some external > sensor with an ISP ? Are this clocks going to be managed/exposed by > the media device driver as well ? > I was hoping that this driver can handle all its clocks as exposed from the DT. I can see that in exynos4, the media device enables the cam clocks. In exynos5, there are multiple frequency settings possible on these clocks depending on modes of operation. So isn't it better that the sensor driver controls it? >> + return ret; >> +} >> + >> +static void sensor_clk_disable(struct fimc_is_sensor *sensor) >> +{ >> + int i; >> + >> + for (i = 0; i< SCLK_MAX_NUM; i++) >> + clk_disable(sensor->clock[i]); >> +} >> + >> +static int sensor_enum_mbus_code(struct v4l2_subdev *sd, >> + struct v4l2_subdev_fh *fh, >> + struct v4l2_subdev_mbus_code_enum *code) >> +{ >> + struct fimc_is_sensor *sensor = sd_to_fimc_is_sensor(sd); >> + struct fimc_is_sensor_drv_data *sdata = sensor->drvdata; >> + >> + if (!code) >> + return -EINVAL; >> + >> + code->code = sensor_formats[sdata->sensor_id].code; >> + return 0; >> +} >> + >> +static int sensor_set_fmt(struct v4l2_subdev *sd, >> + struct v4l2_subdev_fh *fh, >> + struct v4l2_subdev_format *fmt) >> +{ >> + struct fimc_is_sensor *sensor = sd_to_fimc_is_sensor(sd); >> + struct fimc_is_sensor_drv_data *sdata = sensor->drvdata; >> + struct v4l2_mbus_framefmt *sfmt =&fmt->format; >> >> + >> + if ((sfmt->width != sensor_formats[sdata->sensor_id].width) || >> + (sfmt->height != sensor_formats[sdata->sensor_id].height) >> || >> + (sfmt->code != sensor_formats[sdata->sensor_id].code)) > > > Couldn't this check be just dropped ? > > Yes will remove it. >> + *sfmt = sensor_formats[sdata->sensor_id]; >> + >> + return 0; >> +} >> + >> +static int sensor_get_fmt(struct v4l2_subdev *sd, >> + struct v4l2_subdev_fh *fh, >> + struct v4l2_subdev_format *fmt) >> +{ >> + struct fimc_is_sensor *sensor = sd_to_fimc_is_sensor(sd); >> + struct fimc_is_sensor_drv_data *sdata = sensor->drvdata; >> + >> + fmt->format = sensor_formats[sdata->sensor_id]; >> + return 0; >> +} >> + >> +static struct v4l2_subdev_pad_ops sensor_pad_ops = { >> + .enum_mbus_code = sensor_enum_mbus_code, >> + .get_fmt = sensor_get_fmt, >> + .set_fmt = sensor_set_fmt, >> +}; >> + >> +static int sensor_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) >> +{ >> + struct v4l2_mbus_framefmt *format = v4l2_subdev_get_try_format(fh, >> 0); >> + >> + *format = sensor_formats[0]; >> + return 0; >> +} >> + >> +static const struct v4l2_subdev_internal_ops sensor_sd_internal_ops = { >> + .open = sensor_open, >> +}; >> + >> +static int sensor_s_power(struct v4l2_subdev *sd, int on) >> +{ >> + struct fimc_is_sensor *sensor = sd_to_fimc_is_sensor(sd); >> + >> + if (on) { >> + /* Power on sensor */ >> + sensor_clk_enable(sensor); > > > The return value from at least this function should not be ignored. > > Ok >> + gpio_set_value(sensor->gpio_reset, 1); >> + } else { >> + /* Power off sensor */ >> + gpio_set_value(sensor->gpio_reset, 0); >> + sensor_clk_disable(sensor); >> + } >> + return 0; >> +} >> + >> +static struct v4l2_subdev_core_ops sensor_core_ops = { >> + .s_power = sensor_s_power, >> +}; >> + >> +static int sensor_s_stream(struct v4l2_subdev *sd, int enable) >> +{ >> + struct fimc_is_sensor *sensor = sd_to_fimc_is_sensor(sd); >> + int ret; >> + >> + if (enable) { >> + pr_debug("Stream ON\n"); >> + /* Open pipeline */ >> + ret = fimc_is_pipeline_open(sensor->pipeline, sensor); >> + if (ret< 0) { >> + pr_err("Pipeline already opened.\n"); >> + return -EBUSY; >> + } > > > 'fimc_is_pipeline_' might be a bit confusing prefix for these FIMC-IS > firmware interface functions, perhaps fimc_ischain_ or something similar > would be more explicit. But that's just my personal impression, let's > don't bother with it. > > Yes I too feel that name pipeline is confusion. Will change it to ischain. >> + /* Start IS pipeline */ >> + ret = fimc_is_pipeline_start(sensor->pipeline); > > > OK, using the FIMC-IS firmware interface calls from within the subdev > drivers is fine. But does the whole pipeline need to be initialized, > the firmware and the setfile loaded and devices powered on from within > the sensor's subdev s_stream() operation ? > > This is what really bother me most in the current design. Why couldn't > the media device driver handle dependencies between the subdevs, e.g. > when sensor -> mipi-csis -> fimc-lite -> memory processing pipeline is > started, couldn't it call s_power/s_stream on the ISP subdev when those > calls are made on the sensor subdev ? > > The firmware initialization is done here so that fimc-is sensor can be used even without the fimc-is components (isp, scc, scp). There is a possibility of only the pipeline0 being used by the media device which connects sensor -> mipi csis -> fimc-lite -> memory. In such a scenario, for using the IS sensor independently, the firmware should be initialized and started for the sensor to give image output. >> + if (ret< 0) { >> + pr_err("Pipeline start failed.\n"); >> + return -EINVAL; > > > return ret; ? >> >> + } >> + } else { >> + pr_debug("Stream OFF\n"); >> + /* Stop IS pipeline */ >> + ret = fimc_is_pipeline_stop(sensor->pipeline); >> + if (ret< 0) { >> + pr_err("Pipeline stop failed.\n"); >> + return -EINVAL; > > > return ret; ? >> >> + } >> + >> + /* Close pipeline */ >> + ret = fimc_is_pipeline_close(sensor->pipeline); >> + if (ret< 0) { >> + pr_err("Pipeline close failed\n"); >> + return -EBUSY; >> + } >> + } >> + >> + return 0; >> +} >> + >> +static const struct v4l2_subdev_video_ops sensor_video_ops = { >> + .s_stream = sensor_s_stream, >> +}; >> + >> +static struct v4l2_subdev_ops sensor_subdev_ops = { >> + .core =&sensor_core_ops, >> + .pad =&sensor_pad_ops, >> + .video =&sensor_video_ops, >> +}; >> + >> +static int sensor_parse_dt(struct fimc_is_sensor *sensor, >> + struct device_node *sensor_node) >> +{ >> + struct device_node *port, *ep, *remote, *fimc_is_node, *camera; >> + struct fimc_is *is_data; >> + struct platform_device *pdev_is; >> + struct v4l2_of_endpoint endpoint; > > >> + /* Parse ports */ >> >> + port = sensor_node; >> + while ((port = of_get_next_child(port, NULL))) { >> + if (!of_node_cmp(port->name, "port")) >> + break; >> + of_node_put(port); >> + }; >> + if (!port) { >> + pr_err("Sensor port undefined\n"); >> + return -EINVAL; >> + } >> + >> + ep = of_get_next_child(port, NULL); >> + if (!ep) >> + return -EINVAL; >> + >> + port = of_parse_phandle(ep, "remote-endpoint", 0); >> + if (port) { >> + v4l2_of_parse_endpoint(port,&endpoint); >> + sensor->i2c_ch = (endpoint.port>> 2)& 0x1; >> + } > > > Couldn't some of this code be replaced with v4l2_of_get_next_endpoint() ? > Ok will try that. >> + remote = v4l2_of_get_remote_port_parent(ep); >> + of_node_put(ep); >> + >> + if (!remote) >> + return -EINVAL; >> + >> + camera = of_get_parent(remote); >> + fimc_is_node = NULL; >> + while ((fimc_is_node = of_get_next_child(camera, fimc_is_node))) { >> + if (!of_node_cmp(fimc_is_node->name, "fimc-is")) >> + break; >> + of_node_put(fimc_is_node); >> + }; >> + of_node_put(camera); >> + >> + if (!fimc_is_node) >> + return -EINVAL; >> + >> + /* Get the IS pipeline context */ >> + pdev_is = of_find_device_by_node(fimc_is_node); >> + is_data = dev_get_drvdata(&pdev_is->dev); >> + >> + if (!is_data) >> + return -EINVAL; >> + >> + sensor->pipeline =&is_data->pipeline; >> >> + >> + return 0; >> +} >> + >> +static const struct of_device_id fimc_is_sensor_of_match[]; >> + >> +static int fimc_is_sensor_probe(struct i2c_client *client, >> + const struct i2c_device_id *id) >> +{ >> + struct device *dev =&client->dev; >> >> + struct fimc_is_sensor *sensor; >> + const struct of_device_id *of_id; >> + struct v4l2_subdev *sd; >> + int gpio, ret; >> + unsigned int sensor_id; >> + >> + sensor = devm_kzalloc(dev, sizeof(*sensor), GFP_KERNEL); >> + if (!sensor) >> + return -ENOMEM; >> + >> + sensor->gpio_reset = -EINVAL; >> + >> + gpio = of_get_gpio_flags(dev->of_node, 0, NULL); >> + if (gpio_is_valid(gpio)) { >> + ret = gpio_request_one(gpio, GPIOF_OUT_INIT_LOW, >> DRIVER_NAME); > > > You could use devm_gpio_request_one, so the GPIO is properly freed on > the driver's removal. You should test this driver built as a module as well. > > Ok will do that. >> + if (ret< 0) >> + return ret; >> + } >> + pr_err("GPIO Request success : %d", gpio); > > > pr_debug() or needs to be removed. > > >> + sensor->gpio_reset = gpio; >> + >> + of_id = of_match_node(fimc_is_sensor_of_match, dev->of_node); >> + if (!of_id) { >> + ret = -ENODEV; >> + goto err_gpio; >> + } >> + >> + sensor->drvdata = (struct fimc_is_sensor_drv_data *) of_id->data; > > > No need for casting. Just make struct fimc_is_sensor:drvdata 'const'. > > Ok >> + sensor->dev = dev; >> + >> + /* Get FIMC-IS context */ >> + ret = sensor_parse_dt(sensor, dev->of_node); >> + if (ret) { >> + pr_err("Unable to obtain IS context\n"); >> + ret = -ENODEV; > > > Is overwriting ret really needed ? > Not needed. Will change. >> + goto err_gpio; >> + } >> + >> + sd =&sensor->subdev; >> + v4l2_i2c_subdev_init(sd, client,&sensor_subdev_ops); >> + snprintf(sd->name, sizeof(sd->name), >> sensor->drvdata->sensor_name); >> + sensor->subdev.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE; >> + >> + sensor_id = sensor->drvdata->sensor_id; >> + sensor->format.code = sensor_formats[sensor_id].code; >> + sensor->format.width = sensor_formats[sensor_id].width; >> + sensor->format.height = sensor_formats[sensor_id].height; >> + >> + sensor->pad.flags = MEDIA_PAD_FL_SOURCE; >> + ret = media_entity_init(&sd->entity, 1,&sensor->pad, 0); >> >> + if (ret< 0) >> + goto err_gpio; >> + >> + v4l2_set_subdevdata(sd, sensor); >> + i2c_set_clientdata(client,&sensor->subdev); >> >> + >> + pm_runtime_no_callbacks(dev); >> + pm_runtime_enable(dev); >> + sensor_clk_init(sensor); >> + >> + return 0; >> +err_gpio: >> + if (gpio_is_valid(sensor->gpio_reset)) >> + gpio_free(sensor->gpio_reset); >> + return ret; >> +} >> + >> +static int fimc_is_sensor_remove(struct i2c_client *client) >> +{ >> + struct v4l2_subdev *sd = i2c_get_clientdata(client); >> + struct fimc_is_sensor *sensor = sd_to_fimc_is_sensor(sd); >> + >> + media_entity_cleanup(&sensor->subdev.entity); >> + sensor_clk_put(sensor); >> + >> + return 0; >> +} >> + >> +static const struct i2c_device_id fimc_is_sensor_ids[] = { >> + { } >> +}; >> + >> +static const struct fimc_is_sensor_drv_data s5k4e5_drvdata = { >> + .sensor_id = SENSOR_S5K4E5, >> + .sensor_name = "s5k4e5", >> + .pixel_width = SENSOR_4E5_WIDTH + 16, >> + .pixel_height = SENSOR_4E5_HEIGHT + 10, >> + .active_width = SENSOR_4E5_WIDTH, >> + .active_height = SENSOR_4E5_HEIGHT, >> + .max_framerate = 30, >> + .setfile_name = "setfile_4e5.bin", >> + .ext = { >> + .actuator_con = { >> + .product_name = ACTUATOR_NAME_DWXXXX, >> + .peri_type = SE_I2C, >> + .peri_setting.i2c.channel = SENSOR_CONTROL_I2C0, >> + }, >> + .flash_con = { >> + .product_name = FLADRV_NAME_KTD267, >> + .peri_type = SE_GPIO, >> + .peri_setting.gpio.first_gpio_port_no = 1, >> + .peri_setting.gpio.second_gpio_port_no = 2, >> + }, >> + .from_con.product_name = FROMDRV_NAME_NOTHING, >> + .mclk = 0, >> + .mipi_lane_num = 0, >> + .mipi_speed = 0, >> + .fast_open_sensor = 0, >> + .self_calibration_mode = 0, >> + }, >> +}; >> + >> +static const struct fimc_is_sensor_drv_data s5k6a3_drvdata = { >> + .sensor_id = SENSOR_S5K6A3, >> + .sensor_name = "s5k6a3", >> + .pixel_width = SENSOR_6A3_WIDTH + 16, >> + .pixel_height = SENSOR_6A3_HEIGHT + 10, >> + .active_width = SENSOR_6A3_WIDTH, >> + .active_height = SENSOR_6A3_HEIGHT, >> + .max_framerate = 30, >> + .setfile_name = "setfile_6a3.bin", >> +}; >> + >> +static const struct of_device_id fimc_is_sensor_of_match[] = { >> + { >> + .compatible = "samsung,s5k4e5", >> + .data =&s5k4e5_drvdata, >> + }, >> + { >> + .compatible = "samsung,s5k6a3", >> + .data =&s5k6a3_drvdata, >> + }, >> + { } >> +}; >> +MODULE_DEVICE_TABLE(of, fimc_is_sensor_of_match); >> + >> +static struct i2c_driver fimc_is_sensor_driver = { >> + .driver = { >> + .of_match_table = fimc_is_sensor_of_match, >> + .name = DRIVER_NAME, >> + .owner = THIS_MODULE, >> + }, >> + .probe = fimc_is_sensor_probe, >> + .remove = fimc_is_sensor_remove, >> + .id_table = fimc_is_sensor_ids, >> +}; >> + >> +module_i2c_driver(fimc_is_sensor_driver); >> + >> +MODULE_AUTHOR("Arun Kumar K<arun.kk@samsung.com>"); >> +MODULE_DESCRIPTION("Exynos5 FIMC-IS sensor subdev driver"); >> +MODULE_LICENSE("GPL"); >> diff --git a/drivers/media/platform/exynos5-is/fimc-is-sensor.h >> b/drivers/media/platform/exynos5-is/fimc-is-sensor.h >> new file mode 100644 >> index 0000000..75e5f20 >> --- /dev/null >> +++ b/drivers/media/platform/exynos5-is/fimc-is-sensor.h >> @@ -0,0 +1,168 @@ >> +/* >> + * Samsung EXYNOS5250 FIMC-IS (Imaging Subsystem) driver >> + * >> + * Copyright (C) 2013 Samsung Electronics Co., Ltd. >> + * Arun Kumar K<arun.kk@samsung.com> >> + * Kil-yeon Lim<kilyeon.im@samsung.com> >> + * >> + * This program is free software; you can redistribute it and/or modify >> + * it under the terms of the GNU General Public License version 2 as >> + * published by the Free Software Foundation. >> + */ >> +#ifndef FIMC_IS_SENSOR_H_ >> +#define FIMC_IS_SENSOR_H_ >> + >> +#include<linux/clk.h> >> +#include<linux/device.h> >> +#include<linux/kernel.h> >> +#include<linux/platform_device.h> >> +#include<linux/regulator/consumer.h> >> +#include<linux/videodev2.h> >> +#include<media/v4l2-subdev.h> >> + >> +#include "fimc-is-pipeline.h" >> + >> +#define FIMC_IS_MAX_CAMIF_CLIENTS 2 >> +#define FIMC_IS_MAX_NAME_LEN 32 >> +#define FIMC_IS_MAX_GPIO_NUM 32 >> +#define UART_ISP_SEL 0 >> +#define UART_ISP_RATIO 1 >> + >> +#define FIMC_IS_MAX_SENSORS 4 >> + >> +#define SENSOR_4E5_WIDTH 2560 >> +#define SENSOR_4E5_HEIGHT 1920 >> +#define SENSOR_6A3_WIDTH 1392 >> +#define SENSOR_6A3_HEIGHT 1392 >> + >> +enum sensor_id { >> + SENSOR_S5K3H2 = 1, >> + SENSOR_S5K6A3 = 2, >> + SENSOR_S5K4E5 = 3, >> + SENSOR_S5K3H7 = 4, >> + SENSOR_CUSTOM = 100, >> + SENSOR_END >> +}; >> + >> +enum sensor_channel { >> + SENSOR_CONTROL_I2C0 = 0, >> + SENSOR_CONTROL_I2C1 = 1 >> +}; >> + >> +enum actuator_name { >> + ACTUATOR_NAME_AD5823 = 1, >> + ACTUATOR_NAME_DWXXXX = 2, >> + ACTUATOR_NAME_AK7343 = 3, >> + ACTUATOR_NAME_HYBRIDVCA = 4, >> + ACTUATOR_NAME_NOTHING = 100, >> + ACTUATOR_NAME_END >> +}; >> + >> +enum flash_drv_name { >> + FLADRV_NAME_KTD267 = 1, >> + FLADRV_NAME_NOTHING = 100, >> + FLADRV_NAME_END >> +}; >> + >> +enum from_name { >> + FROMDRV_NAME_W25Q80BW = 1, >> + FROMDRV_NAME_NOTHING >> +}; >> + >> +enum sensor_peri_type { >> + SE_I2C, >> + SE_SPI, >> + SE_GPIO, >> + SE_MPWM, >> + SE_ADC, >> + SE_NULL >> +}; >> + >> +struct i2c_type { >> + u32 channel; >> + u32 slave_address; >> + u32 speed; >> +}; >> + >> +struct spi_type { >> + u32 channel; >> +}; >> + >> +struct gpio_type { >> + u32 first_gpio_port_no; >> + u32 second_gpio_port_no; >> +}; >> + >> +union sensor_peri_format { >> + struct i2c_type i2c; >> + struct spi_type spi; >> + struct gpio_type gpio; >> +}; >> + >> +struct sensor_protocol { >> + unsigned int product_name; >> + enum sensor_peri_type peri_type; >> + union sensor_peri_format peri_setting; >> +}; >> + >> +struct fimc_is_sensor_ext { >> + struct sensor_protocol actuator_con; >> + struct sensor_protocol flash_con; >> + struct sensor_protocol from_con; >> + >> + unsigned int mclk; >> + unsigned int mipi_lane_num; >> + unsigned int mipi_speed; >> + unsigned int fast_open_sensor; >> + unsigned int self_calibration_mode; >> +}; >> + >> +struct fimc_is_sensor_drv_data { >> + unsigned int sensor_id; >> + char *sensor_name; >> + unsigned int pixel_width; >> + unsigned int pixel_height; >> + unsigned int active_width; >> + unsigned int active_height; >> + unsigned int max_framerate; >> + struct fimc_is_sensor_ext ext; >> + char *setfile_name; >> +}; >> + >> +enum sensor_clks { >> + SCLK_BAYER, >> + SCLK_CAM0, >> + SCLK_CAM1, >> + SCLK_MAX_NUM, >> +}; >> + >> +struct sensor_pix_format { >> + enum v4l2_mbus_pixelcode code; >> +}; >> + >> +/** >> + * struct fimc_is_sensor - fimc-is sensor context >> + * @pad: media pad >> + * @subdev: sensor subdev >> + * @clock: sensor clocks array >> + * @dev: sensor device ptr >> + * @pipeline: is pipeline context pointer >> + * @drvdata: sensor specific driver data >> + * @format: v4l2 mbus format for the subdev >> + * @gpio_reset: gpio pin to be used for sensor power on/off >> + * @i2c_ch: sensor's i2c channel number >> + */ >> +struct fimc_is_sensor { >> + struct media_pad pad; >> + struct v4l2_subdev subdev; >> + struct clk *clock[SCLK_MAX_NUM]; >> + struct device *dev; >> + >> + struct fimc_is_pipeline *pipeline; >> + struct fimc_is_sensor_drv_data *drvdata; >> + struct v4l2_mbus_framefmt format; >> + int gpio_reset; >> + unsigned int i2c_ch; >> +}; >> + >> +#endif /* FIMC_IS_SENSOR_H_ */ > > > Thanks, > Sylwester Thanks and regards Arun ^ permalink raw reply [flat|nested] 15+ messages in thread
[parent not found: <1370005408-10853-7-git-send-email-arun.kk@samsung.com>]
* Re: [RFC v2 06/10] exynos5-fimc-is: Adds isp subdev [not found] ` <1370005408-10853-7-git-send-email-arun.kk@samsung.com> @ 2013-06-20 23:25 ` Sylwester Nawrocki 2013-07-09 11:42 ` Arun Kumar K 2013-08-02 4:31 ` Arun Kumar K 0 siblings, 2 replies; 15+ messages in thread From: Sylwester Nawrocki @ 2013-06-20 23:25 UTC (permalink / raw) To: Arun Kumar K Cc: linux-media, s.nawrocki, kilyeon.im, shaik.ameer, arunkk.samsung, linux-samsung-soc On 05/31/2013 03:03 PM, Arun Kumar K wrote: > fimc-is driver takes video data input from the ISP video node > which is added in this patch. This node accepts Bayer input > buffers which is given from the IS sensors. > > Signed-off-by: Arun Kumar K<arun.kk@samsung.com> > Signed-off-by: Kilyeon Im<kilyeon.im@samsung.com> > --- > drivers/media/platform/exynos5-is/fimc-is-isp.c | 438 +++++++++++++++++++++++ > drivers/media/platform/exynos5-is/fimc-is-isp.h | 89 +++++ > 2 files changed, 527 insertions(+) > create mode 100644 drivers/media/platform/exynos5-is/fimc-is-isp.c > create mode 100644 drivers/media/platform/exynos5-is/fimc-is-isp.h > > diff --git a/drivers/media/platform/exynos5-is/fimc-is-isp.c b/drivers/media/platform/exynos5-is/fimc-is-isp.c > new file mode 100644 > index 0000000..2890f17 > --- /dev/null > +++ b/drivers/media/platform/exynos5-is/fimc-is-isp.c > @@ -0,0 +1,438 @@ > +/* > + * Samsung EXYNOS5250 FIMC-IS (Imaging Subsystem) driver > + * > + * Copyright (C) 2013 Samsung Electronics Co., Ltd. > + * Arun Kumar K<arun.kk@samsung.com> > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 as > + * published by the Free Software Foundation. > + */ > + > +#include<media/v4l2-ioctl.h> > +#include<media/videobuf2-dma-contig.h> > + > +#include "fimc-is.h" > + > +#define ISP_DRV_NAME "fimc-is-isp" > + > +static const struct fimc_is_fmt formats[] = { > + { > + .name = "Bayer GR-BG 8bits", > + .fourcc = V4L2_PIX_FMT_SGRBG8, > + .depth = {8}, Please add spaces betwen {} and the number. > + .num_planes = 1, > + }, > + { > + .name = "Bayer GR-BG 10bits", > + .fourcc = V4L2_PIX_FMT_SGRBG10, > + .depth = {10}, > + .num_planes = 1, > + }, > + { > + .name = "Bayer GR-BG 12bits", > + .fourcc = V4L2_PIX_FMT_SGRBG12, > + .depth = {12}, > + .num_planes = 1, > + }, > +}; > +#define NUM_FORMATS ARRAY_SIZE(formats) > + > +static struct fimc_is_fmt *find_format(struct v4l2_format *f) Make the return value 'const'... > +{ > + unsigned int i; > + > + for (i = 0; i< NUM_FORMATS; i++) { > + if (formats[i].fourcc == f->fmt.pix_mp.pixelformat) > + return (struct fimc_is_fmt *)&formats[i]; and drop the casting here. > + } > + return NULL; > +} > + > +static int isp_video_output_start_streaming(struct vb2_queue *vq, > + unsigned int count) > +{ > + struct fimc_is_isp *isp = vb2_get_drv_priv(vq); > + > + /* Set state to RUNNING */ This comment doesn't add any value. > + set_bit(STATE_RUNNING,&isp->output_state); > + return 0; > +} > + > +static int isp_video_output_stop_streaming(struct vb2_queue *vq) > +{ > + struct fimc_is_isp *isp = vb2_get_drv_priv(vq); > + > + clear_bit(STATE_RUNNING,&isp->output_state); > + return 0; > +} > + > +static int isp_video_output_queue_setup(struct vb2_queue *vq, > + const struct v4l2_format *pfmt, > + unsigned int *num_buffers, unsigned int *num_planes, > + unsigned int sizes[], void *allocators[]) > +{ > + struct fimc_is_isp *isp = vb2_get_drv_priv(vq); > + struct fimc_is_fmt *fmt = isp->fmt; > + unsigned int wh, i; > + > + if (!fmt) > + return -EINVAL; > + > + *num_planes = fmt->num_planes; > + wh = isp->width * isp->height; > + > + for (i = 0; i< *num_planes; i++) { > + allocators[i] = isp->alloc_ctx; > + sizes[i] = (wh * fmt->depth[i]) / 8; > + } > + return 0; > +} > + > +static int isp_video_output_buffer_init(struct vb2_buffer *vb) > +{ > + struct vb2_queue *vq = vb->vb2_queue; > + struct fimc_is_isp *isp = vb2_get_drv_priv(vq); > + struct fimc_is_buf *buf; > + > + buf =&isp->output_bufs[vb->v4l2_buf.index]; > + /* Initialize buffer */ > + buf->vb = vb; > + buf->paddr[0] = vb2_dma_contig_plane_dma_addr(vb, 0); > + isp->out_buf_cnt++; > + return 0; > +} > + > +static void isp_video_output_buffer_queue(struct vb2_buffer *vb) > +{ > + struct vb2_queue *vq = vb->vb2_queue; > + struct fimc_is_isp *isp = vb2_get_drv_priv(vq); > + struct fimc_is_buf *buf; > + > + buf =&isp->output_bufs[vb->v4l2_buf.index]; > + > + fimc_is_pipeline_buf_lock(isp->pipeline); > + fimc_is_isp_wait_queue_add(isp, buf); > + fimc_is_pipeline_buf_unlock(isp->pipeline); > + > + /* Call shot command */ > + fimc_is_pipeline_shot(isp->pipeline); > +} > + > +static void isp_lock(struct vb2_queue *vq) > +{ > + struct fimc_is_isp *isp = vb2_get_drv_priv(vq); > + mutex_lock(&isp->video_lock); > +} > + > +static void isp_unlock(struct vb2_queue *vq) > +{ > + struct fimc_is_isp *isp = vb2_get_drv_priv(vq); > + mutex_unlock(&isp->video_lock); > +} > + > +static const struct vb2_ops isp_video_output_qops = { > + .queue_setup = isp_video_output_queue_setup, > + .buf_init = isp_video_output_buffer_init, > + .buf_queue = isp_video_output_buffer_queue, > + .wait_prepare = isp_unlock, > + .wait_finish = isp_lock, > + .start_streaming = isp_video_output_start_streaming, > + .stop_streaming = isp_video_output_stop_streaming, > +}; > + > +static int isp_video_output_open(struct file *file) > +{ > + struct fimc_is_isp *isp = video_drvdata(file); > + int ret = 0; > + > + /* Check if opened before */ > + if (isp->refcount>= FIMC_IS_MAX_INSTANCES) { > + pr_err("All instances are in use.\n"); > + return -EBUSY; Multiple open() should be allowed. And device node drivers should use struct v4l2_fh. > + } > + > + INIT_LIST_HEAD(&isp->wait_queue); > + isp->wait_queue_cnt = 0; > + INIT_LIST_HEAD(&isp->run_queue); > + isp->run_queue_cnt = 0; This does not belong here, I would put it into the start_streaming handler. > + isp->refcount++; > + return ret; > +} > + > +static int isp_video_output_close(struct file *file) > +{ > + struct fimc_is_isp *isp = video_drvdata(file); > + int ret = 0; This variable looks redundant. > + isp->refcount--; > + isp->output_state = 0; > + vb2_fop_release(file); > + return ret; > +} > + > +static const struct v4l2_file_operations isp_video_output_fops = { > + .owner = THIS_MODULE, > + .open = isp_video_output_open, > + .release = isp_video_output_close, > + .poll = vb2_fop_poll, > + .unlocked_ioctl = video_ioctl2, > + .mmap = vb2_fop_mmap, > +}; > + > +/* > + * Video node ioctl operations > + */ > +static int isp_querycap_output(struct file *file, void *priv, > + struct v4l2_capability *cap) > +{ > + strncpy(cap->driver, ISP_DRV_NAME, sizeof(cap->driver) - 1); > + strncpy(cap->card, ISP_DRV_NAME, sizeof(cap->card) - 1); > + strncpy(cap->bus_info, ISP_DRV_NAME, sizeof(cap->bus_info) - 1); > + cap->capabilities = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_OUTPUT_MPLANE; > + cap->device_caps = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_OUTPUT_MPLANE; cap->capabilities = V4L2_CAP_STREAMING; cap->device_caps = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_OUTPUT_MPLANE; This should be: cap->device_caps = V4L2_CAP_STREAMING; cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; Media Controller device nodes must not use V4L2_CAP_VIDEO_{OUTPUT, CAPTURE}_(_MPLANE) capability flags. > + return 0; > +} > + > +static int isp_enum_fmt_mplane(struct file *file, void *priv, > + struct v4l2_fmtdesc *f) > +{ > + const struct fimc_is_fmt *fmt; > + > + if (f->index>= NUM_FORMATS) > + return -EINVAL; > + > + fmt =&formats[f->index]; > + strlcpy(f->description, fmt->name, sizeof(f->description)); > + f->pixelformat = fmt->fourcc; > + > + return 0; > +} > + > +static int isp_g_fmt_mplane(struct file *file, void *fh, > + struct v4l2_format *f) > +{ > + struct fimc_is_isp *isp = video_drvdata(file); > + struct v4l2_pix_format_mplane *pixm =&f->fmt.pix_mp; > + struct v4l2_plane_pix_format *plane_fmt =&pixm->plane_fmt[0]; > + const struct fimc_is_fmt *fmt = isp->fmt; > + > + plane_fmt->bytesperline = (isp->width * fmt->depth[0]) / 8; > + plane_fmt->sizeimage = plane_fmt->bytesperline * isp->height; > + > + pixm->num_planes = fmt->num_planes; > + pixm->pixelformat = fmt->fourcc; > + pixm->width = isp->width; > + pixm->height = isp->height; > + pixm->field = V4L2_FIELD_NONE; > + pixm->colorspace = V4L2_COLORSPACE_JPEG; > + > + return 0; > +} > + > +static int isp_try_fmt_mplane(struct file *file, void *fh, > + struct v4l2_format *f) > +{ > + struct fimc_is_fmt *fmt; > + > + fmt = find_format(f); > + if (!fmt) { > + fmt = (struct fimc_is_fmt *)&formats[0]; > + f->fmt.pix_mp.pixelformat = fmt->fourcc; > + } > + > + if (fmt->num_planes != f->fmt.pix_mp.num_planes) > + f->fmt.pix_mp.num_planes = fmt->num_planes; > + > + return 0; > +} > + > +static int isp_s_fmt_mplane(struct file *file, void *priv, > + struct v4l2_format *f) > +{ > + struct fimc_is_isp *isp = video_drvdata(file); > + struct fimc_is_pipeline *p = isp->pipeline; > + struct fimc_is_fmt *fmt; > + unsigned int sensor_width, sensor_height; > + int ret; > + > + ret = isp_try_fmt_mplane(file, priv, f); > + if (ret) > + return ret; > + > + /* Get format type */ > + fmt = find_format(f); > + if (!fmt) { > + fmt = (struct fimc_is_fmt *)&formats[0]; > + f->fmt.pix_mp.pixelformat = fmt->fourcc; > + f->fmt.pix_mp.num_planes = fmt->num_planes; > + } > + > + /* Check if same as sensor width& height */ > + sensor_width = p->sensor->drvdata->pixel_width; > + sensor_height = p->sensor->drvdata->pixel_height; > + if ((sensor_width != f->fmt.pix_mp.width) || > + (sensor_height != f->fmt.pix_mp.height)) { What's the point of this check ? > + f->fmt.pix_mp.width = sensor_width; > + f->fmt.pix_mp.height = sensor_height; > + } > + isp->fmt = fmt; > + isp->width = f->fmt.pix_mp.width; > + isp->height = f->fmt.pix_mp.height; > + isp->size_image = f->fmt.pix_mp.plane_fmt[0].sizeimage; > + set_bit(STATE_INIT,&isp->output_state); > + return 0; > +} > + > +static int isp_reqbufs(struct file *file, void *priv, > + struct v4l2_requestbuffers *reqbufs) > +{ > + struct fimc_is_isp *isp = video_drvdata(file); > + int ret; > + > + ret = vb2_reqbufs(&isp->vbq, reqbufs); > + if (ret) { > + pr_err("vb2 req buffers failed\n"); > + return ret; > + } > + > + isp->num_buffers = reqbufs->count; > + isp->out_buf_cnt = 0; > + set_bit(STATE_BUFS_ALLOCATED,&isp->output_state); > + return 0; > +} > + > +static const struct v4l2_ioctl_ops isp_video_output_ioctl_ops = { > + .vidioc_querycap = isp_querycap_output, > + .vidioc_enum_fmt_vid_out_mplane = isp_enum_fmt_mplane, > + .vidioc_try_fmt_vid_out_mplane = isp_try_fmt_mplane, > + .vidioc_s_fmt_vid_out_mplane = isp_s_fmt_mplane, > + .vidioc_g_fmt_vid_out_mplane = isp_g_fmt_mplane, > + .vidioc_reqbufs = isp_reqbufs, > + .vidioc_querybuf = vb2_ioctl_querybuf, > + .vidioc_qbuf = vb2_ioctl_qbuf, > + .vidioc_dqbuf = vb2_ioctl_dqbuf, > + .vidioc_streamon = vb2_ioctl_streamon, > + .vidioc_streamoff = vb2_ioctl_streamoff, > +}; > + > +static int isp_subdev_registered(struct v4l2_subdev *sd) > +{ > + struct fimc_is_isp *isp = v4l2_get_subdevdata(sd); > + struct vb2_queue *q =&isp->vbq; > + struct video_device *vfd =&isp->vfd; > + int ret; > + > + mutex_init(&isp->video_lock); > + > + memset(vfd, 0, sizeof(*vfd)); > + snprintf(vfd->name, sizeof(vfd->name), "fimc-is-isp.output"); > + > + vfd->fops =&isp_video_output_fops; > + vfd->ioctl_ops =&isp_video_output_ioctl_ops; > + vfd->v4l2_dev = sd->v4l2_dev; > + vfd->minor = -1; > + vfd->release = video_device_release_empty; > + vfd->lock =&isp->video_lock; > + vfd->queue = q; > + vfd->vfl_dir = VFL_DIR_TX; > + > + memset(q, 0, sizeof(*q)); > + q->type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE; > + q->io_modes = VB2_MMAP | VB2_DMABUF; > + q->ops =&isp_video_output_qops; > + q->mem_ops =&vb2_dma_contig_memops; > + q->drv_priv = isp; > + > + ret = vb2_queue_init(q); > + if (ret< 0) > + return ret; > + > + isp->vd_pad.flags = MEDIA_PAD_FL_SINK; > + ret = media_entity_init(&vfd->entity, 1,&isp->vd_pad, 0); > + if (ret< 0) > + return ret; > + > + video_set_drvdata(vfd, isp); > + > + ret = video_register_device(vfd, VFL_TYPE_GRABBER, -1); > + if (ret< 0) { > + media_entity_cleanup(&vfd->entity); > + return ret; > + } > + > + v4l2_info(sd->v4l2_dev, "Registered %s as /dev/%s\n", > + vfd->name, video_device_node_name(vfd)); > + return 0; > +} > + > +static void isp_subdev_unregistered(struct v4l2_subdev *sd) > +{ > + struct fimc_is_isp *isp = v4l2_get_subdevdata(sd); > + > + if (isp&& video_is_registered(&isp->vfd)) > + video_unregister_device(&isp->vfd); > +} > + > +static const struct v4l2_subdev_internal_ops isp_subdev_internal_ops = { > + .registered = isp_subdev_registered, > + .unregistered = isp_subdev_unregistered, > +}; > + > +static struct v4l2_subdev_ops isp_subdev_ops; > + > +int fimc_is_isp_subdev_create(struct fimc_is_isp *isp, > + struct vb2_alloc_ctx *alloc_ctx, > + struct fimc_is_pipeline *pipeline) > +{ > + struct v4l2_ctrl_handler *handler =&isp->ctrl_handler; > + struct v4l2_subdev *sd =&isp->subdev; > + int ret; > + > + /* Init context vars */ > + isp->alloc_ctx = alloc_ctx; > + isp->pipeline = pipeline; > + isp->refcount = 0; > + isp->fmt = (struct fimc_is_fmt *)&formats[1]; What the casting is needed for ? > + v4l2_subdev_init(sd,&isp_subdev_ops); > + sd->owner = THIS_MODULE; > + sd->flags = V4L2_SUBDEV_FL_HAS_DEVNODE; > + snprintf(sd->name, sizeof(sd->name), ISP_DRV_NAME); > + > + isp->subdev_pads[ISP_SD_PAD_SINK_DMA].flags = MEDIA_PAD_FL_SINK; > + isp->subdev_pads[ISP_SD_PAD_SINK_OTF].flags = MEDIA_PAD_FL_SINK; > + isp->subdev_pads[ISP_SD_PAD_SRC].flags = MEDIA_PAD_FL_SOURCE; > + ret = media_entity_init(&sd->entity, ISP_SD_PADS_NUM, > + isp->subdev_pads, 0); > + if (ret< 0) > + return ret; > + > + ret = v4l2_ctrl_handler_init(handler, 1); > + if (handler->error) > + goto err_ctrl; > + > + sd->ctrl_handler = handler; > + sd->internal_ops =&isp_subdev_internal_ops; > + v4l2_set_subdevdata(sd, isp); > + > + return 0; > + > +err_ctrl: > + media_entity_cleanup(&sd->entity); > + v4l2_ctrl_handler_free(handler); > + return ret; > +} > + > +void fimc_is_isp_subdev_destroy(struct fimc_is_isp *isp) > +{ > + struct v4l2_subdev *sd =&isp->subdev; > + > + v4l2_device_unregister_subdev(sd); > + media_entity_cleanup(&sd->entity); > + v4l2_ctrl_handler_free(&isp->ctrl_handler); > + v4l2_set_subdevdata(sd, NULL); > +} > + > diff --git a/drivers/media/platform/exynos5-is/fimc-is-isp.h b/drivers/media/platform/exynos5-is/fimc-is-isp.h > new file mode 100644 > index 0000000..f707a8d > --- /dev/null > +++ b/drivers/media/platform/exynos5-is/fimc-is-isp.h > @@ -0,0 +1,89 @@ > +/* > + * Samsung EXYNOS4x12 FIMC-IS (Imaging Subsystem) driver > + * > + * Copyright (C) 2012 Samsung Electronics Co., Ltd. > + * Arun Kumar K<arun.kk@samsung.com> > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 as > + * published by the Free Software Foundation. > + */ > +#ifndef FIMC_IS_ISP_H_ > +#define FIMC_IS_ISP_H_ > + > +#include "fimc-is-core.h" > +#include "fimc-is-pipeline.h" > + > +#define FIMC_IS_ISP_REQ_BUFS_MIN 2 This is currently unused, but I guess you need to add some code to ensure minimum number of buffer for the DMA interfaces. > +#define ISP_SD_PAD_SINK_DMA 0 > +#define ISP_SD_PAD_SINK_OTF 1 > +#define ISP_SD_PAD_SRC 2 > +#define ISP_SD_PADS_NUM 3 > + > +#define ISP_MAX_BUFS 2 > + > +/** > + * struct fimc_is_isp - ISP context > + * @vfd: video device node > + * @fh: v4l2 file handle > + * @alloc_ctx: videobuf2 memory allocator context > + * @subdev: fimc-is-isp subdev > + * @vd_pad: media pad for the output video node > + * @subdev_pads: the subdev media pads > + * @ctrl_handler: v4l2 control handler > + * @video_lock: video lock mutex > + * @refcount: keeps track of number of instances opened > + * @pipeline: pipeline instance for this isp context > + * @vbq: vb2 buffers queue for ISP output video node > + * @wait_queue: list holding buffers waiting to be queued to HW > + * @wait_queue_cnt: wait queue number of buffers > + * @run_queue: list holding buffers queued to HW > + * @run_queue_cnt: run queue number of buffers > + * @output_bufs: isp output buffers array > + * @out_buf_cnt: number of output buffers in use > + * @fmt: output plane format for isp > + * @width: user configured input width > + * @height: user configured input height > + * @num_buffers: number of output plane buffers in use > + * @size_image: image size in bytes > + * @output_state: state of the output video node operations > + */ > +struct fimc_is_isp { > + struct video_device vfd; > + struct v4l2_fh fh; > + struct vb2_alloc_ctx *alloc_ctx; > + struct v4l2_subdev subdev; > + struct media_pad vd_pad; > + struct media_pad subdev_pads[ISP_SD_PADS_NUM]; > + struct v4l2_ctrl_handler ctrl_handler; > + > + struct mutex video_lock; > + > + unsigned int refcount; > + > + struct fimc_is_pipeline *pipeline; > + > + struct vb2_queue vbq; > + struct list_head wait_queue; > + unsigned int wait_queue_cnt; > + struct list_head run_queue; > + unsigned int run_queue_cnt; > + > + struct fimc_is_buf output_bufs[ISP_MAX_BUFS]; > + unsigned int out_buf_cnt; > + > + struct fimc_is_fmt *fmt; > + unsigned int width; > + unsigned int height; > + unsigned int num_buffers; > + unsigned int size_image; > + unsigned long output_state; > +}; > + > +int fimc_is_isp_subdev_create(struct fimc_is_isp *isp, > + struct vb2_alloc_ctx *alloc_ctx, > + struct fimc_is_pipeline *pipeline); > +void fimc_is_isp_subdev_destroy(struct fimc_is_isp *isp); > + > +#endif /* FIMC_IS_ISP_H_ */ Thanks, Sylwester ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [RFC v2 06/10] exynos5-fimc-is: Adds isp subdev 2013-06-20 23:25 ` [RFC v2 06/10] exynos5-fimc-is: Adds isp subdev Sylwester Nawrocki @ 2013-07-09 11:42 ` Arun Kumar K 2013-07-16 22:11 ` Sylwester Nawrocki 2013-08-02 4:31 ` Arun Kumar K 1 sibling, 1 reply; 15+ messages in thread From: Arun Kumar K @ 2013-07-09 11:42 UTC (permalink / raw) To: Sylwester Nawrocki Cc: Arun Kumar K, LMML, Sylwester Nawrocki, kilyeon.im, shaik.ameer, linux-samsung-soc Hi Sylwester, On Fri, Jun 21, 2013 at 4:55 AM, Sylwester Nawrocki <sylvester.nawrocki@gmail.com> wrote: > On 05/31/2013 03:03 PM, Arun Kumar K wrote: >> >> fimc-is driver takes video data input from the ISP video node >> which is added in this patch. This node accepts Bayer input >> buffers which is given from the IS sensors. >> >> Signed-off-by: Arun Kumar K<arun.kk@samsung.com> >> Signed-off-by: Kilyeon Im<kilyeon.im@samsung.com> >> --- >> drivers/media/platform/exynos5-is/fimc-is-isp.c | 438 >> +++++++++++++++++++++++ >> drivers/media/platform/exynos5-is/fimc-is-isp.h | 89 +++++ >> 2 files changed, 527 insertions(+) >> create mode 100644 drivers/media/platform/exynos5-is/fimc-is-isp.c >> create mode 100644 drivers/media/platform/exynos5-is/fimc-is-isp.h >> >> diff --git a/drivers/media/platform/exynos5-is/fimc-is-isp.c >> b/drivers/media/platform/exynos5-is/fimc-is-isp.c >> new file mode 100644 >> index 0000000..2890f17 >> --- /dev/null >> +++ b/drivers/media/platform/exynos5-is/fimc-is-isp.c >> @@ -0,0 +1,438 @@ >> +/* >> + * Samsung EXYNOS5250 FIMC-IS (Imaging Subsystem) driver >> + * >> + * Copyright (C) 2013 Samsung Electronics Co., Ltd. >> + * Arun Kumar K<arun.kk@samsung.com> >> + * >> + * This program is free software; you can redistribute it and/or modify >> + * it under the terms of the GNU General Public License version 2 as >> + * published by the Free Software Foundation. >> + */ >> + >> +#include<media/v4l2-ioctl.h> >> +#include<media/videobuf2-dma-contig.h> >> + >> +#include "fimc-is.h" >> + >> +#define ISP_DRV_NAME "fimc-is-isp" >> + >> +static const struct fimc_is_fmt formats[] = { >> + { >> + .name = "Bayer GR-BG 8bits", >> + .fourcc = V4L2_PIX_FMT_SGRBG8, >> + .depth = {8}, > > > Please add spaces betwen {} and the number. > Ok > >> + .num_planes = 1, >> + }, >> + { >> + .name = "Bayer GR-BG 10bits", >> + .fourcc = V4L2_PIX_FMT_SGRBG10, >> + .depth = {10}, >> + .num_planes = 1, >> + }, >> + { >> + .name = "Bayer GR-BG 12bits", >> + .fourcc = V4L2_PIX_FMT_SGRBG12, >> + .depth = {12}, >> + .num_planes = 1, >> + }, >> +}; >> +#define NUM_FORMATS ARRAY_SIZE(formats) >> + >> +static struct fimc_is_fmt *find_format(struct v4l2_format *f) > > > Make the return value 'const'... > Ok > >> +{ >> + unsigned int i; >> + >> + for (i = 0; i< NUM_FORMATS; i++) { >> + if (formats[i].fourcc == f->fmt.pix_mp.pixelformat) >> + return (struct fimc_is_fmt *)&formats[i]; > > > and drop the casting here. > Ok > >> + } >> + return NULL; >> +} >> + >> +static int isp_video_output_start_streaming(struct vb2_queue *vq, >> + unsigned int count) >> +{ >> + struct fimc_is_isp *isp = vb2_get_drv_priv(vq); >> + >> + /* Set state to RUNNING */ > > > This comment doesn't add any value. > Yes :) will remove. >> + set_bit(STATE_RUNNING,&isp->output_state); >> >> + return 0; >> +} >> + >> +static int isp_video_output_stop_streaming(struct vb2_queue *vq) >> +{ >> + struct fimc_is_isp *isp = vb2_get_drv_priv(vq); >> + >> + clear_bit(STATE_RUNNING,&isp->output_state); >> >> + return 0; >> +} >> + >> +static int isp_video_output_queue_setup(struct vb2_queue *vq, >> + const struct v4l2_format *pfmt, >> + unsigned int *num_buffers, unsigned int >> *num_planes, >> + unsigned int sizes[], void *allocators[]) >> +{ >> + struct fimc_is_isp *isp = vb2_get_drv_priv(vq); >> + struct fimc_is_fmt *fmt = isp->fmt; >> + unsigned int wh, i; >> + >> + if (!fmt) >> + return -EINVAL; >> + >> + *num_planes = fmt->num_planes; >> + wh = isp->width * isp->height; >> + >> + for (i = 0; i< *num_planes; i++) { >> + allocators[i] = isp->alloc_ctx; >> + sizes[i] = (wh * fmt->depth[i]) / 8; >> + } >> + return 0; >> +} >> + >> +static int isp_video_output_buffer_init(struct vb2_buffer *vb) >> +{ >> + struct vb2_queue *vq = vb->vb2_queue; >> + struct fimc_is_isp *isp = vb2_get_drv_priv(vq); >> + struct fimc_is_buf *buf; >> + >> + buf =&isp->output_bufs[vb->v4l2_buf.index]; >> >> + /* Initialize buffer */ >> + buf->vb = vb; >> + buf->paddr[0] = vb2_dma_contig_plane_dma_addr(vb, 0); >> + isp->out_buf_cnt++; >> + return 0; >> +} >> + >> +static void isp_video_output_buffer_queue(struct vb2_buffer *vb) >> +{ >> + struct vb2_queue *vq = vb->vb2_queue; >> + struct fimc_is_isp *isp = vb2_get_drv_priv(vq); >> + struct fimc_is_buf *buf; >> + >> + buf =&isp->output_bufs[vb->v4l2_buf.index]; >> >> + >> + fimc_is_pipeline_buf_lock(isp->pipeline); >> + fimc_is_isp_wait_queue_add(isp, buf); >> + fimc_is_pipeline_buf_unlock(isp->pipeline); >> + >> + /* Call shot command */ >> + fimc_is_pipeline_shot(isp->pipeline); >> +} >> + >> +static void isp_lock(struct vb2_queue *vq) >> +{ >> + struct fimc_is_isp *isp = vb2_get_drv_priv(vq); >> + mutex_lock(&isp->video_lock); >> +} >> + >> +static void isp_unlock(struct vb2_queue *vq) >> +{ >> + struct fimc_is_isp *isp = vb2_get_drv_priv(vq); >> + mutex_unlock(&isp->video_lock); >> +} >> + >> +static const struct vb2_ops isp_video_output_qops = { >> + .queue_setup = isp_video_output_queue_setup, >> + .buf_init = isp_video_output_buffer_init, >> + .buf_queue = isp_video_output_buffer_queue, >> + .wait_prepare = isp_unlock, >> + .wait_finish = isp_lock, >> + .start_streaming = isp_video_output_start_streaming, >> + .stop_streaming = isp_video_output_stop_streaming, >> +}; >> + >> +static int isp_video_output_open(struct file *file) >> +{ >> + struct fimc_is_isp *isp = video_drvdata(file); >> + int ret = 0; >> + >> + /* Check if opened before */ >> + if (isp->refcount>= FIMC_IS_MAX_INSTANCES) { >> + pr_err("All instances are in use.\n"); >> + return -EBUSY; > > > Multiple open() should be allowed. And device node drivers should > use struct v4l2_fh. > But then we need to restrict the number of instances to the maximum that hardware can support. Where else can it be taken care? > >> + } >> + >> + INIT_LIST_HEAD(&isp->wait_queue); >> + isp->wait_queue_cnt = 0; >> + INIT_LIST_HEAD(&isp->run_queue); >> + isp->run_queue_cnt = 0; > > > This does not belong here, I would put it into the start_streaming > handler. > Ok > >> + isp->refcount++; >> + return ret; >> +} >> + >> +static int isp_video_output_close(struct file *file) >> +{ >> + struct fimc_is_isp *isp = video_drvdata(file); >> + int ret = 0; > > > This variable looks redundant. > Yes will remove. > >> + isp->refcount--; >> + isp->output_state = 0; >> + vb2_fop_release(file); > > >> + return ret; >> +} >> + >> +static const struct v4l2_file_operations isp_video_output_fops = { >> + .owner = THIS_MODULE, >> + .open = isp_video_output_open, >> + .release = isp_video_output_close, >> + .poll = vb2_fop_poll, >> + .unlocked_ioctl = video_ioctl2, >> + .mmap = vb2_fop_mmap, >> +}; >> + >> +/* >> + * Video node ioctl operations >> + */ >> +static int isp_querycap_output(struct file *file, void *priv, >> + struct v4l2_capability *cap) >> +{ >> + strncpy(cap->driver, ISP_DRV_NAME, sizeof(cap->driver) - 1); >> + strncpy(cap->card, ISP_DRV_NAME, sizeof(cap->card) - 1); >> + strncpy(cap->bus_info, ISP_DRV_NAME, sizeof(cap->bus_info) - 1); >> + cap->capabilities = V4L2_CAP_STREAMING | >> V4L2_CAP_VIDEO_OUTPUT_MPLANE; >> + cap->device_caps = V4L2_CAP_STREAMING | >> V4L2_CAP_VIDEO_OUTPUT_MPLANE; > > > cap->capabilities = V4L2_CAP_STREAMING; > > cap->device_caps = V4L2_CAP_STREAMING | > V4L2_CAP_VIDEO_OUTPUT_MPLANE; > > This should be: > > cap->device_caps = V4L2_CAP_STREAMING; > cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; > > Media Controller device nodes must not use V4L2_CAP_VIDEO_{OUTPUT, > CAPTURE}_(_MPLANE) > capability flags. > Ok >> + return 0; >> +} >> + >> +static int isp_enum_fmt_mplane(struct file *file, void *priv, >> + struct v4l2_fmtdesc *f) >> +{ >> + const struct fimc_is_fmt *fmt; >> + >> + if (f->index>= NUM_FORMATS) >> + return -EINVAL; >> + >> + fmt =&formats[f->index]; >> >> + strlcpy(f->description, fmt->name, sizeof(f->description)); >> + f->pixelformat = fmt->fourcc; >> + >> + return 0; >> +} >> + >> +static int isp_g_fmt_mplane(struct file *file, void *fh, >> + struct v4l2_format *f) >> +{ >> + struct fimc_is_isp *isp = video_drvdata(file); >> + struct v4l2_pix_format_mplane *pixm =&f->fmt.pix_mp; >> + struct v4l2_plane_pix_format *plane_fmt =&pixm->plane_fmt[0]; >> >> + const struct fimc_is_fmt *fmt = isp->fmt; >> + >> + plane_fmt->bytesperline = (isp->width * fmt->depth[0]) / 8; >> + plane_fmt->sizeimage = plane_fmt->bytesperline * isp->height; >> + >> + pixm->num_planes = fmt->num_planes; >> + pixm->pixelformat = fmt->fourcc; >> + pixm->width = isp->width; >> + pixm->height = isp->height; >> + pixm->field = V4L2_FIELD_NONE; >> + pixm->colorspace = V4L2_COLORSPACE_JPEG; >> + >> + return 0; >> +} >> + >> +static int isp_try_fmt_mplane(struct file *file, void *fh, >> + struct v4l2_format *f) >> +{ >> + struct fimc_is_fmt *fmt; >> + >> + fmt = find_format(f); >> + if (!fmt) { >> + fmt = (struct fimc_is_fmt *)&formats[0]; >> >> + f->fmt.pix_mp.pixelformat = fmt->fourcc; >> + } >> + >> + if (fmt->num_planes != f->fmt.pix_mp.num_planes) >> + f->fmt.pix_mp.num_planes = fmt->num_planes; >> + >> + return 0; >> +} >> + >> +static int isp_s_fmt_mplane(struct file *file, void *priv, >> + struct v4l2_format *f) >> +{ >> + struct fimc_is_isp *isp = video_drvdata(file); >> + struct fimc_is_pipeline *p = isp->pipeline; >> + struct fimc_is_fmt *fmt; >> + unsigned int sensor_width, sensor_height; >> + int ret; >> + >> + ret = isp_try_fmt_mplane(file, priv, f); >> + if (ret) >> + return ret; >> + >> + /* Get format type */ >> + fmt = find_format(f); >> + if (!fmt) { >> + fmt = (struct fimc_is_fmt *)&formats[0]; >> >> + f->fmt.pix_mp.pixelformat = fmt->fourcc; >> + f->fmt.pix_mp.num_planes = fmt->num_planes; >> + } >> + >> + /* Check if same as sensor width& height */ >> >> + sensor_width = p->sensor->drvdata->pixel_width; >> + sensor_height = p->sensor->drvdata->pixel_height; >> + if ((sensor_width != f->fmt.pix_mp.width) || >> + (sensor_height != f->fmt.pix_mp.height)) { > > > What's the point of this check ? > Check was added to ensure ISP input width and height is set same as the sensor output or not. But yes this cannot be extended to generic (non-IS controlled) sensors. Will drop this check and let media controller take care. > >> + f->fmt.pix_mp.width = sensor_width; >> + f->fmt.pix_mp.height = sensor_height; >> + } > > >> + isp->fmt = fmt; >> >> + isp->width = f->fmt.pix_mp.width; >> + isp->height = f->fmt.pix_mp.height; >> + isp->size_image = f->fmt.pix_mp.plane_fmt[0].sizeimage; >> + set_bit(STATE_INIT,&isp->output_state); >> >> + return 0; >> +} >> + >> +static int isp_reqbufs(struct file *file, void *priv, >> + struct v4l2_requestbuffers *reqbufs) >> +{ >> + struct fimc_is_isp *isp = video_drvdata(file); >> + int ret; >> + >> + ret = vb2_reqbufs(&isp->vbq, reqbufs); >> + if (ret) { >> + pr_err("vb2 req buffers failed\n"); >> + return ret; >> + } >> + >> + isp->num_buffers = reqbufs->count; >> + isp->out_buf_cnt = 0; >> + set_bit(STATE_BUFS_ALLOCATED,&isp->output_state); >> >> + return 0; >> +} >> + >> +static const struct v4l2_ioctl_ops isp_video_output_ioctl_ops = { >> + .vidioc_querycap = isp_querycap_output, >> + .vidioc_enum_fmt_vid_out_mplane = isp_enum_fmt_mplane, >> + .vidioc_try_fmt_vid_out_mplane = isp_try_fmt_mplane, >> + .vidioc_s_fmt_vid_out_mplane = isp_s_fmt_mplane, >> + .vidioc_g_fmt_vid_out_mplane = isp_g_fmt_mplane, >> + .vidioc_reqbufs = isp_reqbufs, >> + .vidioc_querybuf = vb2_ioctl_querybuf, >> + .vidioc_qbuf = vb2_ioctl_qbuf, >> + .vidioc_dqbuf = vb2_ioctl_dqbuf, >> + .vidioc_streamon = vb2_ioctl_streamon, >> + .vidioc_streamoff = vb2_ioctl_streamoff, >> +}; >> + >> +static int isp_subdev_registered(struct v4l2_subdev *sd) >> +{ >> + struct fimc_is_isp *isp = v4l2_get_subdevdata(sd); >> + struct vb2_queue *q =&isp->vbq; >> + struct video_device *vfd =&isp->vfd; >> >> + int ret; >> + >> + mutex_init(&isp->video_lock); >> + >> + memset(vfd, 0, sizeof(*vfd)); >> + snprintf(vfd->name, sizeof(vfd->name), "fimc-is-isp.output"); >> + >> + vfd->fops =&isp_video_output_fops; >> + vfd->ioctl_ops =&isp_video_output_ioctl_ops; >> + vfd->v4l2_dev = sd->v4l2_dev; >> + vfd->minor = -1; >> + vfd->release = video_device_release_empty; >> + vfd->lock =&isp->video_lock; >> >> + vfd->queue = q; >> + vfd->vfl_dir = VFL_DIR_TX; >> + >> + memset(q, 0, sizeof(*q)); >> + q->type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE; >> + q->io_modes = VB2_MMAP | VB2_DMABUF; >> + q->ops =&isp_video_output_qops; >> + q->mem_ops =&vb2_dma_contig_memops; >> + q->drv_priv = isp; >> + >> + ret = vb2_queue_init(q); >> + if (ret< 0) >> + return ret; >> + >> + isp->vd_pad.flags = MEDIA_PAD_FL_SINK; >> + ret = media_entity_init(&vfd->entity, 1,&isp->vd_pad, 0); >> >> + if (ret< 0) >> + return ret; >> + >> + video_set_drvdata(vfd, isp); >> + >> + ret = video_register_device(vfd, VFL_TYPE_GRABBER, -1); >> + if (ret< 0) { >> + media_entity_cleanup(&vfd->entity); >> + return ret; >> + } >> + >> + v4l2_info(sd->v4l2_dev, "Registered %s as /dev/%s\n", >> + vfd->name, video_device_node_name(vfd)); >> + return 0; >> +} >> + >> +static void isp_subdev_unregistered(struct v4l2_subdev *sd) >> +{ >> + struct fimc_is_isp *isp = v4l2_get_subdevdata(sd); >> + >> + if (isp&& video_is_registered(&isp->vfd)) >> >> + video_unregister_device(&isp->vfd); >> +} >> + >> +static const struct v4l2_subdev_internal_ops isp_subdev_internal_ops = { >> + .registered = isp_subdev_registered, >> + .unregistered = isp_subdev_unregistered, >> +}; >> + >> +static struct v4l2_subdev_ops isp_subdev_ops; >> + >> +int fimc_is_isp_subdev_create(struct fimc_is_isp *isp, >> + struct vb2_alloc_ctx *alloc_ctx, >> + struct fimc_is_pipeline *pipeline) >> +{ >> + struct v4l2_ctrl_handler *handler =&isp->ctrl_handler; >> + struct v4l2_subdev *sd =&isp->subdev; >> >> + int ret; >> + >> + /* Init context vars */ >> + isp->alloc_ctx = alloc_ctx; >> + isp->pipeline = pipeline; >> + isp->refcount = 0; >> + isp->fmt = (struct fimc_is_fmt *)&formats[1]; > > > What the casting is needed for ? > >> + v4l2_subdev_init(sd,&isp_subdev_ops); >> >> + sd->owner = THIS_MODULE; >> + sd->flags = V4L2_SUBDEV_FL_HAS_DEVNODE; >> + snprintf(sd->name, sizeof(sd->name), ISP_DRV_NAME); >> + >> + isp->subdev_pads[ISP_SD_PAD_SINK_DMA].flags = MEDIA_PAD_FL_SINK; >> + isp->subdev_pads[ISP_SD_PAD_SINK_OTF].flags = MEDIA_PAD_FL_SINK; >> + isp->subdev_pads[ISP_SD_PAD_SRC].flags = MEDIA_PAD_FL_SOURCE; >> + ret = media_entity_init(&sd->entity, ISP_SD_PADS_NUM, >> + isp->subdev_pads, 0); >> + if (ret< 0) >> + return ret; >> + >> + ret = v4l2_ctrl_handler_init(handler, 1); >> + if (handler->error) >> + goto err_ctrl; >> + >> + sd->ctrl_handler = handler; >> + sd->internal_ops =&isp_subdev_internal_ops; >> + v4l2_set_subdevdata(sd, isp); >> + >> + return 0; >> + >> +err_ctrl: >> + media_entity_cleanup(&sd->entity); >> + v4l2_ctrl_handler_free(handler); >> + return ret; >> +} >> + >> +void fimc_is_isp_subdev_destroy(struct fimc_is_isp *isp) >> +{ >> + struct v4l2_subdev *sd =&isp->subdev; >> >> + >> + v4l2_device_unregister_subdev(sd); >> + media_entity_cleanup(&sd->entity); >> + v4l2_ctrl_handler_free(&isp->ctrl_handler); >> + v4l2_set_subdevdata(sd, NULL); >> +} >> + >> diff --git a/drivers/media/platform/exynos5-is/fimc-is-isp.h >> b/drivers/media/platform/exynos5-is/fimc-is-isp.h >> new file mode 100644 >> index 0000000..f707a8d >> --- /dev/null >> +++ b/drivers/media/platform/exynos5-is/fimc-is-isp.h >> @@ -0,0 +1,89 @@ >> +/* >> + * Samsung EXYNOS4x12 FIMC-IS (Imaging Subsystem) driver >> + * >> + * Copyright (C) 2012 Samsung Electronics Co., Ltd. >> + * Arun Kumar K<arun.kk@samsung.com> >> + * >> + * This program is free software; you can redistribute it and/or modify >> + * it under the terms of the GNU General Public License version 2 as >> + * published by the Free Software Foundation. >> + */ >> +#ifndef FIMC_IS_ISP_H_ >> +#define FIMC_IS_ISP_H_ >> + >> +#include "fimc-is-core.h" >> +#include "fimc-is-pipeline.h" >> + >> +#define FIMC_IS_ISP_REQ_BUFS_MIN 2 > > > This is currently unused, but I guess you need to add some > code to ensure minimum number of buffer for the DMA interfaces. > Yes will do that. > >> +#define ISP_SD_PAD_SINK_DMA 0 >> +#define ISP_SD_PAD_SINK_OTF 1 >> +#define ISP_SD_PAD_SRC 2 >> +#define ISP_SD_PADS_NUM 3 >> + >> +#define ISP_MAX_BUFS 2 >> + >> +/** >> + * struct fimc_is_isp - ISP context >> + * @vfd: video device node >> + * @fh: v4l2 file handle >> + * @alloc_ctx: videobuf2 memory allocator context >> + * @subdev: fimc-is-isp subdev >> + * @vd_pad: media pad for the output video node >> + * @subdev_pads: the subdev media pads >> + * @ctrl_handler: v4l2 control handler >> + * @video_lock: video lock mutex >> + * @refcount: keeps track of number of instances opened >> + * @pipeline: pipeline instance for this isp context >> + * @vbq: vb2 buffers queue for ISP output video node >> + * @wait_queue: list holding buffers waiting to be queued to HW >> + * @wait_queue_cnt: wait queue number of buffers >> + * @run_queue: list holding buffers queued to HW >> + * @run_queue_cnt: run queue number of buffers >> + * @output_bufs: isp output buffers array >> + * @out_buf_cnt: number of output buffers in use >> + * @fmt: output plane format for isp >> + * @width: user configured input width >> + * @height: user configured input height >> + * @num_buffers: number of output plane buffers in use >> + * @size_image: image size in bytes >> + * @output_state: state of the output video node operations >> + */ >> +struct fimc_is_isp { >> + struct video_device vfd; >> + struct v4l2_fh fh; >> + struct vb2_alloc_ctx *alloc_ctx; >> + struct v4l2_subdev subdev; >> + struct media_pad vd_pad; >> + struct media_pad subdev_pads[ISP_SD_PADS_NUM]; >> + struct v4l2_ctrl_handler ctrl_handler; >> + >> + struct mutex video_lock; >> + >> + unsigned int refcount; >> + >> + struct fimc_is_pipeline *pipeline; >> + >> + struct vb2_queue vbq; >> + struct list_head wait_queue; >> + unsigned int wait_queue_cnt; >> + struct list_head run_queue; >> + unsigned int run_queue_cnt; >> + >> + struct fimc_is_buf output_bufs[ISP_MAX_BUFS]; >> + unsigned int out_buf_cnt; >> + >> + struct fimc_is_fmt *fmt; >> + unsigned int width; >> + unsigned int height; >> + unsigned int num_buffers; >> + unsigned int size_image; >> + unsigned long output_state; >> +}; >> + >> +int fimc_is_isp_subdev_create(struct fimc_is_isp *isp, >> + struct vb2_alloc_ctx *alloc_ctx, >> + struct fimc_is_pipeline *pipeline); >> +void fimc_is_isp_subdev_destroy(struct fimc_is_isp *isp); >> + >> +#endif /* FIMC_IS_ISP_H_ */ > > > Thanks, > Sylwester Thanks and regards Arun ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [RFC v2 06/10] exynos5-fimc-is: Adds isp subdev 2013-07-09 11:42 ` Arun Kumar K @ 2013-07-16 22:11 ` Sylwester Nawrocki 2013-07-17 4:56 ` Arun Kumar K 0 siblings, 1 reply; 15+ messages in thread From: Sylwester Nawrocki @ 2013-07-16 22:11 UTC (permalink / raw) To: Arun Kumar K Cc: Sylwester Nawrocki, Arun Kumar K, LMML, Sylwester Nawrocki, kilyeon.im, shaik.ameer, linux-samsung-soc On 07/09/2013 01:42 PM, Arun Kumar K wrote: >>> + /* Check if same as sensor width& height */ >>> >> >>> >> + sensor_width = p->sensor->drvdata->pixel_width; >>> >> + sensor_height = p->sensor->drvdata->pixel_height; >>> >> + if ((sensor_width != f->fmt.pix_mp.width) || >>> >> + (sensor_height != f->fmt.pix_mp.height)) { >> > >> > >> > What's the point of this check ? >> > > Check was added to ensure ISP input width and height is > set same as the sensor output or not. > But yes this cannot be extended to generic (non-IS controlled) sensors. > Will drop this check and let media controller take care. > >> > >>> >> + f->fmt.pix_mp.width = sensor_width; >>> >> + f->fmt.pix_mp.height = sensor_height; >>> >> + } I meant that you could do the assignment unconditionally, since you always end up with sensor_width/height assigned to pix_mp.width/height. Indeed, this should be handled by subdev ioctls, and any discrepancies should be detected while starting streaming and reported to user space. -- Thanks, Sylwester ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [RFC v2 06/10] exynos5-fimc-is: Adds isp subdev 2013-07-16 22:11 ` Sylwester Nawrocki @ 2013-07-17 4:56 ` Arun Kumar K 0 siblings, 0 replies; 15+ messages in thread From: Arun Kumar K @ 2013-07-17 4:56 UTC (permalink / raw) To: Sylwester Nawrocki Cc: LMML, Sylwester Nawrocki, kilyeon.im, shaik.ameer, linux-samsung-soc Hi Sylwester, On Wed, Jul 17, 2013 at 3:41 AM, Sylwester Nawrocki <sylvester.nawrocki@gmail.com> wrote: > On 07/09/2013 01:42 PM, Arun Kumar K wrote: >>>> >>>> + /* Check if same as sensor width& height */ >>>> >> >>>> >> + sensor_width = p->sensor->drvdata->pixel_width; >>>> >> + sensor_height = p->sensor->drvdata->pixel_height; >>>> >> + if ((sensor_width != f->fmt.pix_mp.width) || >>>> >> + (sensor_height != f->fmt.pix_mp.height)) { >>> >>> > >>> > >>> > What's the point of this check ? >>> > >> >> Check was added to ensure ISP input width and height is >> set same as the sensor output or not. >> But yes this cannot be extended to generic (non-IS controlled) sensors. >> Will drop this check and let media controller take care. >> >>> > >>>> >>>> >> + f->fmt.pix_mp.width = sensor_width; >>>> >> + f->fmt.pix_mp.height = sensor_height; >>>> >> + } > > > I meant that you could do the assignment unconditionally, since you > always end up with sensor_width/height assigned to pix_mp.width/height. > Indeed, this should be handled by subdev ioctls, and any discrepancies > should be detected while starting streaming and reported to user space. > Ok I got it. Will modify accordingly Thanks & Regards Arun ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [RFC v2 06/10] exynos5-fimc-is: Adds isp subdev 2013-06-20 23:25 ` [RFC v2 06/10] exynos5-fimc-is: Adds isp subdev Sylwester Nawrocki 2013-07-09 11:42 ` Arun Kumar K @ 2013-08-02 4:31 ` Arun Kumar K 2013-08-03 21:38 ` Sylwester Nawrocki 1 sibling, 1 reply; 15+ messages in thread From: Arun Kumar K @ 2013-08-02 4:31 UTC (permalink / raw) To: Sylwester Nawrocki Cc: LMML, Sylwester Nawrocki, kilyeon.im, shaik.ameer, linux-samsung-soc Hi Sylwester, On Fri, Jun 21, 2013 at 4:55 AM, Sylwester Nawrocki <sylvester.nawrocki@gmail.com> wrote: > On 05/31/2013 03:03 PM, Arun Kumar K wrote: >> >> fimc-is driver takes video data input from the ISP video node >> which is added in this patch. This node accepts Bayer input >> buffers which is given from the IS sensors. >> >> Signed-off-by: Arun Kumar K<arun.kk@samsung.com> >> Signed-off-by: Kilyeon Im<kilyeon.im@samsung.com> >> --- >> drivers/media/platform/exynos5-is/fimc-is-isp.c | 438 >> +++++++++++++++++++++++ >> drivers/media/platform/exynos5-is/fimc-is-isp.h | 89 +++++ >> 2 files changed, 527 insertions(+) >> create mode 100644 drivers/media/platform/exynos5-is/fimc-is-isp.c >> create mode 100644 drivers/media/platform/exynos5-is/fimc-is-isp.h >> [snip] >> + * Video node ioctl operations >> + */ >> +static int isp_querycap_output(struct file *file, void *priv, >> + struct v4l2_capability *cap) >> +{ >> + strncpy(cap->driver, ISP_DRV_NAME, sizeof(cap->driver) - 1); >> + strncpy(cap->card, ISP_DRV_NAME, sizeof(cap->card) - 1); >> + strncpy(cap->bus_info, ISP_DRV_NAME, sizeof(cap->bus_info) - 1); >> + cap->capabilities = V4L2_CAP_STREAMING | >> V4L2_CAP_VIDEO_OUTPUT_MPLANE; >> + cap->device_caps = V4L2_CAP_STREAMING | >> V4L2_CAP_VIDEO_OUTPUT_MPLANE; > > > cap->capabilities = V4L2_CAP_STREAMING; > > cap->device_caps = V4L2_CAP_STREAMING | > V4L2_CAP_VIDEO_OUTPUT_MPLANE; > > This should be: > > cap->device_caps = V4L2_CAP_STREAMING; > cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; > > Media Controller device nodes must not use V4L2_CAP_VIDEO_{OUTPUT, > CAPTURE}_(_MPLANE) > capability flags. > If I dont provide any video capabilities, the v4l2-compliance tool gives a fail : fail: v4l2-compliance.cpp(298) : node->is_video && !(dcaps & video_caps) test VIDIOC_QUERYCAP: FAIL This error doesn't come if I give V4L2_CAP_VIDEO_OUTPUT_MPLANE capability. One more related error compliance tool gives is : fail: v4l2-test-formats.cpp(286): Video Output Multiplanar cap not set, but Video Output Multiplanar formats defined test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: FAIL Shall these errors be ignored? Regards Arun ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [RFC v2 06/10] exynos5-fimc-is: Adds isp subdev 2013-08-02 4:31 ` Arun Kumar K @ 2013-08-03 21:38 ` Sylwester Nawrocki 0 siblings, 0 replies; 15+ messages in thread From: Sylwester Nawrocki @ 2013-08-03 21:38 UTC (permalink / raw) To: Arun Kumar K Cc: Sylwester Nawrocki, LMML, Sylwester Nawrocki, kilyeon.im, shaik.ameer, linux-samsung-soc, Hans Verkuil, Mauro Carvalho Chehab Hi Arun, On 08/02/2013 06:31 AM, Arun Kumar K wrote: [...] >>> + * Video node ioctl operations >>> + */ >>> +static int isp_querycap_output(struct file *file, void *priv, >>> + struct v4l2_capability *cap) >>> +{ >>> + strncpy(cap->driver, ISP_DRV_NAME, sizeof(cap->driver) - 1); >>> + strncpy(cap->card, ISP_DRV_NAME, sizeof(cap->card) - 1); >>> + strncpy(cap->bus_info, ISP_DRV_NAME, sizeof(cap->bus_info) - 1); >>> + cap->capabilities = V4L2_CAP_STREAMING | >>> V4L2_CAP_VIDEO_OUTPUT_MPLANE; >>> + cap->device_caps = V4L2_CAP_STREAMING | >>> V4L2_CAP_VIDEO_OUTPUT_MPLANE; >> >> >> cap->capabilities = V4L2_CAP_STREAMING; >> >> cap->device_caps = V4L2_CAP_STREAMING | >> V4L2_CAP_VIDEO_OUTPUT_MPLANE; >> >> This should be: >> >> cap->device_caps = V4L2_CAP_STREAMING; >> cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; >> >> Media Controller device nodes must not use V4L2_CAP_VIDEO_{OUTPUT, >> CAPTURE}_(_MPLANE) capability flags. > > If I dont provide any video capabilities, the v4l2-compliance tool > gives a fail : > > fail: v4l2-compliance.cpp(298) : node->is_video&& !(dcaps& video_caps) > test VIDIOC_QUERYCAP: FAIL > > This error doesn't come if I give V4L2_CAP_VIDEO_OUTPUT_MPLANE capability. > > One more related error compliance tool gives is : > > fail: v4l2-test-formats.cpp(286): Video Output Multiplanar cap not > set, but Video Output Multiplanar formats defined > test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: FAIL > > Shall these errors be ignored? I think so, yes. The capability flags should be set by a driver-specific user space library/middleware. Such a library would intercept VIDIOC_QUERYBUF ioctl and set relevant capability flags. I believe v4l2-compliance should not be used on the bare video device nodes your driver provides. It should be used together with, e.g. libv4l2 plugin for this driver. My colleague have been working on such a plugin for exynos4-is driver. There is still on my todo list modifying FIMC video capture node driver to allow video device open() even when no links to, e.g. sensor subdev were created. This is needed because with libv4l2 video device open() must succeed in order for the plugin to have its initialization routine called. Then the plugin configures pipeline according to e.g. data stored in a configuration file, and for some VIDIOC_* ioctls it does additional stuff on involved subdevices to ensure VIDIOC_* ioctls work as if the /dev/video would be plain V4L2 video node, without any subdev/MC stuff. I think you're just using wrong tool for the purpose. v4l2-compliance is just not suitable for testing MC video nodes without corresponding user space library that would handle quirks of your device. If you set the V4L2_CAP_VIDEO_OUTPUT_MPLANE capability standard applications, e.g. v4l2-src GStreamer plugin (oh, it likely doesn't have support for _MPLANE yet anyway) may get confused that this video node is a regular capture video node and users would start filling in bug reports thinking that your driver is crap because it doesn't work as expected. ;-) Hans and Mauro may want to correct/add something to what is said above. -- Thanks, Sylwester ^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2013-08-03 21:38 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1370005408-10853-1-git-send-email-arun.kk@samsung.com>
[not found] ` <1370005408-10853-2-git-send-email-arun.kk@samsung.com>
2013-06-20 22:45 ` [RFC v2 01/10] exynos5-fimc-is: Add Exynos5 FIMC-IS device tree bindings documentation Sylwester Nawrocki
2013-07-09 11:08 ` Arun Kumar K
2013-07-16 21:23 ` Sylwester Nawrocki
2013-07-17 4:42 ` Arun Kumar K
[not found] ` <1370005408-10853-4-git-send-email-arun.kk@samsung.com>
2013-06-20 22:46 ` [RFC v2 03/10] exynos5-fimc-is: Adds common driver header files Sylwester Nawrocki
2013-06-21 7:14 ` Arun Kumar K
2013-07-09 11:20 ` Arun Kumar K
[not found] ` <1370005408-10853-6-git-send-email-arun.kk@samsung.com>
2013-06-20 23:04 ` [RFC v2 05/10] exynos5-fimc-is: Adds the sensor subdev Sylwester Nawrocki
2013-07-09 12:01 ` Arun Kumar K
[not found] ` <1370005408-10853-7-git-send-email-arun.kk@samsung.com>
2013-06-20 23:25 ` [RFC v2 06/10] exynos5-fimc-is: Adds isp subdev Sylwester Nawrocki
2013-07-09 11:42 ` Arun Kumar K
2013-07-16 22:11 ` Sylwester Nawrocki
2013-07-17 4:56 ` Arun Kumar K
2013-08-02 4:31 ` Arun Kumar K
2013-08-03 21:38 ` Sylwester Nawrocki
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox