Skip to content

Commit d43fb9f

Browse files
torvaldstorvalds
committed
Merge tag 'fbdev-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux
Pull fbdev updates from Tomi Valkeinen: "Summary: - pxafb: device-tree support - An unsafe kernel parameter 'lockless_register_fb' for debugging problems happening while inside the console lock - Small miscellaneous fixes & cleanups - omapdss: add writeback support functions - Separation of omapfb and omapdrm (see below) About the separation of omapfb and omapdrm, see http://permalink.gmane.org/gmane.comp.video.dri.devel/143151 for longer story. The short version: omapfb and omapdrm have shared low level drivers (omapdss and panel drivers), making further development of omapdrm difficult. After these patches omapfb and omapdrm have their own versions of the drivers, which are more or less direct copies for now but will diverge soon. This also means that omapfb (everything under drivers/video/fbdev/omap2/) is now in maintenance mode, and all new development will be done for omapdrm (drivers/gpu/drm/omapdrm/)" * tag 'fbdev-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (49 commits) video: fbdev: pxafb: fix out of memory error path drm/omap: make omapdrm select OMAP2_DSS drm/omap: move omapdss & displays under omapdrm omapfb: move vrfb into omapfb omapfb: take omapfb's private omapdss into use omapfb/displays: change CONFIG_DISPLAY_* to CONFIG_FB_OMAP2_* omapfb/dss: change CONFIG_OMAP* to CONFIG_FB_OMAP* omapdss: remove CONFIG_OMAP2_DSS_VENC from omapdss.h omapfb: copy omapdss & displays for omapfb omapfb: allow compilation only if DRM_OMAP is disabled fbdev: omap2: panel-dpi: simplify gpio setting fbdev: omap2: panel-dpi: in .disable first disable backlight then display OMAPDSS: DSS: fix a warning message video: omapdss: delete unneeded of_node_put OMAPDSS: DISPC: Remove boolean comparisons OMAPDSS: DSI: cleanup DSI_IRQ_ERROR_MASK define OMAPDSS: remove extra out == NULL checks OMAPDSS: change internal dispc functions to static OMAPDSS: make a two dss feat funcs internal to omapdss OMAPDSS: remove extra EXPORT_SYMBOLs ...
2 parents 5807fca + 6f6abd3 commit d43fb9f

File tree

142 files changed

+36836
-1701
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

142 files changed

+36836
-1701
lines changed

‎Documentation/devicetree/bindings/display/simple-framebuffer.txt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,14 @@ Required properties:
4747
- a8b8g8r8 (32-bit pixels, d[31:24]=a, d[23:16]=b, d[15:8]=g, d[7:0]=r).
4848

4949
Optional properties:
50-
- clocks : List of clocks used by the framebuffer. Clocks listed here
51-
are expected to already be configured correctly. The OS must
52-
ensure these clocks are not modified or disabled while the
53-
simple framebuffer remains active.
50+
- clocks : List of clocks used by the framebuffer.
51+
- *-supply : Any number of regulators used by the framebuffer. These should
52+
be named according to the names in the device's design.
53+
54+
The above resources are expected to already be configured correctly.
55+
The OS must ensure they are not modified or disabled while the simple
56+
framebuffer remains active.
57+
5458
- display : phandle pointing to the primary display hardware node
5559

5660
Example:
@@ -68,6 +72,7 @@ chosen {
6872
stride = <(1600 * 2)>;
6973
format = "r5g6b5";
7074
clocks = <&ahb_gates 36>, <&ahb_gates 43>, <&ahb_gates 44>;
75+
lcd-supply = <&reg_dc1sw>;
7176
display = <&lcdc0>;
7277
};
7378
stdout-path = "display0";

‎drivers/gpu/drm/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ obj-$(CONFIG_DRM_ARMADA) += armada/
6262
obj-$(CONFIG_DRM_ATMEL_HLCDC) += atmel-hlcdc/
6363
obj-$(CONFIG_DRM_RCAR_DU) += rcar-du/
6464
obj-$(CONFIG_DRM_SHMOBILE) +=shmobile/
65-
obj-$(CONFIG_DRM_OMAP) += omapdrm/
65+
obj-y += omapdrm/
6666
obj-y += tilcdc/
6767
obj-$(CONFIG_DRM_QXL) += qxl/
6868
obj-$(CONFIG_DRM_BOCHS) += bochs/

‎drivers/gpu/drm/omapdrm/Kconfig

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
21
config DRM_OMAP
32
tristate "OMAP DRM"
43
depends on DRM
54
depends on ARCH_OMAP2PLUS || ARCH_MULTIPLATFORM
6-
depends on OMAP2_DSS
5+
select OMAP2_DSS
76
select DRM_KMS_HELPER
87
select DRM_KMS_FB_HELPER
98
select FB_SYS_FILLRECT
@@ -14,13 +13,18 @@ config DRM_OMAP
1413
help
1514
DRM display driver for OMAP2/3/4 based boards.
1615

16+
if DRM_OMAP
17+
1718
config DRM_OMAP_NUM_CRTCS
1819
int "Number of CRTCs"
1920
range 1 10
2021
default 1 if ARCH_OMAP2 || ARCH_OMAP3
2122
default 2 if ARCH_OMAP4
22-
depends on DRM_OMAP
2323
help
2424
Select the number of video overlays which can be used as framebuffers.
2525
The remaining overlays are reserved for video.
2626

27+
source "drivers/gpu/drm/omapdrm/dss/Kconfig"
28+
source "drivers/gpu/drm/omapdrm/displays/Kconfig"
29+
30+
endif

‎drivers/gpu/drm/omapdrm/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
# Direct Rendering Infrastructure (DRI)
44
#
55

6+
obj-y += dss/
7+
obj-y += displays/
8+
69
ccflags-y := -Iinclude/drm -Werror
710
omapdrm-y := omap_drv.o \
811
omap_irq.o \

‎drivers/video/fbdev/omap2/displays-new/Kconfig renamed to ‎drivers/gpu/drm/omapdrm/displays/Kconfig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
menu "OMAP Display Device Drivers (new device model)"
2-
depends on OMAP2_DSS
1+
menu "OMAPDRM External Display Device Drivers"
32

43
config DISPLAY_ENCODER_OPA362
54
tristate "OPA362 external analog amplifier"

‎drivers/video/fbdev/omap2/displays-new/Makefile renamed to ‎drivers/gpu/drm/omapdrm/displays/Makefile

File renamed without changes.

‎drivers/video/fbdev/omap2/displays-new/connector-analog-tv.c renamed to ‎drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c

File renamed without changes.

‎drivers/video/fbdev/omap2/displays-new/connector-dvi.c renamed to ‎drivers/gpu/drm/omapdrm/displays/connector-dvi.c

File renamed without changes.

‎drivers/video/fbdev/omap2/displays-new/connector-hdmi.c renamed to ‎drivers/gpu/drm/omapdrm/displays/connector-hdmi.c

File renamed without changes.

‎drivers/video/fbdev/omap2/displays-new/encoder-opa362.c renamed to ‎drivers/gpu/drm/omapdrm/displays/encoder-opa362.c

File renamed without changes.

‎drivers/video/fbdev/omap2/displays-new/encoder-tfp410.c renamed to ‎drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c

File renamed without changes.

‎drivers/video/fbdev/omap2/displays-new/encoder-tpd12s015.c renamed to ‎drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c

File renamed without changes.

‎drivers/video/fbdev/omap2/displays-new/panel-dpi.c renamed to ‎drivers/gpu/drm/omapdrm/displays/panel-dpi.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,7 @@ static int panel_dpi_enable(struct omap_dss_device *dssdev)
8383
if (r)
8484
return r;
8585

86-
if (ddata->enable_gpio)
87-
gpiod_set_value_cansleep(ddata->enable_gpio, 1);
86+
gpiod_set_value_cansleep(ddata->enable_gpio, 1);
8887

8988
if (gpio_is_valid(ddata->backlight_gpio))
9089
gpio_set_value_cansleep(ddata->backlight_gpio, 1);
@@ -102,12 +101,11 @@ static void panel_dpi_disable(struct omap_dss_device *dssdev)
102101
if (!omapdss_device_is_enabled(dssdev))
103102
return;
104103

105-
if (ddata->enable_gpio)
106-
gpiod_set_value_cansleep(ddata->enable_gpio, 0);
107-
108104
if (gpio_is_valid(ddata->backlight_gpio))
109105
gpio_set_value_cansleep(ddata->backlight_gpio, 0);
110106

107+
gpiod_set_value_cansleep(ddata->enable_gpio, 0);
108+
111109
in->ops.dpi->disable(in);
112110

113111
dssdev->state = OMAP_DSS_DISPLAY_DISABLED;

‎drivers/video/fbdev/omap2/displays-new/panel-dsi-cm.c renamed to ‎drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c

File renamed without changes.

‎drivers/video/fbdev/omap2/displays-new/panel-lgphilips-lb035q02.c renamed to ‎drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c

File renamed without changes.

‎drivers/video/fbdev/omap2/displays-new/panel-nec-nl8048hl11.c renamed to ‎drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c

File renamed without changes.

‎drivers/video/fbdev/omap2/displays-new/panel-sharp-ls037v7dw01.c renamed to ‎drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c

File renamed without changes.

‎drivers/video/fbdev/omap2/displays-new/panel-sony-acx565akm.c renamed to ‎drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c

File renamed without changes.

‎drivers/video/fbdev/omap2/displays-new/panel-tpo-td028ttec1.c renamed to ‎drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c

File renamed without changes.

‎drivers/video/fbdev/omap2/displays-new/panel-tpo-td043mtea1.c renamed to ‎drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/Kconfig renamed to ‎drivers/gpu/drm/omapdrm/dss/Kconfig

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/Makefile renamed to ‎drivers/gpu/drm/omapdrm/dss/Makefile

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/apply.c renamed to ‎drivers/gpu/drm/omapdrm/dss/apply.c

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/core.c renamed to ‎drivers/gpu/drm/omapdrm/dss/core.c

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/dispc-compat.c renamed to ‎drivers/gpu/drm/omapdrm/dss/dispc-compat.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ static void dispc_mgr_disable_lcd_out(enum omap_channel channel)
476476
int r;
477477
u32 irq;
478478

479-
if (dispc_mgr_is_enabled(channel) == false)
479+
if (!dispc_mgr_is_enabled(channel))
480480
return;
481481

482482
/*
@@ -524,7 +524,7 @@ static void dispc_mgr_enable_digit_out(void)
524524
int r;
525525
u32 irq_mask;
526526

527-
if (dispc_mgr_is_enabled(OMAP_DSS_CHANNEL_DIGIT) == true)
527+
if (dispc_mgr_is_enabled(OMAP_DSS_CHANNEL_DIGIT))
528528
return;
529529

530530
/*
@@ -562,7 +562,7 @@ static void dispc_mgr_disable_digit_out(void)
562562
u32 irq_mask;
563563
int num_irqs;
564564

565-
if (dispc_mgr_is_enabled(OMAP_DSS_CHANNEL_DIGIT) == false)
565+
if (!dispc_mgr_is_enabled(OMAP_DSS_CHANNEL_DIGIT))
566566
return;
567567

568568
/*

‎drivers/video/fbdev/omap2/dss/dispc-compat.h renamed to ‎drivers/gpu/drm/omapdrm/dss/dispc-compat.h

File renamed without changes.

0 commit comments

Comments
 (0)