aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-01-29drm/i915/dsi: add drm mipi dsi host supportJani Nikula4-4/+180
Add basic support for using the drm mipi dsi framework for DSI. We don't use device tree which is pretty much required by mipi_dsi_host_register and friends, and we don't have the kind of device model the functions expect either. So we cheat and use it as a library to abstract what we need: a nice, clean interface for DSI transfers. This means we will have to be careful with what functions we call, as the driver model devices in mipi_dsi_host and mipi_dsi_device will *not* be initialized. Signed-off-by: Jani Nikula <[email protected]> Reviewed-By: Shobhit Kumar <[email protected]> Signed-off-by: Daniel Vetter <[email protected]>
2015-01-29drm/i915/dsi: switch to drm_panel interfaceJani Nikula4-119/+157
Replace intel_dsi_device and intel_dsi_dev_ops with drm_panel and drm_panel_funcs. They are adequate for what we have now, and if we end up needing more than this we should improve drm_panel. This will keep us better aligned with the drm core infrastructure. The panel driver initialization changes a bit. It still remains hideous, but fixing that is beyond the scope here. v2: extend mode config mutex to cover drm_panel_get_modes (Shobhit) vbt_panel->intel_dsi = intel_dsi in vbt panel init (Shobhit) Signed-off-by: Jani Nikula <[email protected]> Reviewed-By: Shobhit Kumar <[email protected]> Signed-off-by: Daniel Vetter <[email protected]>
2015-01-29agp: change agp_free_page_array to use kvfreeWang, Yalin2-12/+4
Change agp_free_page_array to use kvfree function, remove the duplicated code. Signed-off-by: Yalin Wang <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2015-01-29Merge branch 'master' of ↵Dave Airlie234-2229/+2560
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next This backmerges drm-fixes into drm-next mainly for the amdkfd stuff, I'm not 100% confident, but it builds and the amdkfd folks can fix anything up. Signed-off-by: Dave Airlie <[email protected]> Conflicts: drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
2015-01-29Merge tag 'drm/panel/for-3.20-rc1' of ↵Dave Airlie25-294/+531
git://anongit.freedesktop.org/tegra/linux into drm-next drm/panel: Changes for v3.20-rc1 This contains the long-awaited drm_bridge series that makes Chromebooks work for people. I had thought this would've been perfect by now, but then I go and build test it and the first thing it does is yell about a recursive dependency. I fixed that up because I was feeling bad for not getting around to look at this earlier. Biseds that there is new support for two more panels, a couple of fixup patches to the Sharp LQ101R1SX01 dual-channel DSI panel driver and a potential NULL pointer dereference fix. * tag 'drm/panel/for-3.20-rc1' of git://anongit.freedesktop.org/tegra/linux: (23 commits) drm/bridge: dw-hdmi: Adapt to bridge API change drm/sti: fixup for bridge interface drm/bridge: dw-hdmi: Fix return error path drm: Check the right variable when setting formats Documentation: bridge: Add documentation for ps8622 DT properties Documentation: devicetree: Add vendor prefix for parade Documentation: drm: bridge: move to video/bridge drm/bridge: ptn3460: use gpiod interface drm/bridge: ptn3460: probe connector at the end of bridge attach drm/bridge: ptn3460: support drm_panel drm/exynos: dp: support drm_bridge drm/bridge: ptn3460: Convert to I2C driver model drm/bridge: make bridge registration independent of drm flow drm/bridge: do not pass drm_bridge_funcs to drm_bridge_init drm/bridge: ptn3460: Few trivial cleanups drm/panel: simple: Add AVIC TM070DDH03 panel support of: Add vendor prefix for Shanghai AVIC Optoelectronics Co., Ltd. drm/panel: sharp: lq101r1sx01: Remove unneeded include drm/panel: sharp: lq101r1sx01: Respect power timings drm/panel: sharp: lq101r1sx01: Add delay after display on ...
2015-01-28drm/i915/skl: Enabling PSR on SkylakeSonika Jindal3-3/+31
Mainly taking care of some register offsets, otherwise things are similar to hsw. Also, programming ddi aux to use hardcoded values for psr data select. v2: introduce EDP_PSR_AUX_BASE macro (Chris) v3: Moving to HW tracking for SKL+ platforms, so activating source psr during psr_enabling and then avoiding psr entries and exits for each frontbuffer updates. v4: Using SKL DDI AUX regs instead of changing PSR_AUX regs definition (Rodrigo) Signed-off-by: Sonika Jindal <[email protected]> Reviewed-by: Rodrigo Vivi <[email protected]> [danvet: Drop the hunks to short-circuit sw tracking: We'd need to push this down one level, and I don't fully trust the test coverage yet to do so. So much prefer we pick a whitelist approach for the cases we know work correctly.] Signed-off-by: Daniel Vetter <[email protected]>
2015-01-28Revert "drm/i915: Fix mutex->owner inspection race under DEBUG_MUTEXES"Chris Wilson1-1/+1
The core fix was applied in commit a63b03e2d2477586440741677ecac45bcf28d7b1 Author: Chris Wilson <[email protected]> Date: Tue Jan 6 10:29:35 2015 +0000 mutex: Always clear owner field upon mutex_unlock() (note the absence of stable@ tag) so we can now revert our band-aid commit 226e5ae9e5f910 for -next. Signed-off-by: Chris Wilson <[email protected]> Cc: Daniel Vetter <[email protected]> Cc: Jani Nikula <[email protected]> Signed-off-by: Rodrigo Vivi <[email protected]> Signed-off-by: Daniel Vetter <[email protected]>
2015-01-28drm/i915: Be consistent on printing seqnosMika Kuoppala1-4/+4
We have had %x and %u intermixed. Bring everything in line and use %x Signed-off-by: Mika Kuoppala <[email protected]> Reviewed-by: Chris Wilson <[email protected]> Signed-off-by: Daniel Vetter <[email protected]>
2015-01-28drm/i915: Display current hangcheck status in debugfsChris Wilson1-0/+36
For example, /sys/kernel/debug/dri/0/i915_hangcheck_info: Hangcheck active, fires in 15887800ms render ring: seqno = -4059 [current -583] action = 2 score = 0 ACTHD = 1ee8 [current 21f980] max ACTHD = 0 v2: Include expiration ETA. Can anyone spot a problem? v3: Convert for workqueued hangcheck (Mika) v4: Print seqnos as unsigned ints (Ville) v5: Print seqnos as hex (Chris) Tested-By: PRC QA PRTS (Patch Regression Test System Contact: [email protected]) (v2) Signed-off-by: Chris Wilson <[email protected]> (v2) Signed-off-by: Mika Kuoppala <[email protected]> Signed-off-by: Daniel Vetter <[email protected]>
2015-01-28drm/i915: Convert hangcheck from a timer into a delayed work itemChris Wilson5-18/+32
When run as a timer, i915_hangcheck_elapsed() must adhere to all the rules of running in a softirq context. This is advantageous to us as we want to minimise the risk that a driver bug will prevent us from detecting a hung GPU. However, that is irrelevant if the driver bug prevents us from resetting and recovering. Still it is prudent not to rely on mutexes inside the checker, but given the coarseness of dev->struct_mutex doing so is extremely hard. Give in and run from a work queue, i.e. outside of softirq. v2: Use own workqueue to avoid deadlocks (Daniel) Cleanup commit msg and add comment to i915_queue_hangcheck() (Chris) Cc: Jani Nikula <[email protected]> Cc: Daniel Vetter <[email protected]> Signed-off-by: Chris Wilson <[email protected]> (v1) Signed-off-by: Mika Kuoppala <[email protected]> [danvet: Remove accidental kerneldoc comment starter, to appease the 0 day builder.] Signed-off-by: Daniel Vetter <[email protected]>
2015-01-28agp/intel: Serialise after GTT updatesChris Wilson1-7/+7
An interesting bug occurs on Pineview through which the root cause is that the writes of the PTE values into the GTT is not serialised with subsequent memory access through the GTT (when using WC updates of the PTE values). This is despite there being a posting read after the GTT update. However, by changing the address of the posting read, the memory access is indeed serialised correctly. Whilst we are manipulating the memory barriers, we can remove the compiler :memory restraint on the intermediate PTE writes knowing that we explicitly perform a posting read afterwards. v2: Replace posting reads with explicit write memory barriers - in particular this is advantages in case of single page objects. Update comments to mention this issue is only with WC writes. Testcase: igt/gem_exec_big #pnv Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=88191 Tested-by: [email protected] (v1) Signed-off-by: Chris Wilson <[email protected]> Cc: Daniel Vetter <[email protected]> Signed-off-by: Daniel Vetter <[email protected]>
2015-01-28drm/bridge: dw-hdmi: Adapt to bridge API changeFabio Estevam1-9/+2
Commit fbc4572e9c48e45b ("drm/bridge: make bridge registration independent of drm flow") introduced some drm/bridge API modifications. Make the necessary changes so that we can avoid the build breakage: drivers/gpu/drm/bridge/dw_hdmi.c: In function 'dw_hdmi_bridge_destroy': drivers/gpu/drm/bridge/dw_hdmi.c:1378:2: error: implicit declaration of function 'drm_bridge_cleanup' [-Werror=implicit-function-declaration] drivers/gpu/drm/bridge/dw_hdmi.c: At top level: drivers/gpu/drm/bridge/dw_hdmi.c:1471:2: error: unknown field 'destroy' specified in initializer drivers/gpu/drm/bridge/dw_hdmi.c: In function 'dw_hdmi_register': drivers/gpu/drm/bridge/dw_hdmi.c:1535:2: error: implicit declaration of function 'drm_bridge_init' [-Werror=implicit-function-declaration] Signed-off-by: Fabio Estevam <[email protected]> Signed-off-by: Thierry Reding <[email protected]>
2015-01-28drm/sti: fixup for bridge interfaceDave Airlie1-10/+19
So sti doesn't build because the bridge interfaces changes didn't catch up to its new DVO driver. Now I might just carry this patch, but I might just push the bridge pull into a side-pull until someone resolves it. So this might not be the right solution to the problem, so please figure it out and let me know ASAP. Signed-off-by: Dave Airlie <[email protected]> Signed-off-by: Thierry Reding <[email protected]>
2015-01-28drm/bridge: dw-hdmi: Fix return error pathFabio Estevam1-1/+1
If devm_request_threaded_irq() fails we should jump to 'err_iahb' label that will disable the clocks that were previously enabled. Signed-off-by: Fabio Estevam <[email protected]> Acked-by: Philipp Zabel <[email protected]> Signed-off-by: Thierry Reding <[email protected]>
2015-01-28drm: Check the right variable when setting formatsDan Carpenter1-1/+1
When setting the video bus supported formats for a display device using drm_display_info_set_bus_formats(), check for the proper variable after duplicating memory. Signed-off-by: Dan Carpenter <[email protected]> Reviewed-by: Daniel Kurtz <[email protected]> Signed-off-by: Thierry Reding <[email protected]>
2015-01-28Documentation: bridge: Add documentation for ps8622 DT propertiesAjay Kumar1-0/+31
Add documentation for DT properties supported by ps8622/ps8625 eDP-LVDS converter. Signed-off-by: Ajay Kumar <[email protected]> Acked-by: Inki Dae <[email protected]> Tested-by: Rahul Sharma <[email protected]> Tested-by: Javier Martinez Canillas <[email protected]> Tested-by: Gustavo Padovan <[email protected]> Tested-by: Sjoerd Simons <[email protected]> Signed-off-by: Thierry Reding <[email protected]>
2015-01-28Documentation: devicetree: Add vendor prefix for paradeAjay Kumar1-0/+1
ps8622 eDP-LVDS converter bridge chip is from parade technologies Signed-off-by: Ajay Kumar <[email protected]> Acked-by: Inki Dae <[email protected]> Tested-by: Rahul Sharma <[email protected]> Tested-by: Javier Martinez Canillas <[email protected]> Tested-by: Gustavo Padovan <[email protected]> Tested-by: Sjoerd Simons <[email protected]> Signed-off-by: Thierry Reding <[email protected]>
2015-01-28Documentation: drm: bridge: move to video/bridgeAjay Kumar1-2/+2
Move drm/bridge documentation to video/bridge. Also, add proper documentation for gpios used by ptn3460. Signed-off-by: Ajay Kumar <[email protected]> Acked-by: Inki Dae <[email protected]> Tested-by: Rahul Sharma <[email protected]> Tested-by: Javier Martinez Canillas <[email protected]> Tested-by: Gustavo Padovan <[email protected]> Tested-by: Sjoerd Simons <[email protected]> Signed-off-by: Thierry Reding <[email protected]>
2015-01-28drm/bridge: ptn3460: use gpiod interfaceAjay Kumar1-52/+36
Modify driver to support gpiod interface. Signed-off-by: Ajay Kumar <[email protected]> Acked-by: Inki Dae <[email protected]> Tested-by: Rahul Sharma <[email protected]> Tested-by: Javier Martinez Canillas <[email protected]> Tested-by: Gustavo Padovan <[email protected]> Tested-by: Sjoerd Simons <[email protected]> Signed-off-by: Thierry Reding <[email protected]>
2015-01-28drm/bridge: ptn3460: probe connector at the end of bridge attachAjay Kumar1-0/+3
Force bridge connector detection at the end of the bridge attach. This is needed to detect the bridge connector early. Signed-off-by: Ajay Kumar <[email protected]> Acked-by: Inki Dae <[email protected]> Tested-by: Rahul Sharma <[email protected]> Tested-by: Javier Martinez Canillas <[email protected]> Tested-by: Gustavo Padovan <[email protected]> Tested-by: Sjoerd Simons <[email protected]> Signed-off-by: Thierry Reding <[email protected]>
2015-01-28drm/bridge: ptn3460: support drm_panelAjay Kumar3-0/+55
Add drm_panel calls to the driver to make the panel and bridge work together in tandem. Signed-off-by: Ajay Kumar <[email protected]> Acked-by: Inki Dae <[email protected]> Tested-by: Rahul Sharma <[email protected]> Tested-by: Javier Martinez Canillas <[email protected]> Tested-by: Gustavo Padovan <[email protected]> Tested-by: Sjoerd Simons <[email protected]> Signed-off-by: Thierry Reding <[email protected]>
2015-01-28drm/exynos: dp: support drm_bridgeAjay Kumar3-6/+44
Modify driver to support drm_bridge. Signed-off-by: Ajay Kumar <[email protected]> Signed-off-by: Inki Dae <[email protected]> Tested-by: Rahul Sharma <[email protected]> Tested-by: Javier Martinez Canillas <[email protected]> Tested-by: Gustavo Padovan <[email protected]> Tested-by: Sjoerd Simons <[email protected]> Signed-off-by: Thierry Reding <[email protected]>
2015-01-28drm/bridge: ptn3460: Convert to I2C driver modelAjay Kumar3-67/+91
Use drm_bridge helpers to modify the driver to support I2C driver model. Signed-off-by: Ajay Kumar <[email protected]> Acked-by: Inki Dae <[email protected]> Tested-by: Rahul Sharma <[email protected]> Tested-by: Javier Martinez Canillas <[email protected]> Tested-by: Gustavo Padovan <[email protected]> Tested-by: Sjoerd Simons <[email protected]> [[email protected]: remove recursive dependency on I2C] Signed-off-by: Thierry Reding <[email protected]>
2015-01-28drm/bridge: make bridge registration independent of drm flowAjay Kumar11-119/+133
Currently, third party bridge drivers(ptn3460) are dependent on the corresponding encoder driver init, since bridge driver needs a drm_device pointer to finish drm initializations. The encoder driver passes the drm_device pointer to the bridge driver. Because of this dependency, third party drivers like ptn3460 doesn't adhere to the driver model. In this patch, we reframe the bridge registration framework so that bridge initialization is split into 2 steps, and bridge registration happens independent of drm flow: --Step 1: gather all the bridge settings independent of drm and add the bridge onto a global list of bridges. --Step 2: when the encoder driver is probed, call drm_bridge_attach for the corresponding bridge so that the bridge receives drm_device pointer and continues with connector and other drm initializations. The old set of bridge helpers are removed, and a set of new helpers are added to accomplish the 2 step initialization. The bridge devices register themselves onto global list of bridges when they get probed by calling "drm_bridge_add". The parent encoder driver waits till the bridge is available in the lookup table(by calling "of_drm_find_bridge") and then continues with its initialization. The encoder driver should also call "drm_bridge_attach" to pass on the drm_device to the bridge object. drm_bridge_attach inturn calls "bridge->funcs->attach" so that bridge can continue with drm related initializations. Signed-off-by: Ajay Kumar <[email protected]> Acked-by: Inki Dae <[email protected]> Tested-by: Rahul Sharma <[email protected]> Tested-by: Javier Martinez Canillas <[email protected]> Tested-by: Gustavo Padovan <[email protected]> Tested-by: Sjoerd Simons <[email protected]> Signed-off-by: Thierry Reding <[email protected]>
2015-01-28drm/bridge: do not pass drm_bridge_funcs to drm_bridge_initAjay Kumar6-10/+10
Assign the pointer to bridge ops structure(drm_bridge_funcs) in the bridge driver itself, instead of passing it to drm_bridge_init. This will allow bridge driver developer to pack bridge private information inside the bridge object and pass only the drm-relevant information to drm_bridge_init. Signed-off-by: Ajay Kumar <[email protected]> Acked-by: Inki Dae <[email protected]> Tested-by: Rahul Sharma <[email protected]> Tested-by: Javier Martinez Canillas <[email protected]> Tested-by: Gustavo Padovan <[email protected]> Tested-by: Sjoerd Simons <[email protected]> Signed-off-by: Thierry Reding <[email protected]>
2015-01-28drm/bridge: ptn3460: Few trivial cleanupsAjay Kumar1-47/+48
This patch does the following changes: -- Use usleep_range instead of udelay. -- Remove driver_private member from ptn3460 structure. -- Make all possible functions and structures static. -- Use dev_err for non-DRM errors. -- Arrange header files alphabetically. -- s/edid/EDID in all error messages. Signed-off-by: Ajay Kumar <[email protected]> Acked-by: Inki Dae <[email protected]> Tested-by: Rahul Sharma <[email protected]> Tested-by: Javier Martinez Canillas <[email protected]> Tested-by: Gustavo Padovan <[email protected]> Tested-by: Sjoerd Simons <[email protected]> Signed-off-by: Thierry Reding <[email protected]>
2015-01-28drm/panel: simple: Add AVIC TM070DDH03 panel supportPhilipp Zabel2-0/+38
The Shanghai AVIC Optoelectronics TM070DDH03 is a 7" 1024x600 TFT LCD panel connecting to a 24-bit RGB LVDS interface. Signed-off-by: Philipp Zabel <[email protected]> Signed-off-by: Thierry Reding <[email protected]>
2015-01-28of: Add vendor prefix for Shanghai AVIC Optoelectronics Co., Ltd.Philipp Zabel1-0/+1
Shanghai AVIC Optoelectronics Co., Ltd. is a subsidiary of Tianma Microelectronics Co., Ltd. and designs and manufactures TFT LCDs. Signed-off-by: Philipp Zabel <[email protected]> Acked-by: Rob Herring <[email protected]> Signed-off-by: Thierry Reding <[email protected]>
2015-01-28drm/panel: sharp: lq101r1sx01: Remove unneeded includeThierry Reding1-2/+0
Nothing in the file needs symbols from include/linux/host1x.h, so remove the include. Signed-off-by: Thierry Reding <[email protected]>
2015-01-28drm/panel: sharp: lq101r1sx01: Respect power timingsThierry Reding1-9/+9
Before shutting down the display using the DCS display_off command, wait for 4 frames according to the datasheet. Furthermore, after enabling the power supply, the supply voltage needs around 10 ms to settle. After that, another 120 ms is required before a DCS exit_sleep_mode command can be sent. While at it, no longer send the DCS soft_reset command. This is totally unnecessary because we've just powered up the display, hence it will be in a reset state already. Signed-off-by: Thierry Reding <[email protected]>
2015-01-28drm/panel: sharp: lq101r1sx01: Add delay after display onThierry Reding1-0/+13
After switching the display on (using the DCS display_on command), wait for 6 frames (100ms at 60 Hz) to give the display more time to prepare. Failing to do this results in the panel not initializing properly in a large number of cases. Signed-off-by: Thierry Reding <[email protected]>
2015-01-28drm/panel: simple: Add support for Giantplus GPG482739QS5Philipp Zabel2-0/+33
This patch adds support for the GiantPlus GPG48273QS5 4.3" WQVGA TFT LCD panel to the simple-panel driver. This panel is connected via a parallel bus and uses both HSYNC and VSYNC, whose lengths are unfortunately not clearly defined. The datasheet only specifies the front- and backporch length, but the timing diagram suggests that both sync signals should be asserted for exactly one clock cycle. Signed-off-by: Philipp Zabel <[email protected]> Signed-off-by: Lucas Stach <[email protected]> Signed-off-by: Thierry Reding <[email protected]>
2015-01-28of: Add vendor prefix for Giantplus Technology Co., Ltd.Philipp Zabel1-0/+1
Signed-off-by: Philipp Zabel <[email protected]> Signed-off-by: Lucas Stach <[email protected]> Acked-by: Rob Herring <[email protected]> Signed-off-by: Thierry Reding <[email protected]>
2015-01-28drm/mipi-dsi: Avoid potential NULL pointer dereferenceThierry Reding1-3/+3
The mipi_dsi_packet_create() function dereferences the msg pointer before checking that it's valid. Move the dereference down to where it is required to avoid potentially dereferencing a NULL pointer. Reported-by: Dan Carpenter <[email protected]> Signed-off-by: Thierry Reding <[email protected]>
2015-01-27Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linuxLinus Torvalds29-188/+315
Pull drm fixes from Dave Airlie: "This feels larger than I'd like but its for three reasons. a) amdkfd finalising the API more, this is a new feature introduced last merge window, and I'd prefer to make the tweaks to the API before it first gets into a stable release. b) radeon regression required splitting an internal API to fix properly, so it just changed a few more lines c) vmwgfx fix changes a lock from a mutex->spin lock, this is fallout from the new sleep checking. Otherwise there is just some tda998x fixes" * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: drm/radeon: Remove rdev->gart.pages_addr array drm/radeon: Restore GART table contents after pinning it in VRAM v3 drm/radeon: Split off gart_get_page_entry ASIC hook from set_page_entry drm/amdkfd: Fix bug in call to init_pipelines() drm/amdkfd: Fix bug in pipelines initialization drm/radeon: Don't increment pipe_id in kgd_init_pipeline drm/i2c: tda998x: set the CEC I2C address based on the slave I2C address drm/vmwgfx: Replace the hw mutex with a hw spinlock drm/amdkfd: Allow user to limit only queues per device drm/amdkfd: PQM handle queue creation fault drm: tda998x: Fix EDID read timeout on HDMI connect drm: tda998x: Protect the page register
2015-01-28Merge tag 'topic/atomic-core-2015-01-27' of ↵Dave Airlie7-21/+301
git://anongit.freedesktop.org/drm-intel into drm-next * tag 'topic/atomic-core-2015-01-27' of git://anongit.freedesktop.org/drm-intel: drm/atomic: Fix potential use of state after free drm/atomic-helper: debug output for modesets drm/atomic-helpers: Saner encoder/crtc callbacks drm/atomic-helpers: Recover full cursor plane behaviour drm/atomic-helper: add connector->dpms() implementation drm/atomic: Add drm_crtc_state->active drm: Add standardized boolean props drm/plane-helper: Fix transitional helper kerneldocs drm/plane-helper: Skip prepare_fb/cleanup_fb when newfb==oldfb Conflicts: include/drm/drm_crtc_helper.h
2015-01-28Merge tag 'drm/tegra/for-3.20-rc1' of ↵Dave Airlie21-1633/+2018
git://anongit.freedesktop.org/tegra/linux into drm-next drm/tegra: Changes for v3.20-rc1 The biggest part of these changes is the conversion to atomic mode- setting. A lot of cleanup and demidlayering was required before the conversion, with the result being a whole lot of changes. Besides the atomic mode-setting support, the host1x bus now has the proper infrastructure to support suspend/resume for child devices. Finally, a couple of smaller cleanup patches round things off. * tag 'drm/tegra/for-3.20-rc1' of git://anongit.freedesktop.org/tegra/linux: (54 commits) drm/tegra: Use correct relocation target offsets drm/tegra: Add minimal power management drm/tegra: dc: Unify enabling the display controller drm/tegra: Track tiling and format in plane state drm/tegra: Track active planes in CRTC state drm/tegra: Remove unused ->mode_fixup() callbacks drm/tegra: Atomic conversion, phase 3, step 3 drm/tegra: Atomic conversion, phase 3, step 2 drm/tegra: dc: Use atomic clock state in modeset drm/tegra: sor: Implement ->atomic_check() drm/tegra: hdmi: Implement ->atomic_check() drm/tegra: dsi: Implement ->atomic_check() drm/tegra: rgb: Implement ->atomic_check() drm/tegra: dc: Store clock setup in atomic state drm/tegra: Atomic conversion, phase 3, step 1 drm/tegra: Atomic conversion, phase 2 drm/tegra: Atomic conversion, phase 1 drm/tegra: dc: Do not needlessly deassert reset drm/tegra: Output cleanup functions cannot fail drm/tegra: Remove remnants of the output midlayer ...
2015-01-27Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds42-334/+667
Pull networking fixes from David Miller: 1) Don't OOPS on socket AIO, from Christoph Hellwig. 2) Scheduled scans should be aborted upon RFKILL, from Emmanuel Grumbach. 3) Fix sleep in atomic context in kvaser_usb, from Ahmed S Darwish. 4) Fix RCU locking across copy_to_user() in bpf code, from Alexei Starovoitov. 5) Lots of crash, memory leak, short TX packet et al bug fixes in sh_eth from Ben Hutchings. 6) Fix memory corruption in SCTP wrt. INIT collitions, from Daniel Borkmann. 7) Fix return value logic for poll handlers in netxen, enic, and bnx2x. From Eric Dumazet and Govindarajulu Varadarajan. 8) Header length calculation fix in mac80211 from Fred Chou. 9) mv643xx_eth doesn't handle highmem correctly in non-TSO code paths. From Ezequiel Garcia. 10) udp_diag has bogus logic in it's hash chain skipping, copy same fix tcp diag used. From Herbert Xu. 11) amd-xgbe programs wrong rx flow control register, from Thomas Lendacky. 12) Fix race leading to use after free in ping receive path, from Subash Abhinov Kasiviswanathan. 13) Cache redirect routes otherwise we can get a heavy backlog of rcu jobs liberating DST_NOCACHE entries. From Hannes Frederic Sowa. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (48 commits) net: don't OOPS on socket aio stmmac: prevent probe drivers to crash kernel bnx2x: fix napi poll return value for repoll ipv6: replacing a rt6_info needs to purge possible propagated rt6_infos too sh_eth: Fix DMA-API usage for RX buffers sh_eth: Check for DMA mapping errors on transmit sh_eth: Ensure DMA engines are stopped before freeing buffers sh_eth: Remove RX overflow log messages ping: Fix race in free in receive path udp_diag: Fix socket skipping within chain can: kvaser_usb: Fix state handling upon BUS_ERROR events can: kvaser_usb: Retry the first bulk transfer on -ETIMEDOUT can: kvaser_usb: Send correct context to URB completion can: kvaser_usb: Do not sleep in atomic context ipv4: try to cache dst_entries which would cause a redirect samples: bpf: relax test_maps check bpf: rcu lock must not be held when calling copy_to_user() net: sctp: fix slab corruption from use after free on INIT collisions net: mv643xx_eth: Fix highmem support in non-TSO egress path sh_eth: Fix serialisation of interrupt disable with interrupt & NAPI handlers ...
2015-01-27net: don't OOPS on socket aioChristoph Hellwig1-3/+0
Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2015-01-27stmmac: prevent probe drivers to crash kernelAndy Shevchenko1-1/+4
In the case when alloc_netdev fails we return NULL to a caller. But there is no check for NULL in the probe drivers. This patch changes NULL to an error pointer. The function description is amended to reflect what we may get returned. Signed-off-by: Andy Shevchenko <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2015-01-27Merge tag 'powerpc-3.19-5' of ↵Linus Torvalds2-1/+2
git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux Pull powerpc fixes from Michael Ellerman: "Two powerpc fixes" * tag 'powerpc-3.19-5' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux: powerpc/powernv: Restore LPCR with LPCR_PECE1 cleared powerpc/xmon: Fix another endiannes issue in RTAS call from xmon
2015-01-27Merge tag 'fixes-for-linus' of ↵Linus Torvalds1-10/+3
git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux Pull one more module fix from Rusty Russell: "SCSI was using module_refcount() to figure out when the module was unloading: this broke with new atomic refcounting. The code is still suspicious, but this solves the WARN_ON()" * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux: scsi: always increment reference count
2015-01-27drivers: gpu: drm: i915: intel_fifo_underrun.c: Fix a typo in commentKumar Amit Mehta1-1/+1
The comment for intel_cpu_fifo_underrun_irq_handler() is not consistent with the code and the rest of the comment for this routine. This patch fixes this typo in comment. Signed-off-by: Kumar Amit Mehta <[email protected]> Reviewed-by: Jani Nikula <[email protected]> Signed-off-by: Daniel Vetter <[email protected]>
2015-01-27drm/tegra: Use correct relocation target offsetsDavid Ung1-1/+1
When copying a relocation from userspace, copy the correct target offset. Signed-off-by: David Ung <[email protected]> Fixes: 961e3beae3b2 ("drm/tegra: Make job submission 64-bit safe") Cc: [email protected] [[email protected]: provide a better commit message] Signed-off-by: Thierry Reding <[email protected]>
2015-01-27drm/tegra: Add minimal power managementThierry Reding1-0/+25
For now only disable the KMS hotplug polling helper logic upon suspend and re-enable it on resume. Reviewed-by: Sean Paul <[email protected]> Reviewed-by: Mark Zhang <[email protected]> Signed-off-by: Thierry Reding <[email protected]>
2015-01-27drm/tegra: dc: Unify enabling the display controllerThierry Reding5-52/+16
Previously output drivers would enable continuous display mode and power up the display controller at various points during the initialization. This is suboptimal because it accesses display controller registers in output drivers and duplicates a bit of code. Move this code into the display controller driver and enable the display controller as the final step of the ->mode_set_nofb() implementation. Signed-off-by: Thierry Reding <[email protected]>
2015-01-27drm/tegra: Track tiling and format in plane stateThierry Reding2-30/+101
Tracking these in the plane state allows them to be computed in the ->atomic_check() callback and reused when applying the configuration in ->atomic_update(). Signed-off-by: Thierry Reding <[email protected]>
2015-01-27drm/tegra: Track active planes in CRTC stateThierry Reding1-28/+44
Wrap struct drm_crtc_state in a driver-specific structure and add the planes field which keeps track of which planes are updated or disabled during a modeset. This allows atomic updates of the the display engine at ->atomic_flush() time. v2: open-code getting the state of the CRTC that the plane is being attached to (Daniel Vetter) Signed-off-by: Thierry Reding <[email protected]>
2015-01-27drm/tegra: Remove unused ->mode_fixup() callbacksThierry Reding4-179/+0
All output drivers have now been converted to use the ->atomic_check() callback, so the ->mode_fixup() callbacks are no longer used. Signed-off-by: Thierry Reding <[email protected]>
2015-01-27drm/tegra: Atomic conversion, phase 3, step 3Thierry Reding3-119/+100
Provide a custom ->atomic_commit() implementation which supports async commits. The generic atomic page-flip helper can use this to implement page-flipping. Signed-off-by: Thierry Reding <[email protected]>