* [PATCH] video: mxsfb: Adapt to new videomode API
@ 2013-04-09 14:16 Fabio Estevam
2013-04-10 8:27 ` Tomi Valkeinen
2013-04-12 2:11 ` Shawn Guo
0 siblings, 2 replies; 10+ messages in thread
From: Fabio Estevam @ 2013-04-09 14:16 UTC (permalink / raw)
To: linux-arm-kernel
commit 6cd2c7db4 (videomode: videomode_from_timing work) changed the name of
the function from videomode_from_timing() to videomode_from_timings().
commit 32ed6ef1 (videomode: create enum for videomode's display flags) changed
the 'data_flags' field in videomode structure to 'flags'
Adapt to these changes in order to fix the following errors:
drivers/video/mxsfb.c:761:3: error: too many arguments to function 'videomode_from_timing'
drivers/video/mxsfb.c:761:7: error: void value not ignored as it ought to be
drivers/video/mxsfb.c:768:9: error: 'struct videomode' has no member named 'data_flags'
drivers/video/mxsfb.c:770:9: error: 'struct videomode' has no member named 'data_flags'
Also select VIDEOMODE_HELPER in Kconfig to avoid linker errors.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
drivers/video/Kconfig | 1 +
drivers/video/mxsfb.c | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index d90e3f5..240f863 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -2428,6 +2428,7 @@ config FB_MXS
select FB_CFB_IMAGEBLIT
select FB_MODE_HELPERS
select OF_VIDEOMODE
+ select VIDEOMODE_HELPERS
help
Framebuffer support for the MXS SoC.
diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c
index eac7c1a..fb559f3 100644
--- a/drivers/video/mxsfb.c
+++ b/drivers/video/mxsfb.c
@@ -43,6 +43,7 @@
#include <linux/kernel.h>
#include <linux/of_device.h>
#include <linux/of_gpio.h>
+#include <video/display_timing.h>
#include <video/of_display_timing.h>
#include <linux/platform_device.h>
#include <linux/clk.h>
@@ -758,16 +759,16 @@ static int mxsfb_init_fbinfo_dt(struct mxsfb_info *host)
struct videomode vm;
struct fb_videomode fb_vm;
- ret = videomode_from_timing(timings, &vm, i);
+ ret = videomode_from_timings(timings, &vm, i);
if (ret < 0)
goto put_timings_node;
ret = fb_videomode_from_videomode(&vm, &fb_vm);
if (ret < 0)
goto put_timings_node;
- if (vm.data_flags & DISPLAY_FLAGS_DE_HIGH)
+ if (vm.flags & DISPLAY_FLAGS_DE_HIGH)
host->sync |= MXSFB_SYNC_DATA_ENABLE_HIGH_ACT;
- if (vm.data_flags & DISPLAY_FLAGS_PIXDATA_NEGEDGE)
+ if (vm.flags & DISPLAY_FLAGS_PIXDATA_NEGEDGE)
host->sync |= MXSFB_SYNC_DOTCLK_FALLING_ACT;
fb_add_videomode(&fb_vm, &fb_info->modelist);
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH] video: mxsfb: Adapt to new videomode API
2013-04-09 14:16 [PATCH] video: mxsfb: Adapt to new videomode API Fabio Estevam
@ 2013-04-10 8:27 ` Tomi Valkeinen
2013-04-10 12:36 ` Fabio Estevam
2013-04-12 2:11 ` Shawn Guo
1 sibling, 1 reply; 10+ messages in thread
From: Tomi Valkeinen @ 2013-04-10 8:27 UTC (permalink / raw)
To: linux-arm-kernel
On 2013-04-09 17:16, Fabio Estevam wrote:
> commit 6cd2c7db4 (videomode: videomode_from_timing work) changed the name of
> the function from videomode_from_timing() to videomode_from_timings().
>
> commit 32ed6ef1 (videomode: create enum for videomode's display flags) changed
> the 'data_flags' field in videomode structure to 'flags'
>
> Adapt to these changes in order to fix the following errors:
>
> drivers/video/mxsfb.c:761:3: error: too many arguments to function 'videomode_from_timing'
> drivers/video/mxsfb.c:761:7: error: void value not ignored as it ought to be
> drivers/video/mxsfb.c:768:9: error: 'struct videomode' has no member named 'data_flags'
> drivers/video/mxsfb.c:770:9: error: 'struct videomode' has no member named 'data_flags'
>
> Also select VIDEOMODE_HELPER in Kconfig to avoid linker errors.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
The mxsfb.c driver in my tree does not contain such code. Where is this
patch meant to be applied?
Tomi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 899 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130410/3fb26f04/attachment.sig>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH] video: mxsfb: Adapt to new videomode API
2013-04-10 8:27 ` Tomi Valkeinen
@ 2013-04-10 12:36 ` Fabio Estevam
2013-04-12 2:02 ` Shawn Guo
0 siblings, 1 reply; 10+ messages in thread
From: Fabio Estevam @ 2013-04-10 12:36 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Apr 10, 2013 at 5:27 AM, Tomi Valkeinen <tomi.valkeinen@ti.com> wrote:
> The mxsfb.c driver in my tree does not contain such code. Where is this
> patch meant to be applied?
linux-next 20130408 is broken for mxs without this fix. Maybe Shawn can take it?
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH] video: mxsfb: Adapt to new videomode API
2013-04-10 12:36 ` Fabio Estevam
@ 2013-04-12 2:02 ` Shawn Guo
2013-04-12 6:25 ` Tomi Valkeinen
0 siblings, 1 reply; 10+ messages in thread
From: Shawn Guo @ 2013-04-12 2:02 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Apr 10, 2013 at 09:36:31AM -0300, Fabio Estevam wrote:
> On Wed, Apr 10, 2013 at 5:27 AM, Tomi Valkeinen <tomi.valkeinen@ti.com> wrote:
>
> > The mxsfb.c driver in my tree does not contain such code. Where is this
> > patch meant to be applied?
>
> linux-next 20130408 is broken for mxs without this fix. Maybe Shawn can take it?
I will take it and send it during -rc when Tomi's patches hit mainline.
But I have a couple trivial comments on the patch. I'm replying to the
patch.
Shawn
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH] video: mxsfb: Adapt to new videomode API
2013-04-12 2:02 ` Shawn Guo
@ 2013-04-12 6:25 ` Tomi Valkeinen
2013-04-12 6:30 ` Shawn Guo
0 siblings, 1 reply; 10+ messages in thread
From: Tomi Valkeinen @ 2013-04-12 6:25 UTC (permalink / raw)
To: linux-arm-kernel
On 2013-04-12 05:02, Shawn Guo wrote:
> On Wed, Apr 10, 2013 at 09:36:31AM -0300, Fabio Estevam wrote:
>> On Wed, Apr 10, 2013 at 5:27 AM, Tomi Valkeinen <tomi.valkeinen@ti.com> wrote:
>>
>>> The mxsfb.c driver in my tree does not contain such code. Where is this
>>> patch meant to be applied?
>>
>> linux-next 20130408 is broken for mxs without this fix. Maybe Shawn can take it?
>
> I will take it and send it during -rc when Tomi's patches hit mainline.
> But I have a couple trivial comments on the patch. I'm replying to the
> patch.
Fine by me, but wouldn't it be easier to get the mxsfb driver changes
along with other fbdev changes via my tree? Or do you have dependencies
to arch changes or such in the mxsfb changes?
Tomi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 899 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130412/1a249917/attachment.sig>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH] video: mxsfb: Adapt to new videomode API
2013-04-09 14:16 [PATCH] video: mxsfb: Adapt to new videomode API Fabio Estevam
2013-04-10 8:27 ` Tomi Valkeinen
@ 2013-04-12 2:11 ` Shawn Guo
2013-04-12 2:24 ` Fabio Estevam
1 sibling, 1 reply; 10+ messages in thread
From: Shawn Guo @ 2013-04-12 2:11 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Apr 09, 2013 at 11:16:18AM -0300, Fabio Estevam wrote:
> commit 6cd2c7db4 (videomode: videomode_from_timing work) changed the name of
> the function from videomode_from_timing() to videomode_from_timings().
>
> commit 32ed6ef1 (videomode: create enum for videomode's display flags) changed
> the 'data_flags' field in videomode structure to 'flags'
>
> Adapt to these changes in order to fix the following errors:
>
> drivers/video/mxsfb.c:761:3: error: too many arguments to function 'videomode_from_timing'
> drivers/video/mxsfb.c:761:7: error: void value not ignored as it ought to be
> drivers/video/mxsfb.c:768:9: error: 'struct videomode' has no member named 'data_flags'
> drivers/video/mxsfb.c:770:9: error: 'struct videomode' has no member named 'data_flags'
>
> Also select VIDEOMODE_HELPER in Kconfig to avoid linker errors.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
> drivers/video/Kconfig | 1 +
> drivers/video/mxsfb.c | 7 ++++---
> 2 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
> index d90e3f5..240f863 100644
> --- a/drivers/video/Kconfig
> +++ b/drivers/video/Kconfig
> @@ -2428,6 +2428,7 @@ config FB_MXS
> select FB_CFB_IMAGEBLIT
> select FB_MODE_HELPERS
> select OF_VIDEOMODE
OF_VIDEOMODE is dead now, and should be removed.
> + select VIDEOMODE_HELPERS
> help
> Framebuffer support for the MXS SoC.
>
> diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c
> index eac7c1a..fb559f3 100644
> --- a/drivers/video/mxsfb.c
> +++ b/drivers/video/mxsfb.c
> @@ -43,6 +43,7 @@
> #include <linux/kernel.h>
> #include <linux/of_device.h>
> #include <linux/of_gpio.h>
> +#include <video/display_timing.h>
> #include <video/of_display_timing.h>
I messed it up from the beginning. All these <video/*> should be sorted
after <linux/*>.
Shawn
> #include <linux/platform_device.h>
> #include <linux/clk.h>
> @@ -758,16 +759,16 @@ static int mxsfb_init_fbinfo_dt(struct mxsfb_info *host)
> struct videomode vm;
> struct fb_videomode fb_vm;
>
> - ret = videomode_from_timing(timings, &vm, i);
> + ret = videomode_from_timings(timings, &vm, i);
> if (ret < 0)
> goto put_timings_node;
> ret = fb_videomode_from_videomode(&vm, &fb_vm);
> if (ret < 0)
> goto put_timings_node;
>
> - if (vm.data_flags & DISPLAY_FLAGS_DE_HIGH)
> + if (vm.flags & DISPLAY_FLAGS_DE_HIGH)
> host->sync |= MXSFB_SYNC_DATA_ENABLE_HIGH_ACT;
> - if (vm.data_flags & DISPLAY_FLAGS_PIXDATA_NEGEDGE)
> + if (vm.flags & DISPLAY_FLAGS_PIXDATA_NEGEDGE)
> host->sync |= MXSFB_SYNC_DOTCLK_FALLING_ACT;
> fb_add_videomode(&fb_vm, &fb_info->modelist);
> }
> --
> 1.7.9.5
>
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH] video: mxsfb: Adapt to new videomode API
2013-04-12 2:11 ` Shawn Guo
@ 2013-04-12 2:24 ` Fabio Estevam
2013-04-12 2:55 ` Shawn Guo
0 siblings, 1 reply; 10+ messages in thread
From: Fabio Estevam @ 2013-04-12 2:24 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Apr 11, 2013 at 11:11 PM, Shawn Guo <shawn.guo@linaro.org> wrote:
>> diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
>> index d90e3f5..240f863 100644
>> --- a/drivers/video/Kconfig
>> +++ b/drivers/video/Kconfig
>> @@ -2428,6 +2428,7 @@ config FB_MXS
>> select FB_CFB_IMAGEBLIT
>> select FB_MODE_HELPERS
>> select OF_VIDEOMODE
>
> OF_VIDEOMODE is dead now, and should be removed.
Ok, but should I remove this on a separate patch?
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH] video: mxsfb: Adapt to new videomode API
2013-04-12 2:24 ` Fabio Estevam
@ 2013-04-12 2:55 ` Shawn Guo
0 siblings, 0 replies; 10+ messages in thread
From: Shawn Guo @ 2013-04-12 2:55 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Apr 11, 2013 at 11:24:19PM -0300, Fabio Estevam wrote:
> On Thu, Apr 11, 2013 at 11:11 PM, Shawn Guo <shawn.guo@linaro.org> wrote:
>
> >> diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
> >> index d90e3f5..240f863 100644
> >> --- a/drivers/video/Kconfig
> >> +++ b/drivers/video/Kconfig
> >> @@ -2428,6 +2428,7 @@ config FB_MXS
> >> select FB_CFB_IMAGEBLIT
> >> select FB_MODE_HELPERS
> >> select OF_VIDEOMODE
> >
> > OF_VIDEOMODE is dead now, and should be removed.
>
> Ok, but should I remove this on a separate patch?
I do not think so, as VIDEOMODE_HELPER is introduced to just replace
OF_VIDEOMODE and a couple of other symbols.
Shawn
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2013-04-12 6:32 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-09 14:16 [PATCH] video: mxsfb: Adapt to new videomode API Fabio Estevam
2013-04-10 8:27 ` Tomi Valkeinen
2013-04-10 12:36 ` Fabio Estevam
2013-04-12 2:02 ` Shawn Guo
2013-04-12 6:25 ` Tomi Valkeinen
2013-04-12 6:30 ` Shawn Guo
2013-04-12 6:32 ` Tomi Valkeinen
2013-04-12 2:11 ` Shawn Guo
2013-04-12 2:24 ` Fabio Estevam
2013-04-12 2:55 ` Shawn Guo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).