aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2016-03-03drm/omap: no need to select OMAP2_DSSTomi Valkeinen1-1/+0
omapdss driver now depends on omapdrm, so we no longer should select OMAP2_DSS from omapdrm's Kconfig. Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap: gem: Fix omap_gem_new() error pathLaurent Pinchart1-16/+18
When an error occurs in omap_gem_new() the function calls omap_gem_free_object() to clean up. However, that function expects to be called on a fully initialized GEM object and thus crashes. Replace it by manual cleanup. Signed-off-by: Laurent Pinchart <[email protected]> Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap: remove -Werror from MakefileTomi Valkeinen1-1/+1
Having -Werror in the omapdrm Makefile makes development and debugging a PITA. Let's remove it. Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap: remove dispc_ovl_check()Tomi Valkeinen2-46/+0
dispc_ovl_check() is not used anywhere, so it can be removed. Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap: remove dss compat codeTomi Valkeinen11-4260/+0
We have removed all the uses of compat code from omapdrm and the non-compat parts of omapdss, so now we can remove all the compat code itself. Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap: remove last uses of omap_overlay_managerTomi Valkeinen1-10/+0
We have now removed all uses of 'struct omap_overlay_manager', so we can now remove the last places where it is set. Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap: DSI: remove uses of omap_overlay_managerTomi Valkeinen1-30/+28
We are removing the uses of 'struct omap_overlay_manager'. This patch changes DSI driver to use 'omap_channel' instead. Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap: VENC: remove uses of omap_overlay_managerTomi Valkeinen1-13/+11
We are removing the uses of 'struct omap_overlay_manager'. This patch changes VENC driver to use 'omap_channel' instead. Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap: SDI: remove uses of omap_overlay_managerTomi Valkeinen1-17/+16
We are removing the uses of 'struct omap_overlay_manager'. This patch changes SDI driver to use 'omap_channel' instead. Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap: HDMI4: remove uses of omap_overlay_managerTomi Valkeinen1-17/+13
We are removing the uses of 'struct omap_overlay_manager'. This patch changes HDMI4 driver to use 'omap_channel' instead. Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap: HDMI5: remove uses of omap_overlay_managerTomi Valkeinen1-17/+13
We are removing the uses of 'struct omap_overlay_manager'. This patch changes HDMI5 driver to use 'omap_channel' instead. Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap: DPI: remove uses of omap_overlay_managerTomi Valkeinen1-20/+20
We are removing the uses of 'struct omap_overlay_manager'. This patch changes DPI driver to use 'omap_channel' instead. Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap: remove extra manager checks on disconnectTomi Valkeinen6-12/+6
The DSS output drivers check 'dssdev->manager' in disconnect() functions. This check is not needed as the manager must always be set if the output device was connected. Remove the check. Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap: remove extra check in dpi and sdiTomi Valkeinen2-2/+2
Both dpi and sdi check for 'mgr != NULL' in check_timings. This check is not necessary, as mgr must always be set before check_timings. Remove the check. Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap: convert dss_mgr_unregister_framedone_handler to accept omap_channelTomi Valkeinen3-5/+5
We are removing uses of 'struct omap_overlay_manager'. This patch changes dss_mgr_unregister_framedone_handler() to accept 'enum omap_channel' instead of 'struct omap_overlay_manager'. Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap: convert dss_mgr_register_framedone_handler to accept omap_channelTomi Valkeinen3-4/+4
We are removing uses of 'struct omap_overlay_manager'. This patch changes dss_mgr_register_framedone_handler() to accept 'enum omap_channel' instead of 'struct omap_overlay_manager'. Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap: convert dss_mgr_start_update to accept omap_channelTomi Valkeinen3-4/+4
We are removing uses of 'struct omap_overlay_manager'. This patch changes dss_mgr_start_update() to accept 'enum omap_channel' instead of 'struct omap_overlay_manager'. Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap: convert dss_mgr_disable to accept omap_channelTomi Valkeinen9-13/+13
We are removing uses of 'struct omap_overlay_manager'. This patch changes dss_mgr_disable() to accept 'enum omap_channel' instead of 'struct omap_overlay_manager'. Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap: convert dss_mgr_enable to accept omap_channelTomi Valkeinen9-10/+10
We are removing uses of 'struct omap_overlay_manager'. This patch changes dss_mgr_enable() to accept 'enum omap_channel' instead of 'struct omap_overlay_manager'. Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap: convert dss_mgr_set_lcd_config to accept omap_channelTomi Valkeinen5-6/+6
We are removing uses of 'struct omap_overlay_manager'. This patch changes dss_mgr_set_lcd_config() to accept 'enum omap_channel' instead of 'struct omap_overlay_manager'. Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap: convert dss_mgr_set_timings to accept omap_channelTomi Valkeinen8-10/+10
We are removing uses of 'struct omap_overlay_manager'. This patch changes dss_mgr_set_timings() to accept 'enum omap_channel' instead of 'struct omap_overlay_manager'. Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap: convert dss_mgr_disconnect to accept omap_channelTomi Valkeinen8-15/+15
We are removing uses of 'struct omap_overlay_manager'. This patch changes dss_mgr_disconnect() to accept 'enum omap_channel' instead of 'struct omap_overlay_manager'. Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap: convert dss_mgr_connect to accept omap_channelTomi Valkeinen8-9/+9
We are removing uses of 'struct omap_overlay_manager'. This patch changes dss_mgr_connect() to accept 'enum omap_channel' instead of 'struct omap_overlay_manager'. Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap: use dispc_channel_connected in output driversTomi Valkeinen7-7/+7
Use 'out->dispc_channel_connected' to check if the device is connected to an overlay manager or not, instead of using 'out->manager'. Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap: add dispc_channel_connected field to omap_dss_deviceTomi Valkeinen2-0/+3
We want to remove the 'struct omap_overlay_manager' from omap_dss_device. At the moment that field is used, among some other uses, to see if the omap_dss_device is connected to an overlay manager. To make it possible to remove the 'struct omap_overlay_manager' field, this patch adds 'bool dispc_channel_connected' field to track the connected-or-not status. Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap: convert dss_mgr_ops to use omap_channelTomi Valkeinen4-44/+57
We are removing the use of 'struct omap_overlay_manager' from omapdrm. This patch changes the function pointers in 'dss_mgr_ops' to get 'enum omap_channel' parameter instead of 'struct omap_overlay_manager'. The change is very straightforward, as we still use 'struct omap_overlay_manager' inside the function implementations where needed. Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap: remove use of omapdss_find_mgr_from_display()Tomi Valkeinen2-21/+5
In order to remove uses of 'struct omap_overlay_manager' we need to get rid of using omapdss_find_mgr_from_display() when initializing omapdrm. Instead of using omapdss_find_mgr_from_display() and mgr->id to find the dispc channel used for the given display, we can instead use omapdss_find_output_from_display(), and get the output->dispc_channel from there. We can also remove omapdss_find_mgr_from_display() as it's no longer used. Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap: remove crtc->mgr fieldTomi Valkeinen1-13/+7
In order to remove uses of 'struct omap_overlay_manager' from omapdrm, this patch removes the crtc->mgr field. To accomplish that, a new static array is added along the current 'omap_crtcs' static array, which is used to store the output device connected to a crtc. Optimally we'd use the struct omap_crtc to store this information, but at the time when omap_crtc_dss_connect() is called, we don't yet have the omap_crtc instances. This might possibly be fixed later, but for now the static array does the job. Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap: Add dispc_mgr_get_supported_outputs()Tomi Valkeinen3-1/+9
We are removing the use of the 'struct omap_overlay_manager' from omapdrm, and one part of that is removing the use of mgr->supported_outputs field. This patch adds dispc_mgr_get_supported_outputs() function which can be used instead of mgr->supported_outputs. omap_crtc.c is changed to use the new function. Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap: move dss_mgr_* declarations to omapdrm/omapfbTomi Valkeinen3-16/+32
This patch continues the work to create private versions of the omapdss.h header for omapdrm and omapfb. This one moves the dss_mgr_* function declarations. Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap: move struct dss_mgr_ops to omapdrm/omapfbTomi Valkeinen3-22/+46
This patch continues the work to create private versions of the omapdss.h header for omapdrm and omapfb. This one moves 'struct dss_mgr_ops'. Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap, omapfb: move exported dispc function declarations to omapdrm/omapfbTomi Valkeinen6-38/+104
omapdrm and omapfb still share the same include/video/omapdss.h. We need to change that so that we can proceed with omapdrm work. However, it's not trivial to make separate omapfb and omapdrm versions of omapdss.h, as that file is also included in other places like arch code, audio code and omap_vout code. So we'll do it piece by piece. This patch makes private versions of all the dispc function declarations that are in omapdss.h. For omapdrm we create a new file, drivers/gpu/drm/omapdrm/dss/omapdss.h, which will contain headers meant to be visible outside omapdss. Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap: panel-tpo-td043mtea1: remove pdata supportTomi Valkeinen1-38/+5
We no longer have any boards that require the platform data support from the panel, so we can remove the related code. Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap: panel-tpo-td028ttec1: remove pdata supportTomi Valkeinen1-36/+5
We no longer have any boards that require the platform data support from the panel, so we can remove the related code. Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap: panel-nec-nl8048hl11: remove pdata supportTomi Valkeinen1-39/+5
We no longer have any boards that require the platform data support from the panel, so we can remove the related code. Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap: panel-sharp-ls037v7dw01: remove pdata supportTomi Valkeinen1-78/+5
We no longer have any boards that require the platform data support from the panel, so we can remove the related code. Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap: panel-lgphilips-lb035q02: remove pdata supportTomi Valkeinen1-48/+5
We no longer have any boards that require the platform data support from the panel, so we can remove the related code. Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap: connector-hdmi: remove pdata supportTomi Valkeinen1-34/+5
We no longer have any boards that require the platform data support from the connector, so we can remove the related code. Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap: connector-dvi: remove pdata supportTomi Valkeinen1-50/+5
We no longer have any boards that require the platform data support from the connector, so we can remove the related code. Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap: encoder-tfp410: remove pdata supportTomi Valkeinen1-36/+5
We no longer have any boards that require the platform data support from the encoder, so we can remove the related code. Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap: panel-dsi-cm: remove pdata supportTomi Valkeinen1-44/+5
We no longer have any boards that require the platform data support from the panel, so we can remove the related code. Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap: omapdss.h: remove omap_hdmi_initTomi Valkeinen1-2/+0
omap_hdmi_init() function does not exist anymore, so we can remove the declaration. Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap: omapdss.h: remove unused struct omap_dss_hdmi_dataTomi Valkeinen1-7/+0
'struct omap_dss_hdmi_data' is not used anywhere, so we can remove it. Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap: move dss_suspend/resume_all to core.cTomi Valkeinen3-15/+13
core.c is the only caller of dss_disable_all_devices(). We can thus move the function from display.c to core.c and make it static. Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap: fix suspend/resume handlingTomi Valkeinen4-67/+44
For legacy reasons omapdss handles system suspend/resume via PM notifier callback, where the driver disables/resumes all the outputs. This doesn't work well with omapdrm. What happens on suspend is that the omapdss disables the displays while omapdrm is still happily continuing its work, possibly waiting for an vsync irq, which will never come if the display output is disabled, leading to timeouts and errors sent to userspace. This patch moves the suspend/resume handling to omapdrm, and the suspend/resume is now done safely inside modeset lock. Signed-off-by: Tomi Valkeinen <[email protected]>
2016-03-03drm/omap: check if rotation is supported before commitTomi Valkeinen3-0/+15
omapdrm is missing a check on the validity of the rotation property. This leads to omapdrm possibly trying to use rotation on non-rotateable framebuffer, which causes the overlay setup to fail. This patch adds the necessary check to omap_plane_atomic_check(). Signed-off-by: Tomi Valkeinen <[email protected]> Reviewed-by: Laurent Pinchart <[email protected]>
2016-03-03drm/omap: fix crtc->plane property delegationTomi Valkeinen1-18/+40
Before universal planes we had to have plane specific properties for the crtc too, as on the hardware level a crtc uses a plane. In other words, e.g. 'zorder' property was added to both planes and crtcs, and omap_crtc.c would delegate the property set/get to the primary plane. However, the delegation was a bit too generic, delegating all property set/get calls to planes. Thus it's possible to set, say, FB_ID, on a crtc, which gets redirected to the primary plane. This is not standard, and shouldn't be allowed. To keep backward compatibility, we still need to redirect the properties we supported earlier for crtcs, namely 'zorder' and 'rotation'. This patch redirects only the allowed properties from crtcs to planes. Signed-off-by: Tomi Valkeinen <[email protected]> Reviewed-by: Laurent Pinchart <[email protected]>
2016-03-03drm/omap: EBUSY status handling in omap_gem_fault()Rob Clark1-0/+5
Subsequent threads returning EBUSY from vm_insert_pfn() was not handled correctly. As a result concurrent access from new threads to mmapped data caused SIGBUS. See e79e0fe380847493266fba557217e2773c61bd1b ("drm/i915: EBUSY status handling added to i915_gem_fault()"). Signed-off-by: Rob Clark <[email protected]> Signed-off-by: Tomi Valkeinen <[email protected]> Acked-by: Laurent Pinchart <[email protected]>
2016-03-03drm/omap: verify that fb plane pitches are the sameTomi Valkeinen1-0/+8
The DSS hardware uses the same ROW_INC value for both Y and UV planes for NV12 format. This means that the pitches of the Y and UV planes have to match. omapdrm doesn't check this at the moment, and this can lead into a broken NV12 fb on the screen. This patch adds the check. Signed-off-by: Tomi Valkeinen <[email protected]> Reviewed-by: Laurent Pinchart <[email protected]>
2016-03-03drm/omap: verify that display x-res is divisible by 8Tomi Valkeinen1-0/+3
DISPC requires the x resolution to be divisible by 8 when stall mode is not used. Add a check to the DPI driver to verify this. Signed-off-by: Tomi Valkeinen <[email protected]> Acked-by: Laurent Pinchart <[email protected]>