summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-11-18packaging: update to 3.10.60v3.10.60-rebaseChanho Park3-3/+3
Change-Id: Icf9f18a293de098cc93b863a49591660807b51bc Signed-off-by: Chanho Park <chanho61.park@samsung.com>
2014-11-18drm/exynos: use irq_flags instead of triggeringJoonyoung Shim1-1/+1
The drm_handle_vblank should be called whenever be vsync, te interrupt means vsync on i80 interface. Change-Id: I620346fc78e02589b398a0aaee74a2eb60579720 Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
2014-11-18packaging: separate modules.imgChanho Park3-28/+2
This patch separates modules.img from /boot. We'll add a new partition for modules. Change-Id: I50ef63dfebacd389c96d7e012970f1a1e9796125 Signed-off-by: Chanho Park <chanho61.park@samsung.com>
2014-11-18gpu: arm: mali400: fix buile warningJoonyoung Shim1-1/+6
drivers/gpu/arm/mali400/mali/platform/exynos4/exynos4.c: In function ‘mali_platform_init’: drivers/gpu/arm/mali400/mali/platform/exynos4/exynos4.c:346:2: warning: ignoring return value of ‘regulator_enable’, declared with attribute warn_unused_result [-Wunused-result] regulator_enable(mali->vdd_g3d); ^ Change-Id: I72d60e94e2f7380fcc7a457cf487368037d30b7a Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
2014-11-18gpu: arm: mali400: add exynos3250 support for R4P0_REL0Joonyoung Shim2-1/+13
This is based on drivers/gpu/arm/mali400/mali/platform/exynos4/exynos4.c Change-Id: Ib030f2463648983f3855d827d022c15ad3a76ab9 Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
2014-11-18gpu: arm: mali400: fix warning on bootingJoonyoung Shim3-3/+3
This fixes below warnings. [ 1.461424] ------------[ cut here ]------------ [ 1.464524] WARNING: at fs/proc/generic.c:101 __xlate_proc_name+0xa8/0xbc() [ 1.471444] name '/gpu@13000000' [ 1.474651] Modules linked in: [ 1.477678] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 3.10.39-01649-g6491ddb-dirty #15 [ 1.485623] [<c0014224>] (unwind_backtrace+0x0/0xf4) from [<c0011520>] (show_stack+0x10/0x14) [ 1.494120] [<c0011520>] (show_stack+0x10/0x14) from [<c001ff7c>] (warn_slowpath_common+0x54/0x6c) [ 1.503050] [<c001ff7c>] (warn_slowpath_common+0x54/0x6c) from [<c001ffc4>] (warn_slowpath_fmt+0x30/0x40) [ 1.512598] [<c001ffc4>] (warn_slowpath_fmt+0x30/0x40) from [<c010774c>] (__xlate_proc_name+0xa8/0xbc) [ 1.521886] [<c010774c>] (__xlate_proc_name+0xa8/0xbc) from [<c01077ac>] (__proc_create+0x4c/0x100) [ 1.530910] [<c01077ac>] (__proc_create+0x4c/0x100) from [<c0107b18>] (proc_mkdir_data+0x2c/0x68) [ 1.539766] [<c0107b18>] (proc_mkdir_data+0x2c/0x68) from [<c007b72c>] (register_handler_proc+0xd8/0xf0) [ 1.549233] [<c007b72c>] (register_handler_proc+0xd8/0xf0) from [<c0077b38>] (__setup_irq+0x1e4/0x440) [ 1.558525] [<c0077b38>] (__setup_irq+0x1e4/0x440) from [<c0077ec4>] (request_threaded_irq+0xa8/0x128) [ 1.567817] [<c0077ec4>] (request_threaded_irq+0xa8/0x128) from [<c02a6f34>] (_mali_osk_irq_init+0x64/0x124) [ 1.577628] [<c02a6f34>] (_mali_osk_irq_init+0x64/0x124) from [<c02afa58>] (mali_pp_create+0xac/0x23c) [ 1.586899] [<c02afa58>] (mali_pp_create+0xac/0x23c) from [<c02aa94c>] (mali_initialize_subsystems+0x21c/0x7d8) [ 1.596966] [<c02aa94c>] (mali_initialize_subsystems+0x21c/0x7d8) from [<c02ab854>] (mali_probe+0x3c/0x254) [ 1.606697] [<c02ab854>] (mali_probe+0x3c/0x254) from [<c02bd314>] (driver_probe_device+0x88/0x244) [ 1.615715] [<c02bd314>] (driver_probe_device+0x88/0x244) from [<c02bd5a0>] (__driver_attach+0x8c/0x90) [ 1.625089] [<c02bd5a0>] (__driver_attach+0x8c/0x90) from [<c02bb8f0>] (bus_for_each_dev+0x60/0x94) [ 1.634121] [<c02bb8f0>] (bus_for_each_dev+0x60/0x94) from [<c02bcb68>] (bus_add_driver+0x1c0/0x24c) [ 1.643232] [<c02bcb68>] (bus_add_driver+0x1c0/0x24c) from [<c02bdb78>] (driver_register+0x78/0x140) [ 1.652345] [<c02bdb78>] (driver_register+0x78/0x140) from [<c02abaa4>] (mali_module_init+0xc/0x50) [ 1.661370] [<c02abaa4>] (mali_module_init+0xc/0x50) from [<c000870c>] (do_one_initcall+0x108/0x158) [ 1.670505] [<c000870c>] (do_one_initcall+0x108/0x158) from [<c07bec54>] (kernel_init_freeable+0x13c/0x1dc) [ 1.680214] [<c07bec54>] (kernel_init_freeable+0x13c/0x1dc) from [<c05a05bc>] (kernel_init+0xc/0x160) [ 1.689411] [<c05a05bc>] (kernel_init+0xc/0x160) from [<c000df58>] (ret_from_fork+0x14/0x3c) [ 1.697837] ---[ end trace e694d4bb842a349f ]--- Change-Id: Ic2b9ef0388f929e5d028ccd3b10882aecc9c815e Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
2014-11-18gpu: arm: mali400: modify DVFS tables and settingJoonyoung Shim2-39/+37
This comes from commit ("local/ARM/MALI400: R4P0_REL0: Clean up codes") of in-house kernel. Change-Id: Id835808d157438527d32b3f3cf46108ab8d45fb6 Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
2014-11-18gpu: arm: mali400: fix clocks for R4P0_REL0Joonyoung Shim1-22/+43
It needs clock setting change by the commit 0a88cf3 ("ARM: dts: exynos4x12: clean up clock property for gpu node"). Change-Id: I18d40e382c152a1a7c9dcd3077cbc2a83b265485 Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
2014-11-18gpu: arm: mali400: use exynos platform of R3P2_REL0 for R4P0_REL0Joonyoung Shim2-342/+159
It's better R3P2_REL0 exynos platform codes than R4P0_REL0. Change-Id: Ia97c1b800a209a98a860f533e5617efebcf3e600 Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
2014-11-18gpu: arm: mali400: remove unnecessary #if 0 for R4P0_REL0Joonyoung Shim1-2/+0
I don't know why added it. Change-Id: I60ecbc113d4a9fb1e32971bd249f1fe167b0c2d9 Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
2014-11-18ARM/MALI400: R4P0_REL0: port with exynos common platformYoungJun Cho18-5425/+555
This patch ports mali400 r4p0 rel0 with exynos common platform. Change-Id: I741c2fbd76cbb7177472ea61b40d7fab22a7c081 Signed-off-by: YoungJun Cho <yj44.cho@samsung.com>
2014-11-18gpu: arm: Add mali400 r4p0_rel0 versionJoonyoung Shim152-14/+38240
This comes from in-house kernel. Change-Id: Ic3f3516e44e71ea9ca2e0b5caa6a9e836ffa599c Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
2014-11-18[media] s5p-mfc: Adjust memports handling to MFC v7 needs.Jacek Anaszewski1-5/+9
MFC v7 supports only one memory interface. Adjust memory ports initialization accordingly. Change-Id: I56e2c582c41f9ad948dc612b3060688619195b1c Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
2014-11-18[media] s5p-mfc: Update driver for v7 firmwareArun Kumar K3-9/+54
Firmware version v7 is mostly similar to v6 in terms of hardware specific controls and commands. So the hardware specific opr_v6 and cmd_v6 are re-used for v7 also. This patch updates the v6 files to handle v7 version also. Change-Id: I137075c6802cfef3aa40cb45413837f18fa969eb Signed-off-by: Arun Kumar K <arun.kk@samsung.com> Signed-off-by: Kamil Debski <k.debski@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-11-18[media] s5p-mfc: Core support for MFC v7Arun Kumar K3-0/+35
Adds variant data and core support for the MFC v7 firmware Change-Id: I5dc12438d3bfdf6d254f4ced3089e1881d524e0b Signed-off-by: Arun Kumar K <arun.kk@samsung.com> Signed-off-by: Kamil Debski <k.debski@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-11-18[media] s5p-mfc: Add register definition file for MFC v7Arun Kumar K1-0/+58
The patch adds the register definition file for new firmware version v7 for MFC. New firmware supports VP8 encoding along with many other features. Change-Id: I3abf2768fe2a59ec45f6f4a2660c3ccf23f7ca88 Signed-off-by: Arun Kumar K <arun.kk@samsung.com> Signed-off-by: Kamil Debski <k.debski@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-11-18[media] s5p-mfc: Rename IS_MFCV6 macroArun Kumar K6-24/+34
The MFC v6 specific code holds good for MFC v7 also as the v7 version is a superset of v6 and the HW interface remains more or less similar. This patch renames the macro IS_MFCV6() to IS_MFCV6_PLUS() so that it can be used for v7 also. Change-Id: Ia27f4ed36cc46568bbe9152f13332436f04e106a Signed-off-by: Arun Kumar K <arun.kk@samsung.com> Signed-off-by: Kamil Debski <k.debski@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-11-18ARM: dts: exynos3250-rinato: add MFC codec device nodeJacek Anaszewski1-0/+4
This patch adds mfc codec device tree node. Change-Id: I6d4ef65b1c518ddcace691c23aded8e0797193e4 Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
2014-11-18ARM: dts: exynos3250: add MFC codec device nodeJacek Anaszewski1-0/+27
This patch adds mfc codec device tree node and the corresponding IOMMU device node. Change-Id: I8ea6b68b92fe035ec947cc5319b0cd1d070764d0 Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
2014-11-18[media] media: s5p-mfc: rename special clock to sclk_mfcMarek Szyprowski1-1/+1
Commit d19f405a5a8d2ed942b40f8cf7929a5a50d0cc59 ("[media] s5p-mfc: Fix selective sclk_mfc init") added support for special clock handling (named "sclk-mfc"). However this clock is not defined yet on any platform, so before adding it to all Exynos platform, better rename it to "sclk_mfc" to match the scheme used for all other special clocks on Exynos platform. Change-Id: I41f646096e8a82c3cca032e1cc7a70f6d2960059 Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Kamil Debski <k.debski@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-11-18[media] s5p-mfc: Fix selective sclk_mfc initJacek Anaszewski1-0/+24
fc906b6d "Remove special clock usage in driver" removed initialization of MFC special clock, arguing that there's no need to do it explicitly, since it's one of MFC gate clock's dependencies and gets enabled along with it. However, there's no promise of keeping this hierarchy across Exynos SoC releases, therefore this approach fails to provide a stable, portable solution. Out of all MFC versions, only v6 doesn't use special clock at all. For other versions log a message only in case clk_get fails, as not all the devices with the same MFC version require initializing the clock explicitly. Change-Id: Id5ee2696c7b880f45f9744b6bac603dcee9e3dcb Signed-off-by: Mateusz Zalega <m.zalega@samsung.com> Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com> Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Kamil Debski <k.debski@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-11-18Revert "media: s5p-mfc: add to set clock rate"Jacek Anaszewski1-13/+0
This reverts commit 2cbd58556a83b417750483de842e1e918de273a3. Mainline commit d19f405a "Fix selective sclk_mfc init" solves the issue in a wider scope. Change-Id: Ib163697c3ae65e30b6e13f6f7170d791d853a6f0 Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
2014-11-18[media] s5p-jpeg: fix HUF_TBL_EN bit clearing pathJacek Anaszewski1-1/+1
Use proper bitwise operator while clearing HUF_TBL_EN bit. Change-Id: Ic78dd26168ffa6124d61f8cb9549339f05cff0d9 Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> Signed-off-by: Kamil Debski <k.debski@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-11-18[media] s5p-jpeg: avoid overwriting JPEG_CNTL register settingsJacek Anaszewski1-2/+2
Take into account the JPEG_CNTL register value read before setting SYS_INT_EN bit field. Change-Id: I76b622f01be6747ea2ad95e63fb305377b0f540b Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> Signed-off-by: Kamil Debski <k.debski@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-11-18[media] s5p-jpeg: remove stray call to readlJacek Anaszewski1-3/+0
There is no need to read INT_EN_REG before enabling interrupts. Change-Id: Idebb919754df34fb2bfa53982a4ea0a7be3f1fe7 Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> Signed-off-by: Kamil Debski <k.debski@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-11-18[media] s5p-jpeg: Avoid assigning readl resultJacek Anaszewski1-3/+1
Avoid gcc warning when -Wunused-but-set-variable is enabled. The readl return value need not to be assigned to any variable as the reading itself is just a part of a sequence required for clearing the interrupt flag. Change-Id: I09b9ec4a724ae46eca0491d81003cd0c0f714ad2 Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> Signed-off-by: Kamil Debski <k.debski@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-11-18[media] s5p-jpeg: Get rid of a warningMauro Carvalho Chehab1-1/+1
drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.c: In function 's5p_jpeg_clear_int': drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.c:327:16: warning: variable 'reg' set but not used [-Wunused-but-set-variable] unsigned long reg; ^ Change-Id: I51401e5bc719fd8788933acf2181daa5b82bed38 Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-11-18ARM: dts: exynos3250: add JPEG codec device nodeJacek Anaszewski2-0/+17
Change-Id: I1c4d9de9c3c476356d71d3c219d7313c9492fddc Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
2014-11-18s5p-jpeg: Avoid -Wuninitialized warning in s5p_jpeg_parse_hdrJacek Anaszewski1-1/+1
Initialize components variable in order to avoid the possibility of using it uninitialized. Change-Id: Ib1c9c11d1fc94aa5aa4e28f24819b32d6dd1ee5c Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
2014-11-18[media] s5p-jpeg: add chroma subsampling adjustment for Exynos3250Jacek Anaszewski1-21/+38
Take into account limitations specific to the Exynos3250 SoC, regarding setting the chroma subsampling control's value. Change-Id: I5f106163efb3961b4684c111cee7527bfe5454f6 Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-11-18[media] s5p-jpeg: Prevent erroneous downscaling for Exynos3250 SoCJacek Anaszewski1-0/+18
JPEG codec on Exynos3250 SoC produces broken raw image if a JPEG image is decoded to YUV420 format and downscaled by a factor greater than 2. Prevent this by asserting downscale ratio to 2. Change-Id: Ib415579d25a4b076a1879b3108c3a08b3dcd4ab8 Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-11-18[media] s5p-jpeg: Assure proper crop rectangle initializationJacek Anaszewski1-0/+15
Assure proper crop_rect initialization in case the user space doesn't call S_SELECTION ioctl. Change-Id: I0ad267a1f3480efa83e78e714fb4ba94e08494be Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-11-18[media] s5p-jpeg: fix g_selection opJacek Anaszewski1-5/+7
V4L2_SEL_TGT_COMPOSE_DEFAULT switch case should select whole available area of the image and V4L2_SEL_TGT_COMPOSE should apply user settings. Change-Id: I32ea7a72f86a52b001a251782f821d0772f42e54 Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-11-18[media] s5p-jpeg: Adjust jpeg_bound_align_image to Exynos3250 needsJacek Anaszewski1-5/+20
The jpeg_bound_align_image function needs to know the context in which it is called, as it needs to align image dimensions in a slight different manner for Exynos3250, which crops pixels for specific values in case the format is RGB. Change-Id: I697ec8aa1bf602695618d3bc373031aa8e06d59a Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-11-18[media] s5p-jpeg: return error immediately after get_byte failsJacek Anaszewski1-2/+2
When parsing JPEG header s5p_jpeg_parse_hdr function should return immediately in case there was an error while reading a byte. Change-Id: I82429c1e2878f27276594da1069b30c40b83aadb Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-11-18[media] s5p-jpeg: Add support for Exynos3250 SoCJacek Anaszewski7-22/+1338
This patch adds support for jpeg codec on Exynos3250 SoC to the s5p-jpeg driver. Supported raw formats are: YUYV, YVYU, UYVY, VYUY, RGB565, RGB565X, RGB32, NV12, NV21. The support includes also scaling and cropping features. Change-Id: I16bc7135f97ef7cf029dff7e8f7c59cf0fea8daf Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-11-18[media] s5p-jpeg: Document sclk-jpeg clock for Exynos3250 SoCJacek Anaszewski1-4/+8
JPEG IP on Exynos3250 SoC requires enabling two clock gates for its operation. This patch documents this requirement. Change-Id: If6670c5b841d5a4fc7a9e47db5a234fa60e1b92e Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-11-18[media] s5p-jpeg: Fix NV12 format entry related to S5C2120 SoCJacek Anaszewski1-2/+1
S5PC210 SoC doesn't support encoding NV12 raw images. Remove relavant flag from the respective entry in the sjpeg_formats array. Change-Id: Ibe70ae070afab4dcf380c41dc36a2a276b8f78f3 Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-11-18[media] s5p-jpeg: Fix build break when CONFIG_OF is undefinedJacek Anaszewski1-10/+8
This patch fixes build break occurring when there is no support for Device Tree turned on in the kernel configuration. In such case only the driver variant for S5PC210 SoC will be available. Change-Id: Ic747bc56bbc5c624e9c21c9e68b62be806a18f60 Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-11-18[media] s5p-jpeg: Prevent JPEG 4:2:0 > YUV 4:2:0 decompressionJacek Anaszewski1-3/+22
Prevent decompression of a JPEG 4:2:0 with odd width to the YUV 4:2:0 compliant formats for Exynos4x12 SoCs and adjust capture format to RGB565 in such a case. This is required because the configuration would produce a raw image with broken luma component. Change-Id: Id4bf3ddca3fed89ee1a2db56c342661717e3db2e Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-11-18[media] s5p-jpeg: Fix sysmmu page faultJacek Anaszewski1-3/+43
This patch fixes jpeg sysmmu page fault on Exynos4x12 SoCs. During encoding Exynos4x12 SoCs access wider memory area than it results from Image_x and Image_y values written to the JPEG_IMAGE_SIZE register. In order to avoid sysmmu page fault apply proper output buffer size alignment. Change-Id: I39f40d68b10c29d0085cbd0ef986b9f311fd7ba8 Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-11-18[media] s5p-jpeg: g_selection callback should always succeedJacek Anaszewski1-2/+1
Remove erroneous guard preventing successful execution of g_selection callback in case the driver variant is different from SJPEG_S5P. Change-Id: I4db87c0abfc0fd15ec8ae137192e522136ecec1b Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-11-18[media] s5p-jpeg: Add m2m_ops field to the s5p_jpeg_variant structureJacek Anaszewski2-11/+8
Simplify the code by adding m2m_ops field to the s5p_jpeg_variant structure which allows to avoid "if" statement in the s5p_jpeg_probe function. Change-Id: I3ae0bc8e5af4ee26aa13f136255342eb3c50e89e Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-11-18[media] s5p-jpeg: Perform fourcc downgrade only for Exynos4x12 SoCsJacek Anaszewski1-1/+1
Change the driver variant check from "is not S5PC210" to "is Exynos4" while checking whether YUV format needs to be downgraded in order to prevent upsampling which is not supported by Exynos4 SoCs family. Change-Id: Iedda710f6e6ea62555e2bde9481f7e789eb36fb9 Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-11-18[media] s5p-jpeg: Add fmt_ver_flag field to the s5p_jpeg_variant structureJacek Anaszewski2-7/+5
Simplify the code by adding fmt_ver_flag field to the s5p_jpeg_variant structure which allows to avoid "if" statement in the s5p_jpeg_find_format function. Change-Id: I0f5610b5450a9d29ec1fc09f2837f712b76ac909 Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-11-18[media] s5p-jpeg: Fix broken indentation in jpeg-regs.hJacek Anaszewski1-12/+12
Change-Id: I5a0ac834689e86400078421f033b5b1d07eb3e05 Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-11-18[media] s5p-jpeg: Fix wrong NV12 format parametersJacek Anaszewski1-4/+4
NV12 format entries in the sjpeg_formats array had wrong colplanes, depth and v_align values. Change-Id: I1c5813862046fa9b1bf0a327721a05e630b39e1c Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-11-18[media] s5p-jpeg: Adjust g_volatile_ctrl callback to Exynos4x12 needsJacek Anaszewski1-6/+23
Whereas S5PC210 device produces decoded JPEG subsampling values that map on V4L2_JPEG_CHROMA_SUBSAMPLNG values, the Exynos4x12 device doesn't. This patch adds helper function s5p_jpeg_to_user_subsampling, which performs suitable translation. Change-Id: Ide93376b0fd413cb769a562ebe727ee706391dff Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-11-18[media] s5p-jpeg: Ensure setting correct value of the chroma subsampling controlJacek Anaszewski1-0/+35
Exynos4x12 has limitations regarding setting chroma subsampling of an output JPEG image. It cannot be lower than the subsampling of the raw source image. Also in case of V4L2_JPEG_CHROMA_SUBSAMPLING_GRAY option the source image fourcc has to be V4L2_PIX_FMT_GREY. This patch implements try_ctrl callback containing mechanism that prevents setting invalid value of the V4L2_CID_JPEG_CHROMA_SUBSAMPLING control. Change-Id: Ic0f08644f21fb167e049ac60a7d49b14d5e0f058 Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-11-18[media] s5p-jpeg: Synchronize V4L2_CID_JPEG_CHROMA_SUBSAMPLING control valueJacek Anaszewski1-0/+8
When output queue fourcc is set to any flavour of YUV, the V4L2_CID_JPEG_CHROMA_SUBSAMPLING control value as well as its in-driver cached counterpart have to be updated with the subsampling property of the format so as to be able to provide correct information to the user space and preclude setting an illegal subsampling mode for Exynos4x12 encoder. Change-Id: I342638537b57940d411513a5465bf8449a1d1091 Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>