Skip to content

Commit

Permalink
Merge tag 'fbdev-4.5' of git://git.kernel.org/pub/scm/linux/kernel/gi…
Browse files Browse the repository at this point in the history
…t/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
  ...
  • Loading branch information
Linus Torvalds committed Jan 18, 2016
2 parents 5807fca + 6f6abd3 commit d43fb9f
Show file tree
Hide file tree
Showing 142 changed files with 36,836 additions and 1,701 deletions.
13 changes: 9 additions & 4 deletions Documentation/devicetree/bindings/display/simple-framebuffer.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,14 @@ Required properties:
- a8b8g8r8 (32-bit pixels, d[31:24]=a, d[23:16]=b, d[15:8]=g, d[7:0]=r).

Optional properties:
- clocks : List of clocks used by the framebuffer. Clocks listed here
are expected to already be configured correctly. The OS must
ensure these clocks are not modified or disabled while the
simple framebuffer remains active.
- clocks : List of clocks used by the framebuffer.
- *-supply : Any number of regulators used by the framebuffer. These should
be named according to the names in the device's design.

The above resources are expected to already be configured correctly.
The OS must ensure they are not modified or disabled while the simple
framebuffer remains active.

- display : phandle pointing to the primary display hardware node

Example:
Expand All @@ -68,6 +72,7 @@ chosen {
stride = <(1600 * 2)>;
format = "r5g6b5";
clocks = <&ahb_gates 36>, <&ahb_gates 43>, <&ahb_gates 44>;
lcd-supply = <&reg_dc1sw>;
display = <&lcdc0>;
};
stdout-path = "display0";
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ obj-$(CONFIG_DRM_ARMADA) += armada/
obj-$(CONFIG_DRM_ATMEL_HLCDC) += atmel-hlcdc/
obj-$(CONFIG_DRM_RCAR_DU) += rcar-du/
obj-$(CONFIG_DRM_SHMOBILE) +=shmobile/
obj-$(CONFIG_DRM_OMAP) += omapdrm/
obj-y += omapdrm/
obj-y += tilcdc/
obj-$(CONFIG_DRM_QXL) += qxl/
obj-$(CONFIG_DRM_BOCHS) += bochs/
Expand Down
10 changes: 7 additions & 3 deletions drivers/gpu/drm/omapdrm/Kconfig
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@

config DRM_OMAP
tristate "OMAP DRM"
depends on DRM
depends on ARCH_OMAP2PLUS || ARCH_MULTIPLATFORM
depends on OMAP2_DSS
select OMAP2_DSS
select DRM_KMS_HELPER
select DRM_KMS_FB_HELPER
select FB_SYS_FILLRECT
Expand All @@ -14,13 +13,18 @@ config DRM_OMAP
help
DRM display driver for OMAP2/3/4 based boards.

if DRM_OMAP

config DRM_OMAP_NUM_CRTCS
int "Number of CRTCs"
range 1 10
default 1 if ARCH_OMAP2 || ARCH_OMAP3
default 2 if ARCH_OMAP4
depends on DRM_OMAP
help
Select the number of video overlays which can be used as framebuffers.
The remaining overlays are reserved for video.

source "drivers/gpu/drm/omapdrm/dss/Kconfig"
source "drivers/gpu/drm/omapdrm/displays/Kconfig"

endif
3 changes: 3 additions & 0 deletions drivers/gpu/drm/omapdrm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
# Direct Rendering Infrastructure (DRI)
#

obj-y += dss/
obj-y += displays/

ccflags-y := -Iinclude/drm -Werror
omapdrm-y := omap_drv.o \
omap_irq.o \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
menu "OMAP Display Device Drivers (new device model)"
depends on OMAP2_DSS
menu "OMAPDRM External Display Device Drivers"

config DISPLAY_ENCODER_OPA362
tristate "OPA362 external analog amplifier"
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,7 @@ static int panel_dpi_enable(struct omap_dss_device *dssdev)
if (r)
return r;

if (ddata->enable_gpio)
gpiod_set_value_cansleep(ddata->enable_gpio, 1);
gpiod_set_value_cansleep(ddata->enable_gpio, 1);

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

if (ddata->enable_gpio)
gpiod_set_value_cansleep(ddata->enable_gpio, 0);

if (gpio_is_valid(ddata->backlight_gpio))
gpio_set_value_cansleep(ddata->backlight_gpio, 0);

gpiod_set_value_cansleep(ddata->enable_gpio, 0);

in->ops.dpi->disable(in);

dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ static void dispc_mgr_disable_lcd_out(enum omap_channel channel)
int r;
u32 irq;

if (dispc_mgr_is_enabled(channel) == false)
if (!dispc_mgr_is_enabled(channel))
return;

/*
Expand Down Expand Up @@ -524,7 +524,7 @@ static void dispc_mgr_enable_digit_out(void)
int r;
u32 irq_mask;

if (dispc_mgr_is_enabled(OMAP_DSS_CHANNEL_DIGIT) == true)
if (dispc_mgr_is_enabled(OMAP_DSS_CHANNEL_DIGIT))
return;

/*
Expand Down Expand Up @@ -562,7 +562,7 @@ static void dispc_mgr_disable_digit_out(void)
u32 irq_mask;
int num_irqs;

if (dispc_mgr_is_enabled(OMAP_DSS_CHANNEL_DIGIT) == false)
if (!dispc_mgr_is_enabled(OMAP_DSS_CHANNEL_DIGIT))
return;

/*
Expand Down
File renamed without changes.
Loading

0 comments on commit d43fb9f

Please sign in to comment.