2015q4 4.2.0 igvt-g merge #1
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 30 commits
August 28, 2015 12:40
This is purely preparation for upcoming commits, there should be no code changes here. Signed-off-by: Ben Skeggs <[email protected]>
This is purely preparation for upcoming commits, there should be no code changes here. Signed-off-by: Ben Skeggs <[email protected]>
This is purely preparation for upcoming commits, there should be no code changes here. Signed-off-by: Ben Skeggs <[email protected]>
This is purely preparation for upcoming commits, there should be no code changes here. Signed-off-by: Ben Skeggs <[email protected]>
This is purely preparation for upcoming commits, there should be no code changes here. Signed-off-by: Ben Skeggs <[email protected]>
This is purely preparation for upcoming commits, there should be no code changes here. Signed-off-by: Ben Skeggs <[email protected]>
This is purely preparation for upcoming commits, there should be no code changes here. Signed-off-by: Ben Skeggs <[email protected]>
This is purely preparation for upcoming commits, there should be no code changes here. Signed-off-by: Ben Skeggs <[email protected]>
This is purely preparation for upcoming commits, there should be no code changes here. Signed-off-by: Ben Skeggs <[email protected]>
This is purely preparation for upcoming commits, there should be no code changes here. Signed-off-by: Ben Skeggs <[email protected]>
This is purely preparation for upcoming commits, there should be no code changes here. Signed-off-by: Ben Skeggs <[email protected]>
This is purely preparation for upcoming commits, there should be no code changes here. Signed-off-by: Ben Skeggs <[email protected]>
This is purely preparation for upcoming commits, there should be no code changes here. Signed-off-by: Ben Skeggs <[email protected]>
This is purely preparation for upcoming commits, there should be no code changes here. Signed-off-by: Ben Skeggs <[email protected]>
This is purely preparation for upcoming commits, there should be no code changes here. Signed-off-by: Ben Skeggs <[email protected]>
This is purely preparation for upcoming commits, there should be no code changes here. Signed-off-by: Ben Skeggs <[email protected]>
This is purely preparation for upcoming commits, there should be no code changes here. Signed-off-by: Ben Skeggs <[email protected]>
This is purely preparation for upcoming commits, there should be no code changes here. Signed-off-by: Ben Skeggs <[email protected]>
This is purely preparation for upcoming commits, there should be no code changes here. Signed-off-by: Ben Skeggs <[email protected]>
This is purely preparation for upcoming commits, there should be no code changes here. Signed-off-by: Ben Skeggs <[email protected]>
This is purely preparation for upcoming commits, there should be no code changes here. Signed-off-by: Ben Skeggs <[email protected]>
This is purely preparation for upcoming commits, there should be no code changes here. Signed-off-by: Ben Skeggs <[email protected]>
This is purely preparation for upcoming commits, there should be no code changes here. Signed-off-by: Ben Skeggs <[email protected]>
These require an explit struct nvkm_device pointer, unlike the previous macros which take a void *, and assume it's any old nvkm_subdev. Signed-off-by: Ben Skeggs <[email protected]>
Signed-off-by: Ben Skeggs <[email protected]>
Signed-off-by: Ben Skeggs <[email protected]>
Signed-off-by: Ben Skeggs <[email protected]>
Signed-off-by: Ben Skeggs <[email protected]>
Signed-off-by: Ben Skeggs <[email protected]>
Signed-off-by: Ben Skeggs <[email protected]>
Signed-off-by: Ben Skeggs <[email protected]>
Signed-off-by: Ben Skeggs <[email protected]>
Signed-off-by: Ben Skeggs <[email protected]>
Signed-off-by: Ben Skeggs <[email protected]>
Signed-off-by: Ben Skeggs <[email protected]>
Signed-off-by: Ben Skeggs <[email protected]>
Signed-off-by: Ben Skeggs <[email protected]>
Signed-off-by: Ben Skeggs <[email protected]>
Signed-off-by: Ben Skeggs <[email protected]>
Doesn't fix any known issue, but best be safe in case control is handed to us from firmware with these left enabled. Signed-off-by: Ben Skeggs <[email protected]>
Signed-off-by: Ben Skeggs <[email protected]>
Signed-off-by: Ben Skeggs <[email protected]>
PCI IDs taken from the NVIDIA binary driver, with permission. Signed-off-by: Ben Skeggs <[email protected]>
Signed-off-by: Ben Skeggs <[email protected]>
This commit reinstates the pre-DEVINIT AGP fiddling that was broken in an earlier commit. Signed-off-by: Ben Skeggs <[email protected]>
The copyright header in nvkm/engine/device/platform.c has been replaced with the NVIDIA one from drm/nouveau_platform.c, as most of the actual code is now theirs. Signed-off-by: Ben Skeggs <[email protected]>
Signed-off-by: Ben Skeggs <[email protected]>
…/linux-2.6 into drm-next Rather large pull request this time around, due to the long-pending cleanup of the kernel driver being here. There's a stupidly large number of commits for that, as I wanted to have the series be bisectable at a fairly fine-grained level. That said, a very large portion of the churn in the rework was automated, and a very large number of boards from right across the whole range we support have been tested. I'm fairly confident there shouldn't be (too many) issues from this. Beyond correcting some not-so-great design decisions and making the code a lot easier to work with, there's not much exciting (lower memory usage, GPU VM should be a lot faster, etc) to be gained by the end-user as a result of the cleanup, it mostly lays the groundwork for future improvements. A big thanks goes to Alexandre Courbot for testing/debugging the GK20A codepaths for me :) Highlights: - A heap of perfmon work, providing a more useful userspace interface and specifying counters for a bunch of boards - Support for GT200 reclocking + other misc pm improvements - Initial patches towards supporting GM20B (Tegra X1) - Maxwell DisplayPort fixes - Cleanup of the kernel driver - The usual collection of random fixes * 'linux-4.3' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: (312 commits) drm/nouveau: bump driver version for release drm/nouveau/tegra: merge platform setup from nouveau drm drm/nouveau/pci: merge agp handling from nouveau drm drm/nouveau/device: remove pci/platform_device from common struct drm/nouveau/device: import pciid list and integrate quirks with it drm/nouveau/device: cleaner abstraction for device resource functions drm/nouveau/mc: move device irq handling to platform-specific code drm/nouveau/mc/gf100-: handle second interrupt tree drm/nouveau/mc: abstract interface to master intr registers drm/nouveau/pci: new subdev drm/nouveau/object: merge with handle drm/nouveau/core: remove the remainder of the previous style drm/nouveau/mpeg: convert to new-style nvkm_engine drm/nouveau/sw: convert to new-style nvkm_engine drm/nouveau/pm: convert to new-style nvkm_engine drm/nouveau/gr: convert to new-style nvkm_engine drm/nouveau/fifo: convert to new-style nvkm_engine drm/nouveau/disp: convert to new-style nvkm_engine drm/nouveau/dma: convert to new-style nvkm_engine drm/nouveau/cipher: convert to new-style nvkm_engine ...
Reported-by: Ilia Mirkin on irc. Signed-off-by: Dave Airlie <[email protected]>
The check of cval->cached should be zero-based (including master channel). Signed-off-by: Yao-Wen Mao <[email protected]> Cc: <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
align with mask code in overlay.c, Ben can clean the naming up later if necessary. Signed-off-by: Dave Airlie <[email protected]>
Allow comma separated filenames in the edid_firmware parameter.
For example:
edid_firmware=eDP-1:edid/1280x480.bin,DP-2:edid/1920x1080.bin
v2: Use strsep() to simplify parsing of comma seperated string. (Matt)
Move initial bail before strdup. (Matt)
v3: Changed conditionals after while loop to make more readable (Jani)
Updated kernel-parameters.txt to reflect changes (Jani)
Reviewed-by: Jani Nikula <[email protected]>
Reviewed-by: Matt Roper <[email protected]>
Signed-off-by: Bob Paauwe <[email protected]>
[danvet: Flatten else control flow and appease checkpatch.]
Signed-off-by: Daniel Vetter <[email protected]>
…intel-nightly # Conflicts: # drivers/gpu/drm/i915/intel_display.c # drivers/gpu/drm/i915/intel_lrc.c
Signed-off-by: Libo Zhu <[email protected]>
Signed-off-by: Libo Zhu <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
2015q4 4.2.0 igvt-g merge with Ubuntu Wily kernel