drivers/video: mxs-fb: build fixes
Subsystems (2)
cover drivers/video: mxs-fb: build fixes
Hi,
mxs-fb commit
669406534b4abb827d1bdc39bb5e2d5255818ae2 video: mxsfb: get display timings from device tree
creates a build failure together with those commits:
a38884f681a4d044befd30d9f3d19a0821bae63a videomode: simplify videomode Kconfig and Makefile 6cd2c7db41eab204b6474534df4ca68a7dc53d86 videomode: videomode_from_timing work
All of them are in linux-next, so mxs-fb fails to build there.
Regards,
Markus
PATCH 1/2 drivers/video: Kconfig, fix mxsfb build
From: Markus Pargmann <[email protected]>
Kernel build fails with commit 669406534b4abb827d1bdc39bb5e2d5255818ae2
This patch replaces OF_VIDEOMODE symbol by VIDEOMODE_HELPERS.
--- drivers/video/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/Kconfig +1 -1
@@ -2429,7 +2429,7 @@ config FB_MXS select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT select FB_MODE_HELPERS - select OF_VIDEOMODE + select VIDEOMODE_HELPERS help Framebuffer support for the MXS SoC.
Signature · 1 line
1.8.1.5
PATCH 2/2 drivers/video: mxs-fb: Fix build, use renamed function
In reply to Markus PargmannFrom: Markus Pargmann <[email protected]>
Kernel build fails with commit 669406534b4abb827d1bdc39bb5e2d5255818ae2
This patch renames videomode_from_timing to videomode_from_timings and vm.data_flags to vm.flags.
--- drivers/video/mxsfb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/video/mxsfb.c +3 -3
@@ -777,16 +777,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); }
Signature · 1 line
1.8.1.5
cover drivers/video: mxs-fb: build fixes
In reply to Markus PargmannSorry, I messed up the email addresses in the last two patches, the following two are exactly the same just with the correct addresses.
Regards,
Markus
PATCH 1/2 drivers/video: Kconfig, fix mxsfb build
Kernel build fails with commit 669406534b4abb827d1bdc39bb5e2d5255818ae2
This patch replaces OF_VIDEOMODE symbol by VIDEOMODE_HELPERS.
--- drivers/video/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/Kconfig +1 -1
@@ -2429,7 +2429,7 @@ config FB_MXS select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT select FB_MODE_HELPERS - select OF_VIDEOMODE + select VIDEOMODE_HELPERS help Framebuffer support for the MXS SoC.
Signature · 1 line
1.8.1.5
PATCH 1/2 drivers/video: Kconfig, fix mxsfb build
Hello.
Quoted 1 line · Markus Pargmann
Kernel build fails with commit
669406534b4abb827d1bdc39bb5e2d5255818ae2
Please also specify the summary line of that commit in parens.
Quoted 3 lines
This patch replaces
OF_VIDEOMODEsymbol byVIDEOMODE_HELPERS.Signed-off-by Markus Pargmann <[email protected]>
WBR, Sergei
PATCH 2/2 drivers/video: mxs-fb: Fix build, use renamed function
In reply to Markus PargmannKernel build fails with commit 669406534b4abb827d1bdc39bb5e2d5255818ae2
This patch renames videomode_from_timing to videomode_from_timings and vm.data_flags to vm.flags.
--- drivers/video/mxsfb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/video/mxsfb.c +3 -3
@@ -777,16 +777,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); }
Signature · 1 line
1.8.1.5
cover drivers/video: mxs-fb: build fixes
In reply to Markus PargmannQuoted 8 lines · Markus Pargmann
Hi,
mxs-fb commit
669406534b4abb827d1bdc39bb5e2d5255818ae2video: mxsfb: get display timings from device treecreates a build failure together with those commits:
Quoted 11 lines
a38884f681a4d044befd30d9f3d19a0821bae63avideomode: simplify videomodeKconfigandMakefile6cd2c7db41eab204b6474534df4ca68a7dc53d86videomode:videomode_from_timingworkAll of them are in linux-next, so mxs-fb fails to build there.
Regards,
Markus
Sorry for the noise. This was already fixed and queued for 3.10-rc.
Regards,
Markus
Signature · 4 lines
Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
cover drivers/video: mxs-fb: build fixes
In reply to Markus PargmannQuoted 4 lines · Markus Pargmann
Hi,
mxs-fb commit
Quoted 8 lines
669406534b4abb827d1bdc39bb5e2d5255818ae2video: mxsfb: get display timings from device treecreates a build failure together with those commits:
a38884f681a4d044befd30d9f3d19a0821bae63avideomode: simplify videomodeKconfigandMakefile6cd2c7db41eab204b6474534df4ca68a7dc53d86videomode:videomode_from_timingworkAll of them are in linux-next, so mxs-fb fails to build there.
Fabio already had a patch [1] for that. I will send it mainline during 3.10-rc.
Shawn
[1] http://thread.gmane.org/gmane.linux.ports.arm.kernel/230938