aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-03-26drm/nv50-/disp: allow dumping core channel state at first supervisor intrBen Skeggs2-0/+4
Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/nv50-/disp: add method descriptions for debuggingBen Skeggs9-0/+1023
Lists of known methods for the DMA channel classes, and mappings to their priv register addresses (where known). Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/nv50/disp: decode the known error codes to human readable formBen Skeggs1-20/+43
Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/nv50/disp: preparation for storing static class dataBen Skeggs20-121/+181
Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/nouveau/core: extend width of engine mask for namedbBen Skeggs2-2/+2
Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/nouveau/bios: fix INDEX_ADDRESS_LATCHED trace printoutIlia Mirkin1-3/+2
Having a \n in the middle of a format string means that the next line doesn't get the prefixes unlike every other line printed by the trace. Signed-off-by: Ilia Mirkin <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/nv50/gr: decode texture trap status codeIlia Mirkin1-0/+16
Signed-off-by: Ilia Mirkin <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/nouveau: use nv_debug for NV_DEBUG, make DRM a separate subflagIlia Mirkin2-4/+3
It's really confusing for NV_DEBUG's printing to be controlled via drm.debug while everything else is controlled via nouveau.debug. These messages can be turned on with nouveau.debug=DRM=debug. Signed-off-by: Ilia Mirkin <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/nouveau: make hdmi device finding failure prints debug levelIlia Mirkin1-6/+5
The hdmi device is required for runtime pm. However it is not available on many esp older devices, which were all seeing these error messages. Take this opportunity to also convert to nv_debug instead of the DRM_* messages, like the rest of nouveau does. Signed-off-by: Ilia Mirkin <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/nve0/fifo: allocate usermem as neededAlexandre Courbot1-2/+2
Memory was always allocated for 4096 channels. Change this to allocate what we actually need according to the number of channels we use. Signed-off-by: Alexandre Courbot <[email protected]> Reviewed-by: Thierry Reding <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/nouveau: handle -EACCES runtime PM return codeAlexandre Courbot3-4/+4
pm_runtime_get*() may return -EACCES to indicate a device does not have runtime PM enabled. This is currently the case with platform devices on Nouveau, and is not an error in that context. Handle this case without failure. Signed-off-by: Alexandre Courbot <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/nouveau/abi16: fix handles past the 32nd oneIlia Mirkin1-2/+2
abi16->handles is a u64, so make sure to use 1ULL << val when modifying. Signed-off-by: Ilia Mirkin <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/nouveau: replace ffsll with __ffs64Ilia Mirkin2-3/+3
The ffsll function is a lot slower than the __ffs64 built-in which compiles to a single instruction on 64-bit. It's also nice to avoid custom versions of standard functions. Note that __ffs == ffs - 1. Signed-off-by: Ilia Mirkin <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/nouveau/hwmon: replace strict_strtol() with kstrtol()Jingoo Han1-2/+3
The usage of strict_strtol() is not preferred, because strict_strtol() is obsolete. Thus, kstrtol() should be used. Signed-off-by: Jingoo Han <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/nouveau/hwmon: remove some redundant checksDan Carpenter1-8/+4
No need to check "ret" twice in a row. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2014-03-26drm/nv50/graph: update status enum namesIlia Mirkin1-14/+15
Signed-off-by: Ilia Mirkin <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2014-03-25drm/radeon: set PIPE_CONFIG for 1D and linear tiling modes on CIKMarek Olšák2-4/+26
This fixes fast color clear with 1D-tiled single-sample surfaces and Hyper-Z corruption with 1D-tiled depth surfaces. Even though it seems it is not needed for 1D tiling, CMASK and HTILE are always 2D-tiled, thus the hw needs to know the actual pipe configuration for CMASK and HTILE addressing no matter what the tiling mode of the surface is. Signed-off-by: Marek Olšák <[email protected]> Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Christian König <[email protected]>
2014-03-25drm/radeon: use drm_dp_dpcd_read_link_status()Alex Deucher1-25/+5
Replace the radeon specific version with the generic version. Signed-off-by: Alex Deucher <[email protected]> Acked-by: Christian König <[email protected]>
2014-03-25drm/radeon: use the new drm helpers for dp auxAlex Deucher3-107/+104
Switch to the new dp helpers. The main difference is that the DP helpers don't allow an adjustable delay in the aux transaction, but I don't know that this is necessary. Signed-off-by: Alex Deucher <[email protected]> Acked-by: Christian König <[email protected]>
2014-03-25drm/dp: make aux retries less chattyAlex Deucher1-2/+2
Switch to debug only to avoid flooding the logs. This mirrors the behavior in some other drivers. Signed-off-by: Alex Deucher <[email protected]> Reviewed-by: Daniel Vetter <[email protected]> Acked-by: Christian König <[email protected]>
2014-03-25drm/radeon: clarify special handling in i2c over auxAlex Deucher1-20/+16
We need a special packet for the start and end of the transaction. Signed-off-by: Alex Deucher <[email protected]> Acked-by: Christian König <[email protected]>
2014-03-25drm/radeon/atom: rework encoder enable/disable sequenceAlex Deucher1-48/+34
This more closely matches what the vbios does and also adds a quirk for travis lvds displays and powers down the sink on DP displays which saves some power and may fix display issues in some cases. Signed-off-by: Alex Deucher <[email protected]> Acked-by: Christian König <[email protected]>
2014-03-25drm/radeon/dp: move sink power control to a separate functionAlex Deucher2-5/+23
This will be used elsewhere. Signed-off-by: Alex Deucher <[email protected]> Acked-by: Christian König <[email protected]>
2014-03-25drm/radeon/dp: use i2c_get_adapdata rather than castingAlex Deucher1-1/+1
Minor code cleanup. Signed-off-by: Alex Deucher <[email protected]> Acked-by: Christian König <[email protected]>
2014-03-24drm/bridge/ptn3460: fix modular buildDave Airlie1-1/+1
This failed to build =m, quick fix. Signed-off-by: Dave Airlie <[email protected]>
2014-03-24Merge branch 'exynos-drm-next' of ↵Dave Airlie40-2331/+2761
git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next Highlights ---------- Re-factoring works over the exynos drm framework. - drm_crtc, drm_encoder/drm_connector are implemented by sub drivers directly. - Removing pm interfaces from each sub driver, and implementing them at top level of exynos drm. Add DisplayPort Transmitter driver. - Just moving existing driver from drivers/vides/exynos into drivers/gpu/drm/exynos. Add new LVDS bridge driver, PTN3460. - Placed in drivers/gpu/drm/bridge, and this device is used to transfer image signal from DP(DisplayPort) to LVDS Panel. So this driver will be used with DP driver moved into exynos drm. Add parallel panel support - With the re-factoring patch series, existing parallel panel support was broken by moving exynos_drm_display ops into each real connector driver, DP. So this patch series adds a new parallel panel module, exynos_drm_dpi, for supporting parallel panel, and also adds relevant bindings. Some fixups and cleanups. * 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos: (45 commits) drm/exynos: fimd: remove unused variable ARM: dts: exynos4210-universal: add exynos/fimd node drm/exynos: restore parallel output interface support exynos/fimd: add parallel output related bindings drm/exynos: correct timing porch conversion drm/exynos: init kms poll after creation of connectors drm/exynos: delay fbdev initialization until an output is connected drm/exynos: fix unnecessary resource cleanup drm/exynos: hdmi: use i2c_adapter instead of i2c_client drm/exynos: hdmi: consider APB PHY drm/exynos: Remove the exynos_drm_connector shim drm/exynos: Implement lvds bridge discovery to DP driver drm/bridge: Add PTN3460 bridge driver drm/exynos: Implement drm_connector directly in vidi driver drm/exynos: Implement drm_connector directly in dp driver drm/exynos: Implement drm_connector in hdmi directly drm/exynos: Add create_connector callback drm/exynos: Consolidate suspend/resume in drm_drv drm/exynos: Clean up FIMD power on/off routines drm/exynos: Implement dpms display callback in DP ...
2014-03-24drm/gma500: add locking to fixed panel edid probingDaniel Vetter3-0/+11
With the recent addition of locking checks in commit 62ff94a5492175759546f8bc61383189d6b49122 Author: Daniel Vetter <[email protected]> AuthorDate: Thu Jan 23 22:18:47 2014 +0100 drm/crtc-helper: remove LOCKING from kerneldoc drm_add_edid_modes started to WARN about the mode_config.mutex not being held in the lvds and dp initialization code. Now since this is init code locking is fairly redudant if it wouldn't be for the drm core registering sysfs files a bit early. And the locking WARNINGs nicely enforce that indeed all access to the mode lists are properly protected. And a full audit shows that only i915 and gma500 touch the modes lists at init time. Hence I've opted to wrap up this entire mode detection sequence for fixed panels with the mode_config mutex for both lvds and edp outputs. Cc: Patrik Jakobsson <[email protected]> Signed-off-by: Daniel Vetter <[email protected]> Acked-by: Patrik Jakobsson <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2014-03-24drm/i915: add locking to fixed panel edid probingDaniel Vetter2-0/+7
With the recent addition of locking checks in commit 62ff94a5492175759546f8bc61383189d6b49122 Author: Daniel Vetter <[email protected]> AuthorDate: Thu Jan 23 22:18:47 2014 +0100 drm/crtc-helper: remove LOCKING from kerneldoc drm_add_edid_modes started to WARN about the mode_config.mutex not being held in the lvds and dp initialization code. Now since this is init code locking is fairly redudant if it wouldn't be for the drm core registering sysfs files a bit early. And the locking WARNINGs nicely enforce that indeed all access to the mode lists are properly protected. And a full audit shows that only i915 and gma500 touch the modes lists at init time. Hence I've opted to wrap up this entire mode detection sequence for fixed panels with the mode_config mutex for both lvds and edp outputs. Signed-off-by: Daniel Vetter <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2014-03-24drm/exynos: fimd: remove unused variableAndrzej Hajda1-14/+6
The patch removes unused vidcon0 field from fimd_context structure. Signed-off-by: Andrzej Hajda <[email protected]> Reviewed-by: Tomasz Figa <[email protected]> Signed-off-by: Inki Dae <[email protected]>
2014-03-24ARM: dts: exynos4210-universal: add exynos/fimd nodeAndrzej Hajda1-0/+27
The patch adds fimd node with display timings for exynos4210-universal device. It also makes LCD regulators always on. This allow to re-use panel initialized by boot loader. Signed-off-by: Andrzej Hajda <[email protected]> Reviewed-by: Tomasz Figa <[email protected]> Signed-off-by: Inki Dae <[email protected]>
2014-03-24drm/exynos: restore parallel output interface supportAndrzej Hajda5-0/+360
The patch adds parallel output interface to FIMD device driver. It also restores support for panels initialized by boot loader, but without proper kernel driver. Driver uses video interface bindings to find connected panel. It uses drm_panel interface to interact with the panel. Signed-off-by: Andrzej Hajda <[email protected]> Reviewed-by: Tomasz Figa <[email protected]> Signed-off-by: Inki Dae <[email protected]>
2014-03-24exynos/fimd: add parallel output related bindingsAndrzej Hajda1-0/+15
The patch adds bindings required to add support for parallel output. Signed-off-by: Andrzej Hajda <[email protected]> Reviewed-by: Tomasz Figa <[email protected]> Signed-off-by: Inki Dae <[email protected]>
2014-03-24drm/exynos: correct timing porch conversionAndrzej Hajda1-7/+5
The patch corrects porch calculation. It should be calculated as a difference between adjacent respective fields of drm_display_mode. Signed-off-by: Andrzej Hajda <[email protected]> Reviewed-by: Daniel Kurtz <[email protected]> Reviewed-by: Tomasz Figa <[email protected]> Signed-off-by: Inki Dae <[email protected]>
2014-03-24drm/exynos: init kms poll after creation of connectorsAndrzej Hajda1-3/+3
KMS poll init helper should be run when connectors are created, otherwise it will not schedule connection detector. Signed-off-by: Andrzej Hajda <[email protected]> Reviewed-by: Tomasz Figa <[email protected]> Signed-off-by: Inki Dae <[email protected]>
2014-03-24drm/exynos: delay fbdev initialization until an output is connectedAndrzej Hajda2-12/+7
In case fbdev is initialized before any output is connected, fb resolution defaults to 1024x768. After that any output with bigger resolution is ignored and fbdev is not displayed. The patch postpones fbdev initialization to avoid such situation. Signed-off-by: Andrzej Hajda <[email protected]> Reviewed-by: Tomasz Figa <[email protected]> Signed-off-by: Inki Dae <[email protected]>
2014-03-24drm/exynos: fix unnecessary resource cleanupInki Dae1-3/+2
This patch removes unnecessary drm_mode_config_cleanup call. Signed-off-by: Inki Dae <[email protected]> Signed-off-by: Kyungmin Park <[email protected]>
2014-03-24drm/exynos: hdmi: use i2c_adapter instead of i2c_clientInki Dae1-8/+8
This patch changes i2c_client for ddc to i2c_adapter because ddc needs only i2c_adapter. Signed-off-by: Inki Dae <[email protected]> Signed-off-by: Kyungmin Park <[email protected]>
2014-03-24drm/exynos: hdmi: consider APB PHYInki Dae1-3/+23
This patch returns error in case of using APB PHY. Exynos5420 SoC and maybe later would use APB PHY instead of I2C PHY so such case should be considered. Signed-off-by: Inki Dae <[email protected]> Signed-off-by: Kyungmin Park <[email protected]>
2014-03-24drm/exynos: Remove the exynos_drm_connector shimSean Paul4-29/+6
This path removes the exynos_drm_connector code since it was just passing hooks through display_ops. The individual device drivers are now responsible for implementing drm_connector directly. Signed-off-by: Sean Paul <[email protected]> Signed-off-by: Inki Dae <[email protected]>
2014-03-24drm/exynos: Implement lvds bridge discovery to DP driverSean Paul1-0/+41
This patch implements the lvds bridge discovery and connector pre-emption code to the dp driver. Signed-off-by: Sean Paul <[email protected]> Signed-off-by: Inki Dae <[email protected]>
2014-03-24drm/bridge: Add PTN3460 bridge driverSean Paul7-0/+423
This patch adds a drm_bridge driver for the PTN3460 DisplayPort to LVDS bridge chip. Signed-off-by: Sean Paul <[email protected]> Signed-off-by: Inki Dae <[email protected]>
2014-03-24drm/exynos: Implement drm_connector directly in vidi driverSean Paul1-54/+108
This patch implements drm_connector directly in the vidi driver, this will allow us to move away from the exynos_drm_connector layer. Signed-off-by: Sean Paul <[email protected]> Signed-off-by: Inki Dae <[email protected]>
2014-03-24drm/exynos: Implement drm_connector directly in dp driverSean Paul2-9/+94
This patch implements drm_connector directly in the dp driver, this will allow us to move away from the exynos_drm_connector layer. Signed-off-by: Sean Paul <[email protected]> Signed-off-by: Inki Dae <[email protected]>
2014-03-24drm/exynos: Implement drm_connector in hdmi directlySean Paul1-41/+85
This patch implements drm_connector in the hdmi driver directly, instead of using exynos_drm_connector. Signed-off-by: Sean Paul <[email protected]> Signed-off-by: Inki Dae <[email protected]>
2014-03-24drm/exynos: Add create_connector callbackSean Paul2-0/+5
This creates a new display hook called create_connector. The purpose is to allow the display driver to create its own drm_connector instead of using the exynos_drm_connector. This moves things closer to completely removing the exynos_drm_connector abstraction. Signed-off-by: Sean Paul <[email protected]> Signed-off-by: Inki Dae <[email protected]>
2014-03-24drm/exynos: Consolidate suspend/resume in drm_drvSean Paul5-288/+170
This patch removes all of the suspend/resume logic from the individual drivers and consolidates it in drm_drv. This consolidation reduces the number of functions which enable/disable the hardware to just one -- the dpms callback. This ensures that we always power up/down in a consistent manner. Signed-off-by: Sean Paul <[email protected]> Signed-off-by: Inki Dae <[email protected]>
2014-03-24drm/exynos: Clean up FIMD power on/off routinesSean Paul1-111/+134
This patch separates the fimd_activate function into poweron/poweroff functions to be more consistent with the other drivers in exynos drm. It also properly cleans up after failures in poweron. The functions have also been shuffled around such that they are all in the same spot in the file and poweron/poweroff can be called from the dpms function. Signed-off-by: Sean Paul <[email protected]> Signed-off-by: Inki Dae <[email protected]>
2014-03-24drm/exynos: Implement dpms display callback in DPSean Paul2-62/+81
This patch implements the dpms display callback for the DP driver. Signed-off-by: Sean Paul <[email protected]> Signed-off-by: Inki Dae <[email protected]>
2014-03-24drm/exynos: Move display implementation into dpSean Paul7-86/+131
This patch moves the exynos_drm_display implementation from fimd into the dp driver. This will allow for tighter integration of the dp driver into the exynos drm driver. Signed-off-by: Sean Paul <[email protected]> Signed-off-by: Inki Dae <[email protected]>
2014-03-24drm/exynos: Move dp driver from video/ to drm/Sean Paul9-14/+8
This patch moves the code from video/ to drm/. This is required the DP driver needs to power on/off in the correct order in relation to fimd. This will also allow the DP driver to participate in drm modeset as well as provide accurate connection detection and edid. Signed-off-by: Sean Paul <[email protected]> Signed-off-by: Inki Dae <[email protected]>