| Message ID | 1392376711-11290-2-git-send-email-tomi.valkeinen@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Tomi, Thanks for doing this! Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> On Fri, Feb 14, 2014 at 12:18 PM, Tomi Valkeinen <tomi.valkeinen@ti.com> wrote: > --- a/drivers/video/fbdev/fbmon.c > +++ b/drivers/video/fbdev/core/fbmon.c > @@ -37,7 +37,7 @@ > #include <asm/prom.h> > #include <asm/> > /* > * EDID parserpci-bridge.h> > #endif > -#include "edid.h" > +#include "../edid.h" This looks a bit asymmetrical ... > --- a/drivers/video/fbdev/wmt_ge_rops.c > +++ b/drivers/video/fbdev/wmt_ge_rops.c > @@ -18,7 +18,7 @@ > #include <linux/module.h> > #include <linux/fb.h> > #include <linux/platform_device.h> > -#include "fb_draw.h" > +#include "core/fb_draw.h" ... to this. Perhaps (the content of) edid.h belongs in include/video/edid.h? Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 14/02/14 14:27, Geert Uytterhoeven wrote: > Hi Tomi, > > Thanks for doing this! > > Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> > > On Fri, Feb 14, 2014 at 12:18 PM, Tomi Valkeinen <tomi.valkeinen@ti.com> wrote: >> --- a/drivers/video/fbdev/fbmon.c >> +++ b/drivers/video/fbdev/core/fbmon.c >> @@ -37,7 +37,7 @@ >> #include <asm/prom.h> >> #include <asm/> >> /* >> * EDID parserpci-bridge.h> >> #endif >> -#include "edid.h" >> +#include "../edid.h" > > This looks a bit asymmetrical ... > >> --- a/drivers/video/fbdev/wmt_ge_rops.c >> +++ b/drivers/video/fbdev/wmt_ge_rops.c >> @@ -18,7 +18,7 @@ >> #include <linux/module.h> >> #include <linux/fb.h> >> #include <linux/platform_device.h> >> -#include "fb_draw.h" >> +#include "core/fb_draw.h" > > ... to this. > > Perhaps (the content of) edid.h belongs in include/video/edid.h? Yes, I thought the same, but I didn't want to start messing around too much in this series. I also noticed some odd Kconfig options (for example, HAVE_FB_ATMEL, SH_MIPI_DSI, SH_LCD_MIPI_DSI at the beginning of drivers/video/Kconfig), which I almost started cleaning up, but decided to just concentrate on the main reorganization. Tomi
On Friday, February 14, 2014 8:19 PM, Tomi Valkeinen wrote: > > Instead of having fbdev framework core files at the root fbdev > directory, mixed with random fbdev device drivers, move the fbdev core > files to a separate core directory. This makes it much clearer which of > the files are actually part of the fbdev framework, and which are part > of device drivers. > > Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Hi Tomi, This is what I wanted for a long time! Thank you for your effort! Last year, I noticed that the current FB directory and files are not clear. It looks good! Acked-by: Jingoo Han <jg1.han@samsung.com> Best regards, Jingoo Han > --- > drivers/video/fbdev/Makefile | 16 +--------------- > drivers/video/fbdev/core/Makefile | 16 ++++++++++++++++ > drivers/video/fbdev/{ => core}/cfbcopyarea.c | 0 > drivers/video/fbdev/{ => core}/cfbfillrect.c | 0 > drivers/video/fbdev/{ => core}/cfbimgblt.c | 0 > drivers/video/fbdev/{ => core}/fb_ddc.c | 2 +- > drivers/video/fbdev/{ => core}/fb_defio.c | 0 > drivers/video/fbdev/{ => core}/fb_draw.h | 0 > drivers/video/fbdev/{ => core}/fb_notify.c | 0 > drivers/video/fbdev/{ => core}/fb_sys_fops.c | 0 > drivers/video/fbdev/{ => core}/fbcmap.c | 0 > drivers/video/fbdev/{ => core}/fbcvt.c | 0 > drivers/video/fbdev/{ => core}/fbmem.c | 0 > drivers/video/fbdev/{ => core}/fbmon.c | 2 +- > drivers/video/fbdev/{ => core}/fbsysfs.c | 0 > drivers/video/fbdev/{ => core}/modedb.c | 0 > drivers/video/fbdev/{ => core}/svgalib.c | 0 > drivers/video/fbdev/{ => core}/syscopyarea.c | 0 > drivers/video/fbdev/{ => core}/sysfillrect.c | 0 > drivers/video/fbdev/{ => core}/sysimgblt.c | 0 > drivers/video/fbdev/wmt_ge_rops.c | 2 +- > 21 files changed, 20 insertions(+), 18 deletions(-) > create mode 100644 drivers/video/fbdev/core/Makefile > rename drivers/video/fbdev/{ => core}/cfbcopyarea.c (100%) > rename drivers/video/fbdev/{ => core}/cfbfillrect.c (100%) > rename drivers/video/fbdev/{ => core}/cfbimgblt.c (100%) > rename drivers/video/fbdev/{ => core}/fb_ddc.c (99%) > rename drivers/video/fbdev/{ => core}/fb_defio.c (100%) > rename drivers/video/fbdev/{ => core}/fb_draw.h (100%) > rename drivers/video/fbdev/{ => core}/fb_notify.c (100%) > rename drivers/video/fbdev/{ => core}/fb_sys_fops.c (100%) > rename drivers/video/fbdev/{ => core}/fbcmap.c (100%) > rename drivers/video/fbdev/{ => core}/fbcvt.c (100%) > rename drivers/video/fbdev/{ => core}/fbmem.c (100%) > rename drivers/video/fbdev/{ => core}/fbmon.c (99%) > rename drivers/video/fbdev/{ => core}/fbsysfs.c (100%) > rename drivers/video/fbdev/{ => core}/modedb.c (100%) > rename drivers/video/fbdev/{ => core}/svgalib.c (100%) > rename drivers/video/fbdev/{ => core}/syscopyarea.c (100%) > rename drivers/video/fbdev/{ => core}/sysfillrect.c (100%) > rename drivers/video/fbdev/{ => core}/sysimgblt.c (100%) -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/video/fbdev/Makefile b/drivers/video/fbdev/Makefile index 616e0975ae6e..6ef2c66110e3 100644 --- a/drivers/video/fbdev/Makefile +++ b/drivers/video/fbdev/Makefile @@ -4,25 +4,11 @@ # Each configuration option enables a list of files. -obj-y += fb_notify.o -obj-$(CONFIG_FB) += fb.o -fb-y := fbmem.o fbmon.o fbcmap.o fbsysfs.o \ - modedb.o fbcvt.o -fb-objs := $(fb-y) +obj-y += core/ obj-$(CONFIG_EXYNOS_VIDEO) += exynos/ -obj-$(CONFIG_FB_CFB_FILLRECT) += cfbfillrect.o -obj-$(CONFIG_FB_CFB_COPYAREA) += cfbcopyarea.o -obj-$(CONFIG_FB_CFB_IMAGEBLIT) += cfbimgblt.o -obj-$(CONFIG_FB_SYS_FILLRECT) += sysfillrect.o -obj-$(CONFIG_FB_SYS_COPYAREA) += syscopyarea.o -obj-$(CONFIG_FB_SYS_IMAGEBLIT) += sysimgblt.o -obj-$(CONFIG_FB_SYS_FOPS) += fb_sys_fops.o -obj-$(CONFIG_FB_SVGALIB) += svgalib.o obj-$(CONFIG_FB_MACMODES) += macmodes.o -obj-$(CONFIG_FB_DDC) += fb_ddc.o -obj-$(CONFIG_FB_DEFERRED_IO) += fb_defio.o obj-$(CONFIG_FB_WMT_GE_ROPS) += wmt_ge_rops.o # Hardware specific drivers go first diff --git a/drivers/video/fbdev/core/Makefile b/drivers/video/fbdev/core/Makefile new file mode 100644 index 000000000000..fa306538dac2 --- /dev/null +++ b/drivers/video/fbdev/core/Makefile @@ -0,0 +1,16 @@ +obj-y += fb_notify.o +obj-$(CONFIG_FB) += fb.o +fb-y := fbmem.o fbmon.o fbcmap.o fbsysfs.o \ + modedb.o fbcvt.o +fb-objs := $(fb-y) + +obj-$(CONFIG_FB_CFB_FILLRECT) += cfbfillrect.o +obj-$(CONFIG_FB_CFB_COPYAREA) += cfbcopyarea.o +obj-$(CONFIG_FB_CFB_IMAGEBLIT) += cfbimgblt.o +obj-$(CONFIG_FB_SYS_FILLRECT) += sysfillrect.o +obj-$(CONFIG_FB_SYS_COPYAREA) += syscopyarea.o +obj-$(CONFIG_FB_SYS_IMAGEBLIT) += sysimgblt.o +obj-$(CONFIG_FB_SYS_FOPS) += fb_sys_fops.o +obj-$(CONFIG_FB_SVGALIB) += svgalib.o +obj-$(CONFIG_FB_DDC) += fb_ddc.o +obj-$(CONFIG_FB_DEFERRED_IO) += fb_defio.o diff --git a/drivers/video/fbdev/cfbcopyarea.c b/drivers/video/fbdev/core/cfbcopyarea.c similarity index 100% rename from drivers/video/fbdev/cfbcopyarea.c rename to drivers/video/fbdev/core/cfbcopyarea.c diff --git a/drivers/video/fbdev/cfbfillrect.c b/drivers/video/fbdev/core/cfbfillrect.c similarity index 100% rename from drivers/video/fbdev/cfbfillrect.c rename to drivers/video/fbdev/core/cfbfillrect.c diff --git a/drivers/video/fbdev/cfbimgblt.c b/drivers/video/fbdev/core/cfbimgblt.c similarity index 100% rename from drivers/video/fbdev/cfbimgblt.c rename to drivers/video/fbdev/core/cfbimgblt.c diff --git a/drivers/video/fbdev/fb_ddc.c b/drivers/video/fbdev/core/fb_ddc.c similarity index 99% rename from drivers/video/fbdev/fb_ddc.c rename to drivers/video/fbdev/core/fb_ddc.c index 2b106f046fde..94322ccfedde 100644 --- a/drivers/video/fbdev/fb_ddc.c +++ b/drivers/video/fbdev/core/fb_ddc.c @@ -15,7 +15,7 @@ #include <linux/i2c-algo-bit.h> #include <linux/slab.h> -#include "edid.h" +#include "../edid.h" #define DDC_ADDR 0x50 diff --git a/drivers/video/fbdev/fb_defio.c b/drivers/video/fbdev/core/fb_defio.c similarity index 100% rename from drivers/video/fbdev/fb_defio.c rename to drivers/video/fbdev/core/fb_defio.c diff --git a/drivers/video/fbdev/fb_draw.h b/drivers/video/fbdev/core/fb_draw.h similarity index 100% rename from drivers/video/fbdev/fb_draw.h rename to drivers/video/fbdev/core/fb_draw.h diff --git a/drivers/video/fbdev/fb_notify.c b/drivers/video/fbdev/core/fb_notify.c similarity index 100% rename from drivers/video/fbdev/fb_notify.c rename to drivers/video/fbdev/core/fb_notify.c diff --git a/drivers/video/fbdev/fb_sys_fops.c b/drivers/video/fbdev/core/fb_sys_fops.c similarity index 100% rename from drivers/video/fbdev/fb_sys_fops.c rename to drivers/video/fbdev/core/fb_sys_fops.c diff --git a/drivers/video/fbdev/fbcmap.c b/drivers/video/fbdev/core/fbcmap.c similarity index 100% rename from drivers/video/fbdev/fbcmap.c rename to drivers/video/fbdev/core/fbcmap.c diff --git a/drivers/video/fbdev/fbcvt.c b/drivers/video/fbdev/core/fbcvt.c similarity index 100% rename from drivers/video/fbdev/fbcvt.c rename to drivers/video/fbdev/core/fbcvt.c diff --git a/drivers/video/fbdev/fbmem.c b/drivers/video/fbdev/core/fbmem.c similarity index 100% rename from drivers/video/fbdev/fbmem.c rename to drivers/video/fbdev/core/fbmem.c diff --git a/drivers/video/fbdev/fbmon.c b/drivers/video/fbdev/core/fbmon.c similarity index 99% rename from drivers/video/fbdev/fbmon.c rename to drivers/video/fbdev/core/fbmon.c index 6103fa6fb54f..c204ebe6187e 100644 --- a/drivers/video/fbdev/fbmon.c +++ b/drivers/video/fbdev/core/fbmon.c @@ -37,7 +37,7 @@ #include <asm/prom.h> #include <asm/pci-bridge.h> #endif -#include "edid.h" +#include "../edid.h" /* * EDID parser diff --git a/drivers/video/fbdev/fbsysfs.c b/drivers/video/fbdev/core/fbsysfs.c similarity index 100% rename from drivers/video/fbdev/fbsysfs.c rename to drivers/video/fbdev/core/fbsysfs.c diff --git a/drivers/video/fbdev/modedb.c b/drivers/video/fbdev/core/modedb.c similarity index 100% rename from drivers/video/fbdev/modedb.c rename to drivers/video/fbdev/core/modedb.c diff --git a/drivers/video/fbdev/svgalib.c b/drivers/video/fbdev/core/svgalib.c similarity index 100% rename from drivers/video/fbdev/svgalib.c rename to drivers/video/fbdev/core/svgalib.c diff --git a/drivers/video/fbdev/syscopyarea.c b/drivers/video/fbdev/core/syscopyarea.c similarity index 100% rename from drivers/video/fbdev/syscopyarea.c rename to drivers/video/fbdev/core/syscopyarea.c diff --git a/drivers/video/fbdev/sysfillrect.c b/drivers/video/fbdev/core/sysfillrect.c similarity index 100% rename from drivers/video/fbdev/sysfillrect.c rename to drivers/video/fbdev/core/sysfillrect.c diff --git a/drivers/video/fbdev/sysimgblt.c b/drivers/video/fbdev/core/sysimgblt.c similarity index 100% rename from drivers/video/fbdev/sysimgblt.c rename to drivers/video/fbdev/core/sysimgblt.c diff --git a/drivers/video/fbdev/wmt_ge_rops.c b/drivers/video/fbdev/wmt_ge_rops.c index b0a9f34b2e01..9df6fe78a44b 100644 --- a/drivers/video/fbdev/wmt_ge_rops.c +++ b/drivers/video/fbdev/wmt_ge_rops.c @@ -18,7 +18,7 @@ #include <linux/module.h> #include <linux/fb.h> #include <linux/platform_device.h> -#include "fb_draw.h" +#include "core/fb_draw.h" #define GE_COMMAND_OFF 0x00 #define GE_DEPTH_OFF 0x04
Instead of having fbdev framework core files at the root fbdev directory, mixed with random fbdev device drivers, move the fbdev core files to a separate core directory. This makes it much clearer which of the files are actually part of the fbdev framework, and which are part of device drivers. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> --- drivers/video/fbdev/Makefile | 16 +--------------- drivers/video/fbdev/core/Makefile | 16 ++++++++++++++++ drivers/video/fbdev/{ => core}/cfbcopyarea.c | 0 drivers/video/fbdev/{ => core}/cfbfillrect.c | 0 drivers/video/fbdev/{ => core}/cfbimgblt.c | 0 drivers/video/fbdev/{ => core}/fb_ddc.c | 2 +- drivers/video/fbdev/{ => core}/fb_defio.c | 0 drivers/video/fbdev/{ => core}/fb_draw.h | 0 drivers/video/fbdev/{ => core}/fb_notify.c | 0 drivers/video/fbdev/{ => core}/fb_sys_fops.c | 0 drivers/video/fbdev/{ => core}/fbcmap.c | 0 drivers/video/fbdev/{ => core}/fbcvt.c | 0 drivers/video/fbdev/{ => core}/fbmem.c | 0 drivers/video/fbdev/{ => core}/fbmon.c | 2 +- drivers/video/fbdev/{ => core}/fbsysfs.c | 0 drivers/video/fbdev/{ => core}/modedb.c | 0 drivers/video/fbdev/{ => core}/svgalib.c | 0 drivers/video/fbdev/{ => core}/syscopyarea.c | 0 drivers/video/fbdev/{ => core}/sysfillrect.c | 0 drivers/video/fbdev/{ => core}/sysimgblt.c | 0 drivers/video/fbdev/wmt_ge_rops.c | 2 +- 21 files changed, 20 insertions(+), 18 deletions(-) create mode 100644 drivers/video/fbdev/core/Makefile rename drivers/video/fbdev/{ => core}/cfbcopyarea.c (100%) rename drivers/video/fbdev/{ => core}/cfbfillrect.c (100%) rename drivers/video/fbdev/{ => core}/cfbimgblt.c (100%) rename drivers/video/fbdev/{ => core}/fb_ddc.c (99%) rename drivers/video/fbdev/{ => core}/fb_defio.c (100%) rename drivers/video/fbdev/{ => core}/fb_draw.h (100%) rename drivers/video/fbdev/{ => core}/fb_notify.c (100%) rename drivers/video/fbdev/{ => core}/fb_sys_fops.c (100%) rename drivers/video/fbdev/{ => core}/fbcmap.c (100%) rename drivers/video/fbdev/{ => core}/fbcvt.c (100%) rename drivers/video/fbdev/{ => core}/fbmem.c (100%) rename drivers/video/fbdev/{ => core}/fbmon.c (99%) rename drivers/video/fbdev/{ => core}/fbsysfs.c (100%) rename drivers/video/fbdev/{ => core}/modedb.c (100%) rename drivers/video/fbdev/{ => core}/svgalib.c (100%) rename drivers/video/fbdev/{ => core}/syscopyarea.c (100%) rename drivers/video/fbdev/{ => core}/sysfillrect.c (100%) rename drivers/video/fbdev/{ => core}/sysimgblt.c (100%)