aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-11-08drm/nouveau/agp: add a quirk list to limit agp modesIlia Mirkin1-5/+39
Certain combinations of hardware can't actually support the maximum detected speed. Add a quirk list that lists pairs of hostbridge/chip pci ids and the mode that they should work with. See https://bugs.freedesktop.org/show_bug.cgi?id=20341 Reported-by: Jason Detring <[email protected]> Signed-off-by: Ilia Mirkin <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2013-11-08drm/nvd9-/disp: disable display underflow reporting at initBen Skeggs1-0/+9
Reported-by: Andy Ritger <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2013-11-08drm/nva0/clk: fix accidental limiting of pll coefficientsBen Skeggs1-13/+16
Signed-off-by: Ben Skeggs <[email protected]>
2013-11-08drm/nv50-nvaf/fb: split fbram oclass in preparation for reclockingBen Skeggs9-52/+184
Signed-off-by: Ben Skeggs <[email protected]>
2013-11-08drm/nouveau/fb: merge more bits and pieces into oclass definitionsBen Skeggs27-519/+272
Signed-off-by: Ben Skeggs <[email protected]>
2013-11-08drm/nouveau/fb: remove ram oclass argument from base fb constructorBen Skeggs24-107/+135
Signed-off-by: Ben Skeggs <[email protected]>
2013-11-08drm/nv50-nvaf/fb: split the class definitions up a bitBen Skeggs9-44/+203
These will diverge further in the future. Signed-off-by: Ben Skeggs <[email protected]>
2013-11-08drm/nouveau/fb: make external class definitions pointersBen Skeggs26-113/+113
Signed-off-by: Ben Skeggs <[email protected]>
2013-11-08drm/nvaa/mc: blacklist msi to off by defaultBen Skeggs1-11/+19
Signed-off-by: Ben Skeggs <[email protected]>
2013-11-08drm/nv50-nv86,nv92/mc: rearm msi via pci config space, rather than mmio mirrorBen Skeggs6-4/+52
This is what NVIDIA do on these chipsets, let's hope it works around the reported MSI failures for us on NV86. v2: updated to include G92, as per information provided by NVIDIA. Signed-off-by: Ben Skeggs <[email protected]>
2013-11-08drm/nvc0,nvc4/mc: handle 0xc0's "special" msi rearmBen Skeggs13-32/+134
v2. updated to cover GF104, as per information provided by NVIDIA. Reported-by: Maarten Lankhorst <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2013-11-08drm/nouveau/mc: store static data in nouveau_mc class definitionBen Skeggs16-215/+151
Signed-off-by: Ben Skeggs <[email protected]>
2013-11-08drm/nouveau/mc: fetch NV_PMC_INTR again after re-arming MSIBen Skeggs1-4/+6
Signed-off-by: Ben Skeggs <[email protected]>
2013-11-08drm/nouveau/mc: bracket interrupt handler with NV_PMC_INTR_EN disable/re-enableBen Skeggs1-0/+4
This looks to be what NVIDIA do pretty much everywhere, since forever. Signed-off-by: Ben Skeggs <[email protected]>
2013-11-08drm/nouveau/mc: have single entry and exit points to the interrupt handlerBen Skeggs1-18/+19
Signed-off-by: Ben Skeggs <[email protected]>
2013-11-08drm/nouveau/mc: msi rearm write via subdev, not deviceBen Skeggs1-2/+2
This way we can catch it with debugging on for PMC subdev. Signed-off-by: Ben Skeggs <[email protected]>
2013-11-08drm/nouveau/device: use an additional bit from NV_PMC_BOOT_0 to identify chipsetBen Skeggs1-3/+3
Signed-off-by: Ben Skeggs <[email protected]>
2013-11-08drm/nouveau/bios/init: return failure condition on invalid opcodesBen Skeggs1-1/+1
Signed-off-by: Ben Skeggs <[email protected]>
2013-11-08drm/nv31/mpeg: remove need for separate refcnt on engine useBen Skeggs2-19/+21
Signed-off-by: Ben Skeggs <[email protected]>
2013-11-08drm/nouveau/therm: ack any pending IRQ at initMartin Peres4-4/+18
This is safe because ptherm hasn't been configured yet and will be a little further down the initialization path. Ptherm should be safe regarding to runtime reconfiguration. v2: - do not limit this patch to nv84-a3 and make it nv84+ v3: - move the ack to fini() - disable IRQs on fini() - silently ignore un-requested IRQs Signed-off-by: Martin Peres <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2013-11-08drm/nv31/mpeg: split the nv31 and nv40 dma setting implementationsIlia Mirkin4-6/+65
NV31 has different config bits than NV40+ do. Also fix the DMA_IMAGE VRAM-only setting to check the right bits. Signed-off-by: Ilia Mirkin <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2013-11-08drm/nv31/mpeg: store chan singleton in engine, use it for dispatchIlia Mirkin2-15/+21
This makes nv31+ able to actually perform the nv_call, since previously the inst was not available. Signed-off-by: Ilia Mirkin <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2013-11-08drm/nv40/mpeg: use the nv31-provided classesIlia Mirkin4-75/+22
Since nv40 only covers pre-nv44 now, it can use the nv31-provided functions. Signed-off-by: Ilia Mirkin <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2013-11-08drm/nv44/mpeg: create a copy of the nv31/nv40 implsIlia Mirkin4-12/+208
The nv31/nv40 impls are actually fairly nv44-specific, since they assume the presence of the instance register/context switching. Create a copy before nv31/nv40 get fixed. Signed-off-by: Ilia Mirkin <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2013-11-08drm/nv31/mpeg: no need to set compat mode differently for nv44 grIlia Mirkin1-5/+1
Signed-off-by: Ilia Mirkin <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2013-11-08drm/nv10/kms: add plane support for nv10-nv40Ilia Mirkin7-4/+342
Signed-off-by: Ilia Mirkin <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2013-11-08drm/nv10: fix chipset checks, mostly for the benefit of nv1aIlia Mirkin5-10/+22
NV1A is numerically higher than NV17 but generationally lower. Use the new card type to help disambiguate. Signed-off-by: Ilia Mirkin <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2013-11-08drm/nv10: introduce a new NV_11 card typeIlia Mirkin7-7/+19
NV11/17/1F/18 come after NV10/15/16/1A. In order to facilitate using numerical comparisons, split up the two sets into different card types. This change should be a no-op except that the relevant cards will see NV11 printed instead of NV10 for the family. Signed-off-by: Ilia Mirkin <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2013-11-08drm/nouveau: fix backlight mask on ppc powerbookIlia Mirkin1-1/+1
This code was originally moved to using nv_mask by d31e078d84. This should not have any actual effect since the mask isn't applied to the value. Signed-off-by: Ilia Mirkin <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2013-11-08drm/nouveau: remove prototype for non-existent nouveau_connector_bppIlia Mirkin1-3/+0
Signed-off-by: Ilia Mirkin <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2013-11-08drm/nouveau/vic: rename PUNK1C1 to PVICBen Skeggs4-6/+6
NVIDIA's name for what rnndb calls PVCOMP. Signed-off-by: Ben Skeggs <[email protected]>
2013-11-08drm/nouveau/therm: kill some over-zealous debuggingBen Skeggs3-14/+1
Signed-off-by: Ben Skeggs <[email protected]>
2013-11-08drm/nouveau/core: split lock into list+exec and enable refcount locksBen Skeggs2-30/+34
This fixes a reported locking inversion when interacting with the DRM core's vblank routines. Reviewed-by: Maarten Lankhorst <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2013-11-08drm/nouveau/core: convert event handler apis to split create/enable semanticsBen Skeggs12-138/+226
This is a necessary step towards being able to work with the insane locking requirements of the DRM core's vblank routines, and a nice cleanup as a side-effect. This is similar in spirit to the interfaces that Peter Hurley arrived at with his nouveau_event rcu conversion series. Signed-off-by: Ben Skeggs <[email protected]>
2013-11-08drm/nv50-/sw: share engine/channel constructor between implementationsBen Skeggs3-51/+37
Signed-off-by: Ben Skeggs <[email protected]>
2013-11-08drm/nouveau/sw: prepare for the sharing of constructors between implementationsBen Skeggs14-79/+83
Signed-off-by: Ben Skeggs <[email protected]>
2013-11-08drm/nv50-/sw: make vblank tracking data private to the implementationsBen Skeggs4-27/+25
Signed-off-by: Ben Skeggs <[email protected]>
2013-11-08drm/nv50-/sw: share engine/channel struct definitions between implementationsBen Skeggs3-24/+25
Signed-off-by: Ben Skeggs <[email protected]>
2013-11-08drm/nouveau/core: Allow asymmetric nouveau_event_get/_putPeter Hurley3-14/+18
Most nouveau event handlers have storage in 'static' containers (structures with lifetimes nearly equivalent to the drm_device), but are dangerously reused via nouveau_event_get/_put. For example, if nouveau_event_get is called more than once for a given handler, the event handler list will be corrupted. Signed-off-by: Peter Hurley <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2013-11-08drm/nouveau/core: Move event index check from critical sectionPeter Hurley1-8/+11
The index_nr field is constant for the lifetime of the event, so serialized access is unnecessary. Signed-off-by: Peter Hurley <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2013-11-08drm/nouveau/core: Add priv field for event handlersPeter Hurley2-13/+8
Provide private field for event handlers exclusive use. Convert nouveau_fence_wait_uevent() and nouveau_fence_wait_uevent_handler(); drop struct nouveau_fence_uevent. Signed-off-by: Peter Hurley <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2013-11-08drm/nouveau: off by one in nouveau_drm_vblank_enable()Dan Carpenter1-1/+1
The test here should be ">= ARRAY_SIZE()" instead of "> ARRAY_SIZE()". Signed-off-by: Dan Carpenter <[email protected]> Acked-by: Maarten Lankhorst <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2013-11-08drm/nouveau: remove pointless assignmentDave Jones1-1/+1
self-assignment of a variable doesn't make a lot of sense. Signed-off-by: Dave Jones <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2013-11-07Merge branch 'ttm-next-3.13' of git://people.freedesktop.org/~thomash/linux ↵Dave Airlie3-36/+102
into drm-next - A couple of fixes that never made it into fixes-3.12 - Make NO_EVICT bo's available for shrinkers when on delayed-delete list - Allow retrying page-faults that need to wait for GPU. * 'ttm-next-3.13' of git://people.freedesktop.org/~thomash/linux: drm/ttm: Fix memory type compatibility check drm/ttm: Fix ttm_bo_move_memcpy drm/ttm: Handle in-memory region copies drm/ttm: Make NO_EVICT bos available to shrinkers pending destruction drm/ttm: Allow vm fault retries
2013-11-07Merge branch 'vmwgfx-next-3.13' of ↵Dave Airlie7-100/+634
git://people.freedesktop.org/~thomash/linux into drm-next Pull request for vmwgfx. Currently just the DMA address stuff. * 'vmwgfx-next-3.13' of git://people.freedesktop.org/~thomash/linux: drm/vmwgfx: Use the linux DMA api to get valid device addresses of pages drm/ttm: Enable the dma page pool also for intel IOMMUs
2013-11-06drm/i915/vlv: use per-pipe backlight controls v2Jesse Barnes4-12/+102
With the connector and pipe passed around, we can now set the backlight on the right pipe on VLV/BYT. v2: drop combination mode check for VLV (Jani) add save/restore code for VLV backlight regs (Jani) check for existing modulation freq when initializing backlight regs (Jani) Signed-off-by: Jesse Barnes <[email protected]> Signed-off-by: Jani Nikula <[email protected]> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=67245 Tested-by: Joe Konno <[email protected]> Signed-off-by: Daniel Vetter <[email protected]>
2013-11-06drm/i915: make backlight functions take a connectorJesse Barnes7-37/+122
On VLV/BYT, backlight controls a per-pipe, so when adjusting the backlight we need to pass the correct info. So make the externally visible backlight functions take a connector argument, which can be used internally to figure out the pipe backlight to adjust. v2: make connector pipe lookup check for NULL crtc (Jani) fixup connector check in ASLE code (Jani) v3: make sure we take the mode config lock around lookups (Daniel) v4: fix double unlock in panel_get_brightness (Daniel) v5: push ASLE work into a work queue (Daniel) v6: separate ASLE work to a prep patch, rebase (Jani) Signed-off-by: Jesse Barnes <[email protected]> Signed-off-by: Jani Nikula <[email protected]> Signed-off-by: Daniel Vetter <[email protected]>
2013-11-06drm/i915: move opregion asle request handling to a work queueJani Nikula2-2/+19
Doing this has been long overdue anyway, but now we really need it in preparation for per connector backlight handling. Signed-off-by: Jani Nikula <[email protected]> Reviewed-by: Jesse Barnes <[email protected]> Signed-off-by: Daniel Vetter <[email protected]>
2013-11-06drm/ttm: Fix memory type compatibility checkThomas Hellstrom1-12/+20
Also check the busy placements before deciding to move a buffer object. Failing to do this may result in a completely unneccessary move within a single memory type. Signed-off-by: Thomas Hellstrom <[email protected]> Reviewed-by: Jakob Bornecrantz <[email protected]> Cc: [email protected]
2013-11-06drm/ttm: Fix ttm_bo_move_memcpyThomas Hellstrom1-11/+17
All error paths will want to keep the mm node, so handle this at the function exit. This fixes an ioremap failure error path. Also add some comments to make the function a bit easier to understand. Signed-off-by: Thomas Hellstrom <[email protected]> Reviewed-by: Jakob Bornecrantz <[email protected]> Cc: [email protected]