From: Sylwester Nawrocki <s.nawrocki@samsung.com>
To: Sylwester Nawrocki <snjw23@gmail.com>
Cc: Mauro Carvalho Chehab <mchehab@redhat.com>,
"linux-media@vger.kernel.org" <linux-media@vger.kernel.org>
Subject: Re: [GIT PULL FOR 3.5] s5p-fimc driver updates
Date: Tue, 15 May 2012 17:41:36 +0200 [thread overview]
Message-ID: <4FB27930.9020408@samsung.com> (raw)
In-Reply-To: <4FB17B79.2000207@gmail.com>
Hi Mauro,
On 05/14/2012 11:39 PM, Sylwester Nawrocki wrote:
> On 05/10/2012 10:48 AM, Sylwester Nawrocki wrote:
>> On 05/04/2012 05:31 PM, Sylwester Nawrocki wrote:
...
>> Mauro,
>>
>> I've found a few issues in this series afterwards and re-edited 3 commits there.
>> Here is an updated pull request:
>>
>> The following changes since commit ae45d3e9aea0ab951dbbca2238fbfbf3993f1e7f:
>>
>> s5p-fimc: Correct memory allocation for VIDIOC_CREATE_BUFS (2012-05-09 16:07:49 +0200)
>>
>> are available in the git repository at:
>>
>> git://git.infradead.org/users/kmpark/linux-samsung v4l-fimc-exynos4x12
>>
>> for you to fetch changes up to 5feefe6656583de6fd4ef1d53b19031dd5efeec1:
>>
>> s5p-fimc: Use selection API in place of crop operations (2012-05-09 16:11:29 +0200)
>>
>> ----------------------------------------------------------------
>> Sylwester Nawrocki (14):
>> V4L: Extend V4L2_CID_COLORFX with more image effects
>> s5p-fimc: Avoid crash with null platform_data
>> s5p-fimc: Move m2m node driver into separate file
>
> It seems there is a conflict now with this patch:
> http://git.linuxtv.org/media_tree.git/commit/5126f2590bee412e3053de851cb07f531e4be36a
>
> Attached are updated versions of the two conflicting patches, the others
> don't need touching.
>
> I could provide rebased version of the whole change set tomorrow - if needed.
Here comes the updated change set:
The following changes since commit 152a3a7320d1582009db85d8be365ce430d079af:
[media] v4l2-dev: rename two functions (2012-05-14 15:06:50 -0300)
are available in the git repository at:
git://git.infradead.org/users/kmpark/linux-samsung v4l-fimc-exynos4x12
for you to fetch changes up to 7df337fdecb908d6b7762b0b6d9160a911d0cafe:
s5p-fimc: Use selection API in place of crop operations (2012-05-15 11:02:53
+0200)
----------------------------------------------------------------
Sylwester Nawrocki (14):
s5p-fimc: Correct memory allocation for VIDIOC_CREATE_BUFS
s5p-fimc: Avoid crash with null platform_data
s5p-fimc: Move m2m node driver into separate file
s5p-fimc: Use v4l2_subdev internal ops to register video nodes
s5p-fimc: Refactor the register interface functions
s5p-fimc: Add FIMC-LITE register definitions
s5p-fimc: Rework the video pipeline control functions
s5p-fimc: Prefix format enumerations with FIMC_FMT_
s5p-fimc: Minor cleanups
s5p-fimc: Make sure an interrupt is properly requested
s5p-fimc: Add support for Exynos4x12 FIMC-LITE
s5p-fimc: Update copyright notices
s5p-fimc: Add color effect control
s5p-fimc: Use selection API in place of crop operations
drivers/media/video/Kconfig | 24 +-
drivers/media/video/s5p-fimc/Kconfig | 48 +++
drivers/media/video/s5p-fimc/Makefile | 6 +-
drivers/media/video/s5p-fimc/fimc-capture.c | 500
++++++++++++++++++++------------
drivers/media/video/s5p-fimc/fimc-core.c | 1109
+++++++++++----------------------------------------------------------
drivers/media/video/s5p-fimc/fimc-core.h | 256 +++++-----------
drivers/media/video/s5p-fimc/fimc-lite-reg.c | 300 +++++++++++++++++++
drivers/media/video/s5p-fimc/fimc-lite-reg.h | 150 ++++++++++
drivers/media/video/s5p-fimc/fimc-lite.c | 1576
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
drivers/media/video/s5p-fimc/fimc-lite.h | 213 ++++++++++++++
drivers/media/video/s5p-fimc/fimc-m2m.c | 824
++++++++++++++++++++++++++++++++++++++++++++++++++++
drivers/media/video/s5p-fimc/fimc-mdevice.c | 407 +++++++++++++++++---------
drivers/media/video/s5p-fimc/fimc-mdevice.h | 18 +-
drivers/media/video/s5p-fimc/fimc-reg.c | 613
+++++++++++++++++++++------------------
drivers/media/video/s5p-fimc/fimc-reg.h | 326 +++++++++++++++++++++
drivers/media/video/s5p-fimc/regs-fimc.h | 301 -------------------
include/media/s5p_fimc.h | 16 +
17 files changed, 4635 insertions(+), 2052 deletions(-)
create mode 100644 drivers/media/video/s5p-fimc/Kconfig
create mode 100644 drivers/media/video/s5p-fimc/fimc-lite-reg.c
create mode 100644 drivers/media/video/s5p-fimc/fimc-lite-reg.h
create mode 100644 drivers/media/video/s5p-fimc/fimc-lite.c
create mode 100644 drivers/media/video/s5p-fimc/fimc-lite.h
create mode 100644 drivers/media/video/s5p-fimc/fimc-m2m.c
create mode 100644 drivers/media/video/s5p-fimc/fimc-reg.h
delete mode 100644 drivers/media/video/s5p-fimc/regs-fimc.h
--
Regards,
Sylwester
next prev parent reply other threads:[~2012-05-15 15:41 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-04 15:31 [GIT PULL FOR 3.5] s5p-fimc driver updates Sylwester Nawrocki
2012-05-10 8:48 ` Sylwester Nawrocki
2012-05-14 21:39 ` Sylwester Nawrocki
2012-05-15 15:41 ` Sylwester Nawrocki [this message]
2012-05-20 12:39 ` Mauro Carvalho Chehab
2012-05-20 14:05 ` Sylwester Nawrocki
2012-05-20 15:30 ` Mauro Carvalho Chehab
2012-05-20 17:33 ` Sylwester Nawrocki
2012-05-14 13:04 ` Mauro Carvalho Chehab
2012-05-14 13:08 ` Mauro Carvalho Chehab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4FB27930.9020408@samsung.com \
--to=s.nawrocki@samsung.com \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@redhat.com \
--cc=snjw23@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.