aboutsummaryrefslogtreecommitdiff
path: root/drivers/gpu
AgeCommit message (Collapse)AuthorFilesLines
2016-03-04drm/mgag200: removed optional dummy crtc mode_fixup function.Carlos Palminha1-13/+0
This patch set nukes all the dummy crtc mode_fixup implementations. (made on top of Daniel topic/drm-misc branch) Signed-off-by: Carlos Palminha <[email protected]> Signed-off-by: Daniel Vetter <[email protected]> Link: http://patchwork.freedesktop.org/patch/msgid/3d089c84bcb1aafd485d4944ad472f9843c38eaf.1455630967.git.palminha@synopsys.com
2016-03-04drm/cirrus: removed optional dummy crtc mode_fixup function.Carlos Palminha1-13/+0
This patch set nukes all the dummy crtc mode_fixup implementations. (made on top of Daniel topic/drm-misc branch) Signed-off-by: Carlos Palminha <[email protected]> Signed-off-by: Daniel Vetter <[email protected]> Link: http://patchwork.freedesktop.org/patch/msgid/5a3c41fed15847549f9bdeae89b72705b4756cc4.1455630967.git.palminha@synopsys.com
2016-03-04drm/atomic: Pass connector and state to update_connector_routing.Maarten Lankhorst1-10/+5
Minor cleanup, connector and connector_state are always non-NULL here. Signed-off-by: Maarten Lankhorst <[email protected]> Reviewed-by: Ville Syrjälä <[email protected]> Signed-off-by: Daniel Vetter <[email protected]> Link: http://patchwork.freedesktop.org/patch/msgid/1456303053-28806-3-git-send-email-maarten.lankhorst@linux.intel.com
2016-03-04drm/atomic: Clean up update_output_state.Maarten Lankhorst1-24/+17
With the addition of crtc_state->connector_mask other connectors from different crtc's aren't needed any more to determine if a crtc has connectors, so only call add_affected_connectors on the target crtc. This allows a cleanup to first remove all current connectors, then add all set->connectors to the target crtc. Signed-off-by: Maarten Lankhorst <[email protected]> Reviewed-by: Ville Syrjälä <[email protected]> Signed-off-by: Daniel Vetter <[email protected]> Link: http://patchwork.freedesktop.org/patch/msgid/1456303053-28806-2-git-send-email-maarten.lankhorst@linux.intel.com
2016-03-04gpu: host1x: Set DMA ops on device creationAlexandre Courbot1-0/+2
Currently host1x-instanciated devices have their dma_ops left to NULL, which makes any DMA operation (like buffer import) on ARM64 fallback to the dummy_dma_ops and fail with an error. This patch calls of_dma_configure() with the host1x node when creating such a device, so the proper DMA operations are set. Suggested-by: Thierry Reding <[email protected]> Signed-off-by: Alexandre Courbot <[email protected]> Signed-off-by: Thierry Reding <[email protected]>
2016-03-04gpu: host1x: Set DMA maskAlexandre Courbot2-0/+8
The default DMA mask covers a 32 bits address range, but host1x devices can address a larger range on TK1 and TX1. Set the DMA mask to the range addressable when we use the IOMMU to prevent the use of bounce buffers. Signed-off-by: Alexandre Courbot <[email protected]> Signed-off-by: Thierry Reding <[email protected]>
2016-03-04Merge tag 'drm-intel-fixes-2016-03-03' of ↵Dave Airlie1-3/+3
git://anongit.freedesktop.org/drm-intel into drm-fixes Small conflict as I had the balance in my tree already for testing. * tag 'drm-intel-fixes-2016-03-03' of git://anongit.freedesktop.org/drm-intel: drm/i915: Balance assert_rpm_wakelock_held() for !IS_ENABLED(CONFIG_PM) drm/i915/skl: Fix power domain suspend sequence
2016-03-04Merge branch 'msm-next' of git://people.freedesktop.org/~robclark/linux into ↵Dave Airlie45-1323/+4550
drm-next Big ticket items are hdmi support for 8996 (aka snapdragon 820), and adreno 430 support. Also one more small uapi addition to support timestamp queries. * 'msm-next' of git://people.freedesktop.org/~robclark/linux: (29 commits) drm/msm: rename hdmi symbols drm/msm/adreno: remove duplicate adreno_hw_init() call drm/msm: add timestamp param drm/msm: fix small typo drm/msm: grab struct_mutex after allocating submit drm/msm: reject submit ioctl if no gpu drm/msm/adreno: print details in case of a protect fault interrupt drm/msm/adreno: get CP_RPTR from register instead of shadow memory drm/msm/adreno: add adreno430 power control drm/msm/adreno: support for adreno 430. drm/msm: update generated headers drm/msm/dsi: fix definition of msm_dsi_pll_28nm_8960_init() drm/msm/dsi: Parse DSI lanes via DT drm/msm/dsi: Drop VDD regulator for MSM8916 drm/msm/dsi: Remove incorrect warning on host attach drm/msm: Free fb helper resources in msm_unload drm/msm/mdp: Detach iommu in mdp4_destroy drm/msm: make iommu port names const'ier drm/msm/mdp: Use atomic helper to set crtc property dt-bindings: msm/hdmi: Add HDMI PHY bindings ...
2016-03-03drm/msm: rename hdmi symbolsArnd Bergmann17-264/+264
Global symbols in the kernel should be prefixed by the name of the subsystem and/or driver to avoid conflicts when all code is built-in. In this case, function names like 'hdmi_register' or 'hdmi_set_mode' are way too generic for an MSM specific DRM driver, so I'm renaming them all to msm_hdmi_* here. I also rename a lot of the 'static' symbols along with the global names for consistency, even though those are relatively harmless; they might only be slightly confusing when they show up in backtraces. Signed-off-by: Arnd Bergmann <[email protected]> Signed-off-by: Rob Clark <[email protected]>
2016-03-03drm/msm/adreno: remove duplicate adreno_hw_init() callRob Clark1-6/+0
Not sure where it came from, but seem unintentional. And also not needed on a420, so let's just drop it. Signed-off-by: Rob Clark <[email protected]>
2016-03-03drm/msm: add timestamp paramRob Clark3-0/+28
We need this for GL_TIMESTAMP queries. Note: currently only supported on a4xx.. a3xx doesn't have this always-on counter. I think we could emulate it with the one CP counter that is available, but for now it is of limited usefulness on a3xx (since we can't seem to do time-elapsed queries in any sane way with the existing firmware on a3xx, and if you are trying to do profiling on a tiler you want time-elapsed). We can add that later if it becomes useful. Signed-off-by: Rob Clark <[email protected]>
2016-03-03drm/msm: fix small typoRob Clark1-1/+1
Signed-off-by: Rob Clark <[email protected]>
2016-03-03drm/msm: grab struct_mutex after allocating submitRob Clark1-8/+5
No real need to hold the lock over allocation, and simplifies things slightly if we change the order. Signed-off-by: Rob Clark <[email protected]>
2016-03-03drm/msm: reject submit ioctl if no gpuRob Clark1-3/+4
Existing userspace wouldn't get this far, since getparam ioctl would have failed and it would have bailed out creating a screen/context. But all the same, we shouldn't let evil or confused userspace cause a null ptr deref. Signed-off-by: Rob Clark <[email protected]>
2016-03-03drm/msm/adreno: print details in case of a protect fault interruptCraig Stout1-0/+7
Signed-off-by: Craig Stout <[email protected]> Signed-off-by: Rob Clark <[email protected]>
2016-03-03drm/msm/adreno: get CP_RPTR from register instead of shadow memoryCraig Stout1-12/+22
As described in the downstream/kgsl driver: Sometimes the RPTR shadow memory is unreliable causing timeouts in adreno_idle(). Read it directly from the register instead. Signed-off-by: Craig Stout <[email protected]> Signed-off-by: Rob Clark <[email protected]>
2016-03-03drm/msm/adreno: add adreno430 power controlCraig Stout1-2/+37
Signed-off-by: Craig Stout <[email protected]> Signed-off-by: Rob Clark <[email protected]>
2016-03-03drm/msm/adreno: support for adreno 430.Craig Stout4-7/+52
Signed-off-by: Craig Stout <[email protected]> Signed-off-by: Rob Clark <[email protected]>
2016-03-03drm/msm: update generated headersRob Clark14-163/+1740
Pull in additional regs needed for a430, etc. Signed-off-by: Rob Clark <[email protected]>
2016-03-03drm/msm/dsi: fix definition of msm_dsi_pll_28nm_8960_init()Luis Henriques1-2/+2
This fixes the following build failure: drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.o: In function `msm_dsi_pll_28nm_8960_init': dsi_pll_28nm.c:(.text+0x1198): multiple definition of `msm_dsi_pll_28nm_8960_init' drivers/gpu/drm/msm/dsi/pll/dsi_pll.o:dsi_pll.c:(.text+0x0): first defined here Signed-off-by: Luis Henriques <[email protected]> Acked-by: Archit Taneja <[email protected]> Signed-off-by: Rob Clark <[email protected]>
2016-03-03drm/msm/dsi: Parse DSI lanes via DTArchit Taneja1-20/+96
The DSI driver is currently unaware of how the DSI physical data lanes are mapped to the logical lanes provided by the DSI controller. Create a DT binding "qcom,data-lane-map" that provides this information on a given platform. The MSM DSI controller is restricted in terms of what all mappings it can support. The lane polarity is fixed for all the lanes, the clock lanes are fixed, and the data lanes can be swapped among each other only for a few combinations. Apply these restrictions when we parse the DT data. Cc: [email protected] Cc: Rob Herring <[email protected]> Cc: Tomi Valkeinen <[email protected]> Signed-off-by: Archit Taneja <[email protected]> Signed-off-by: Rob Clark <[email protected]> Acked-by: Rob Herring <[email protected]>
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 Valkeinen1-0/+2
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]>