kernel/linux.git/drivers/gpu/drm/omapdrm, branch v4.12.12

dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro

2017-04-20T08:17:46+00:00

Seeing the kunmap_atomic dma_buf_ops share the same name with a macro in highmem.h, the former can be aliased if any dma-buf user includes that header. I'm personally trying to include highmem.h inside scatterlist.h and this breaks the dma-buf code proper. Christoph Hellwig suggested [1] renaming it and pushing this patch ASAP. To maintain consistency I've renamed all four of kmap* and kunmap* to be map* and unmap*. (Even though only kmap_atomic presently conflicts.) [1] https://www.spinics.net/lists/target-devel/msg15070.html Signed-off-by: Logan Gunthorpe Reviewed-by: Sinclair Yeh Acked-by: Daniel Vetter Acked-by: Sumit Semwal Signed-off-by: Sumit Semwal Link: http://patchwork.freedesktop.org/patch/msgid/1492630570-879-1-git-send-email-logang@deltatee.com

drm: omap: use common OF graph helpers

2017-04-06T21:00:27+00:00

The OMAP driver has its own OF graph helpers that are similar to the common helpers. This commit replaces most of the calls with the common helpers. There's still a couple of custom helpers left, but the driver needs more extensive changes to get rid of them. In dss_init_ports, we invert the loop, looping through the known ports and matching them to DT nodes rather than looping thru DT nodes and matching them to the ports. Signed-off-by: Rob Herring Signed-off-by: Sean Paul

drm/omap: Major omap_modeset_init() cleanup

2017-04-03T09:36:40+00:00

Cleanup overly complex omap_modeset_init(). The function is trying to support many unusual configuration, that have never been tested and are not supported by other parts of the dirver. After cleanup the init function creates exactly one connector, encoder, crtc, and primary plane per each connected dss-device. Each connector->encoder->crtc chain is expected to be separate and each crtc is connect to a single dss-channel. If the configuration does not match the expectations or exceeds the available resources, the configuration is rejected. Signed-off-by: Jyri Sarha Signed-off-by: Tomi Valkeinen

drm/omap: Remove the obsolete #define omap_plane _omap_plane hack

2017-04-03T09:36:40+00:00

Remove the obsolete "#define omap_plane _omap_plane" hack and other related hacks to get around the enum omap_plane colliding with struct omap_plane. Signed-off-by: Jyri Sarha Reviewed-by: Laurent Pinchart Signed-off-by: Tomi Valkeinen

drm/omap: Fix one ugly indentation style break left by coccinelle

2017-04-03T09:36:40+00:00

Fix one ugly indentation style break left by the previous coccilnelle patch. Signed-off-by: Jyri Sarha Acked-by: Laurent Pinchart Signed-off-by: Tomi Valkeinen

drm/omap: Rename enum omap_plane to enum omap_plane_id

2017-04-03T09:36:40+00:00

The enum omap_plane conflicted with the same struct name for omapdrm plane private data. This rename should solve the conflict. The rename was implement with this very simple coccinelle patch: ------------------------ @@ @@ enum -omap_plane +omap_plane_id ------------------------ The patch was applied like this: spatch --sp-file --all-includes --in-place --dir drivers/gpu/drm/omapdrm The above patch did not rename the actual enum definition. That was added manually on top of the spatch changes. Signed-off-by: Jyri Sarha Acked-by: Laurent Pinchart Signed-off-by: Tomi Valkeinen

drm/omap: Get rid of DRM_OMAP_NUM_CRTCS config option

2017-04-03T09:36:40+00:00

Allocate one CRTC for each connected output and get rid of DRM_OMAP_NUM_CRTCS config option. We still can not create more CRTCs than we have DSS display managers. We also reserve one overlay per CRTC for primary plane so we can not have more CRTCs than we have overlays either. Signed-off-by: Jyri Sarha Reviewed-by: Laurent Pinchart Signed-off-by: Tomi Valkeinen

drm/omap: fix crash on module unload

2017-04-03T09:36:40+00:00

When unloading omapdrm we get a NULL pointer deref in omap_drm_irq_uninstall(). This is caused by: 967dd48417874dd25491a4e933648f394a64f70f ("drm: remove drm_vblank_no_hw_counter assignment from driver code") We shut down all the crtcs at unload time before calling omap_drm_irq_uninstall, so the code in omap_drm_irq_uninstall() is unnecessary and can be removed. Signed-off-by: Tomi Valkeinen Reviewed-by: Laurent Pinchart

drm/omap: use drm_atomic_helper_shutdown()

2017-04-03T09:36:40+00:00

Use drm_atomic_helper_shutdown() to ensure that all crtcs are disabled when unloading the driver. Signed-off-by: Tomi Valkeinen

drm/omap: fix display SYNC/DE flags

2017-04-03T09:36:40+00:00

At the moment VSYNC/HSYNC/DE high/low flags set by the panel/encoder drivers get lost when the videotimings are translated to DRM's videomode, as DRM's mode does not have corresponding flags. DRM has bus-flags for this purpose, and while it lacks a few flags at the moment, it should be used here. However, until we rewrite omapdrm's device model, using bus-flags is rather difficult. As a short term fix, this patch makes sure that every time the videomode is set in omap_crtc_mode_set_nofb(), the driver asks for the SYNC/DE flags from the panel/encoder drivers, and thus we get the correct flags into use. Signed-off-by: Tomi Valkeinen