linux-stable.git/drivers/gpu/drm/imx, branch linux-4.5.y

drm/imx: Match imx-ipuv3-crtc components using device node in platform data

2016-06-08T01:18:52+00:00

commit 310944d148e3600dcff8b346bee7fa01d34903b1 upstream.

The component master driver imx-drm-core matches component devices using
their of_node. Since commit 950b410dd1ab ("gpu: ipu-v3: Fix imx-ipuv3-crtc
module autoloading"), the imx-ipuv3-crtc dev->of_node is not set during
probing. Before that, of_node was set and caused an of: modalias to be
used instead of the platform: modalias, which broke module autoloading.

On the other hand, if dev->of_node is not set yet when the imx-ipuv3-crtc
probe function calls component_add, component matching in imx-drm-core
fails. While dev->of_node will be set once the next component tries to
bring up the component master, imx-drm-core component binding will never
succeed if one of the crtc devices is probed last.

Add of_node to the component platform data and match against the
pdata->of_node instead of dev->of_node in imx-drm-core to work around
this problem.

Fixes: 950b410dd1ab ("gpu: ipu-v3: Fix imx-ipuv3-crtc module autoloading")
Signed-off-by: Philipp Zabel 
Tested-by: Fabio Estevam 
Tested-by: Lothar Waßmann 
Tested-by: Heiko Schocher 
Tested-by: Chris Ruehl 
Signed-off-by: Greg Kroah-Hartman

drm/imx: Add missing DRM_FORMAT_RGB565 to ipu_plane_formats

2016-02-10T13:26:53+00:00

DRM_FORMAT_RGB565 is missing from ipu_plane_formats.
The support is there, just need to make it available to userspace.

Signed-off-by: Enrico Jorns 
Signed-off-by: Philipp Zabel

drm/imx: notify DRM core about CRTC vblank state

2016-02-10T13:26:52+00:00

Make sure the DRM core is aware that there will be no vblank interrupts
incoming if the CRTC is disabled. That way the core will reject any
attempts from userspace to wait on a vblank event on a disabled CRTC.

Signed-off-by: Lucas Stach 
Signed-off-by: Philipp Zabel

dma-mapping: always provide the dma_map_ops based implementation

2016-01-21T01:09:18+00:00

Move the generic implementation to  now that all
architectures support it and remove the HAVE_DMA_ATTR Kconfig symbol now
that everyone supports them.

[valentinrothberg@gmail.com: remove leftovers in Kconfig]
Signed-off-by: Christoph Hellwig 
Cc: "David S. Miller" 
Cc: Aurelien Jacquiot 
Cc: Chris Metcalf 
Cc: David Howells 
Cc: Geert Uytterhoeven 
Cc: Haavard Skinnemoen 
Cc: Hans-Christian Egtvedt 
Cc: Helge Deller 
Cc: James Hogan 
Cc: Jesper Nilsson 
Cc: Koichi Yasutake 
Cc: Ley Foon Tan 
Cc: Mark Salter 
Cc: Mikael Starvik 
Cc: Steven Miao 
Cc: Vineet Gupta 
Cc: Christian Borntraeger 
Cc: Joerg Roedel 
Cc: Sebastian Ott 
Signed-off-by: Valentin Rothberg 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

drm/fb_cma_helper: Remove implicit call to disable_unused_functions

2016-01-15T10:16:15+00:00

The drm_fbdev_cma_init function always calls the
drm_helper_disable_unused_functions. Since it's part of the usual probe
process, all the drivers using that helper will end up having their encoder
and CRTC disable functions called at probe if their device has not been
reported as enabled.

This could be fixed by reading out from the registers the current state of
the device if it is enabled, but even that will not handle the case where
the device is actually disabled.

Moreover, the drivers using the atomic modesetting expect that their enable
and disable callback to be called when the device is already enabled or
disabled (respectively).

We can however fix this issue by moving the call to
drm_helper_disable_unused_functions out of drm_fbdev_cma_init and make the
drivers needing it (all the drivers calling drm_fbdev_cma_init and not
using the atomic modesetting) explicitly call it.

Signed-off-by: Maxime Ripard 
Link: http://patchwork.freedesktop.org/patch/msgid/1452785109-6172-14-git-send-email-maxime.ripard@free-electrons.com
Acked-by: Laurent Pinchart 
Signed-off-by: Daniel Vetter

drm: Do not set connector->encoder in drivers

2016-01-13T12:30:53+00:00

An encoder is associated with a connector by the DRM core as a result of
setting up a configuration. Drivers using the atomic or legacy helpers
should never set up this link, even if it is a static one.

While at it, try to catch this kind of error in the future by adding a
WARN_ON() in drm_mode_connector_attach_encoder(). Note that this doesn't
cover all the cases, since drivers could set this up after attaching.
Drivers that use the atomic helpers will get a warning later on, though,
so hopefully the two combined cover enough to help people avoid this in
the future.

Cc: Russell King 
Cc: Philipp Zabel 
Cc: Laurent Pinchart 
Cc: Liviu Dudau 
Cc: Mark yao 
Signed-off-by: Thierry Reding 
Signed-off-by: Daniel Vetter 
Link: http://patchwork.freedesktop.org/patch/msgid/1447694393-24700-1-git-send-email-thierry.reding@gmail.com

drm/imx: Constify function pointer structs

2015-12-15T12:46:26+00:00

Moves a bunch of junk to .rodata from .data.

 drivers/gpu/drm/imx/imxdrm.ko:
-.rodata                      624
+.rodata                      652
-.data                        372
+.data                        344

 drivers/gpu/drm/imx/imx-ipuv3-crtc.ko:
-.rodata                      224
+.rodata                      280
-.data                        184
+.data                        128

 drivers/gpu/drm/imx/imx-ldb.ko:
-.rodata                      660
+.rodata                      784
-.data                        240
+.data                        116

 drivers/gpu/drm/imx/imx-tve.ko:
-.rodata                      400
+.rodata                      524
-.data                        416
+.data                        292

 drivers/gpu/drm/imx/parallel-display.ko:
-.rodata                      400
+.rodata                      524
-.data                        216
+.data                         92

Signed-off-by: Ville Syrjälä 
Reviewed-by: Alex Deucher 
Signed-off-by: Thierry Reding 
Signed-off-by: Boris Brezillon 
Link: http://patchwork.freedesktop.org/patch/msgid/1450178476-26284-22-git-send-email-boris.brezillon@free-electrons.com
Signed-off-by: Daniel Vetter

drm/imx: Drop pipe field from struct imx_drm_crtc

2015-12-15T12:36:44+00:00

Use the drm_crtc_index() helper to determine the pipe number of the CRTC
instead.

Cc: Philipp Zabel 
Acked-by: Philipp Zabel 
Signed-off-by: Thierry Reding 
Signed-off-by: Boris Brezillon 
Link: http://patchwork.freedesktop.org/patch/msgid/1450178476-26284-5-git-send-email-boris.brezillon@free-electrons.com
Signed-off-by: Daniel Vetter

drm/imx: Make pipe number unsigned

2015-12-15T12:36:18+00:00

There's no reason whatsoever why this should ever be negative. The same
goes for the number of pipes added to the DRM device.

Cc: Philipp Zabel 
Acked-by: Philipp Zabel 
Signed-off-by: Thierry Reding 
Signed-off-by: Boris Brezillon 
Link: http://patchwork.freedesktop.org/patch/msgid/1450178476-26284-4-git-send-email-boris.brezillon@free-electrons.com
Signed-off-by: Daniel Vetter

drm: Pass 'name' to drm_encoder_init()

2015-12-11T08:13:20+00:00

Done with coccinelle for the most part. However, it thinks '...' is
part of the semantic patch, so I put an 'int DOTDOTDOT' placeholder
in its place and got rid of it with sed afterwards.

@@
identifier dev, encoder, funcs;
@@
 int drm_encoder_init(struct drm_device *dev,
                      struct drm_encoder *encoder,
                      const struct drm_encoder_funcs *funcs,
                      int encoder_type
+                     ,const char *name, int DOTDOTDOT
                      )
{ ... }

@@
identifier dev, encoder, funcs;
@@
 int drm_encoder_init(struct drm_device *dev,
                      struct drm_encoder *encoder,
                      const struct drm_encoder_funcs *funcs,
                      int encoder_type
+                     ,const char *name, int DOTDOTDOT
                      );

@@
expression E1, E2, E3, E4;
@@
 drm_encoder_init(E1, E2, E3, E4
+                 ,NULL
                  )

v2: Add ', or NULL...' to @name kernel doc (Jani)
    Annotate the function with __printf() attribute (Jani)

Signed-off-by: Ville Syrjälä 
Signed-off-by: Daniel Vetter 
Link: http://patchwork.freedesktop.org/patch/msgid/1449670818-2966-1-git-send-email-ville.syrjala@linux.intel.com