leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
07b6835f2c
linux/drivers/gpu/drm/nouveau
History
Linus Torvalds f2fde3a65e Merge branch 'drm-core-next' of git://people.freedesktop.org/~airlied/linux 
Pull main drm updates from Dave Airlie:
 "This is the main merge window request for the drm.

  It's big, but jam packed will lots of features and of course 0
  regressions.  (okay maybe there'll be one).

  Highlights:

   - new KMS drivers for server GPU chipsets: ast, mgag200 and cirrus
     (qemu only).  These drivers use the generic modesetting drivers.

   - initial prime/dma-buf support for i915, nouveau, radeon, udl and
     exynos

   - switcheroo audio support: so GPUs with HDMI can turn off the sound
     driver without crashing stuff.

   - There are some patches drifting outside drivers/gpu into x86 and
     EFI for better handling of multiple video adapters in Apple Macs,
     they've got correct acks except one trivial fixup.

   - Core:
	edid parser has better DMT and reduced blanking support,
	crtc properties,
	plane properties,

   - Drivers:
	exynos: add 2D core accel support, prime support, hdmi features
	intel: more Haswell support, initial Valleyview support, more
	    hdmi infoframe fixes, update MAINTAINERS for Daniel, lots of
	    cleanups and fixes
	radeon: more HDMI audio support, improved GPU lockup recovery
	    support, remove nested mutexes, less memory copying on PCIE, fix
	    bus master enable race (kexec), improved fence handling
	gma500: cleanups, 1080p support, acpi fixes
	nouveau: better nva3 memory reclocking, kepler accel (needs
	    external firmware rip), async buffer moves on nv84+ hw.

  I've some more dma-buf patches that rely on the dma-buf merge for vmap
  stuff, and I've a few fixes building up, but I'd decided I'd better
  get rid of the main pull sooner rather than later, so the audio guys
  are also unblocked."

Fix up trivial conflict due to some duplicated changes in
drivers/gpu/drm/i915/intel_ringbuffer.c

* 'drm-core-next' of git://people.freedesktop.org/~airlied/linux: (605 commits)
  drm/nouveau/nvd9: Fix GPIO initialisation sequence.
  drm/nouveau: Unregister switcheroo client on exit
  drm/nouveau: Check dsm on switcheroo unregister
  drm/nouveau: fix a minor annoyance in an output string
  drm/nouveau: turn a BUG into a WARN
  drm/nv50: decode PGRAPH DATA_ERROR = 0x24
  drm/nouveau/disp: fix dithering not being enabled on some eDP macbooks
  drm/nvd9/copy: initialise copy engine, seems to work like nvc0
  drm/nvc0/ttm: use copy engines for async buffer moves
  drm/nva3/ttm: use copy engine for async buffer moves
  drm/nv98/ttm: add in a (disabled) crypto engine buffer copy method
  drm/nv84/ttm: use crypto engine for async buffer copies
  drm/nouveau/ttm: untangle code to support accelerated buffer moves
  drm/nouveau/fbcon: use fence for sync, rather than notifier
  drm/nv98/crypt: non-stub implementation of the engine hooks
  drm/nouveau/fifo: turn all fifo modules into engine modules
  drm/nv50/graph: remove ability to do interrupt-driven context switching
  drm/nv50: remove manual context unload on context destruction
  drm/nv50: remove execution engine context saves on suspend
  drm/nv50/fifo: use hardware channel kickoff functionality
  ...
2012-05-24 12:42:54 -07:00
..
Kconfig drm/nouveau: select POWER_SUPPLY 2012-04-02 10:45:49 +01:00
Makefile drm/nouveau/fifo: turn all fifo modules into engine modules 2012-05-24 16:56:11 +10:00
nouveau_acpi.c drm/nouveau: Check dsm on switcheroo unregister 2012-05-24 16:56:34 +10:00
nouveau_backlight.c drm/nva3/backlight: add suppport for newer style backlight regs 2011-09-20 16:10:06 +10:00
nouveau_bios.c drm/nouveau/bios: fix some shadowing issues, particularly acpi 2012-05-24 16:55:56 +10:00
nouveau_bios.h drm/nouveau: add bios connector type for dms59 2012-03-22 17:18:16 +10:00
nouveau_bo.c drm/nvc0/ttm: use copy engines for async buffer moves 2012-05-24 16:56:23 +10:00
nouveau_calc.c
nouveau_channel.c drm/nouveau/ttm: untangle code to support accelerated buffer moves 2012-05-24 16:56:16 +10:00
nouveau_connector.c drm/nouveau/disp: fix dithering not being enabled on some eDP macbooks 2012-05-24 16:56:26 +10:00
nouveau_connector.h drm/nouveau/disp: parse connector info directly in nouveau_connector.c 2011-12-21 19:01:41 +10:00
nouveau_crtc.h drm/nv50/display: expose color vibrance control 2012-03-13 17:14:56 +10:00
nouveau_debugfs.c drm/nouveau/fence: convert to exec engine, and improve channel sync 2012-05-24 16:55:53 +10:00
nouveau_display.c drm/nouveau/fence: convert to exec engine, and improve channel sync 2012-05-24 16:55:53 +10:00
nouveau_dma.c drm/nouveau: remove m2mf creation on userspace channels 2012-03-22 17:17:46 +10:00
nouveau_dma.h drm/nouveau/ttm: untangle code to support accelerated buffer moves 2012-05-24 16:56:16 +10:00
nouveau_dp.c drm/nouveau/dp: Probe branch/sink OUIs (v2) 2012-05-22 10:29:02 +01:00
nouveau_drv.c drm/nouveau/fifo: turn all fifo modules into engine modules 2012-05-24 16:56:11 +10:00
nouveau_drv.h drm/nouveau/ttm: untangle code to support accelerated buffer moves 2012-05-24 16:56:16 +10:00
nouveau_encoder.h drm/nouveau/dp: make dp dpms function common, call from sor code instead 2012-03-13 17:15:04 +10:00
nouveau_fb.h drm/nouveau: move master modesetting init to nouveau_display 2011-12-21 19:01:16 +10:00
nouveau_fbcon.c drm/nouveau/fbcon: use fence for sync, rather than notifier 2012-05-24 16:56:15 +10:00
nouveau_fbcon.h
nouveau_fence.c drm/nouveau/fence: fix a race where fence->channel can disappear 2012-05-24 16:55:58 +10:00
nouveau_fence.h drm/nouveau/fence: fix a race where fence->channel can disappear 2012-05-24 16:55:58 +10:00
nouveau_fifo.h drm/nouveau/fifo: turn all fifo modules into engine modules 2012-05-24 16:56:11 +10:00
nouveau_gem.c drm/nouveau/fence: convert to exec engine, and improve channel sync 2012-05-24 16:55:53 +10:00
nouveau_gpio.c drm/nouveau/nvd9: Fix GPIO initialisation sequence. 2012-05-24 16:56:37 +10:00
nouveau_gpio.h drm/nouveau/gpio: reimplement as nouveau_gpio.c, fixing a number of issues 2011-12-21 19:01:45 +10:00
nouveau_grctx.h drm/nv40-50/gr: restructure grctx/prog generation 2012-05-24 16:31:58 +10:00
nouveau_hdmi.c drm/nouveau/hdmi: use correct hdmi regs for nvaa/nvac 2012-04-30 15:55:39 +10:00
nouveau_hw.c drm/nv04/disp: disable vblank interrupts when disabling display 2012-05-24 16:32:01 +10:00
nouveau_hw.h
nouveau_hwsq.h drm/nouveau/hwsq: remove some magic, give proper opcode names 2011-12-21 19:01:44 +10:00
nouveau_i2c.c drm/nouveau/i2c: resume use of i2c-algo-bit, rather than custom stack 2012-05-07 11:02:38 +01:00
nouveau_i2c.h drm/nouveau/i2c: resume use of i2c-algo-bit, rather than custom stack 2012-05-07 11:02:38 +01:00
nouveau_ioc32.c
nouveau_irq.c drm/nouveau: detect disabled device in irq handler and return IRQ_NONE 2011-07-25 09:42:09 +10:00
nouveau_mem.c drm/nouveau/fifo: turn all fifo modules into engine modules 2012-05-24 16:56:11 +10:00
nouveau_mm.c drm/nouveau: allow a nouveau_mm to be created with holes 2011-09-20 16:04:00 +10:00
nouveau_mm.h drm/nouveau: allow a nouveau_mm to be created with holes 2011-09-20 16:04:00 +10:00
nouveau_mxm.c drm/nouveau/mxm: call mxmi to determine revision before calling mxms 2012-03-13 17:14:57 +10:00
nouveau_notifier.c drm/nouveau: Fix notifier blocks over the 4GB mark. 2011-12-21 19:01:47 +10:00
nouveau_object.c drm/nouveau: turn a BUG into a WARN 2012-05-24 16:56:29 +10:00
nouveau_perf.c drm/nva3/pm: initial attempt at more magic PFB regs 2012-05-24 16:31:16 +10:00
nouveau_pm.c drm/nouveau/pm: don't read/write beyond end of stack buffer 2012-04-19 14:38:54 +01:00
nouveau_pm.h drm/nva3/pm: initial attempt at more magic PFB regs 2012-05-24 16:31:16 +10:00
nouveau_prime.c drm/nouveau/radeon: add static const to the dma-buf ops. 2012-05-23 14:10:27 +01:00
nouveau_ramht.c
nouveau_ramht.h
nouveau_reg.h drm/nva3/backlight: add suppport for newer style backlight regs 2011-09-20 16:10:06 +10:00
nouveau_sgdma.c drm/nouveau: give a slightly larger pci(e)gart aperture on all chipsets 2012-05-24 16:31:38 +10:00
nouveau_software.h drm/nouveau: move flip-related channel setup to software engine 2012-05-24 16:55:43 +10:00
nouveau_state.c drm/nouveau: Unregister switcheroo client on exit 2012-05-24 16:56:36 +10:00
nouveau_temp.c drm/nouveau/i2c: do parsing of i2c-related vbios info in nouveau_i2c.c 2011-12-21 19:01:40 +10:00
nouveau_ttm.c
nouveau_util.c
nouveau_util.h
nouveau_vm.c nouveau: add PRIME support 2012-05-23 10:46:55 +01:00
nouveau_vm.h nouveau: add PRIME support 2012-05-23 10:46:55 +01:00
nouveau_volt.c drm/nouveau/gpio: reimplement as nouveau_gpio.c, fixing a number of issues 2011-12-21 19:01:45 +10:00
nv04_crtc.c nouveau: add PRIME support 2012-05-23 10:46:55 +01:00
nv04_cursor.c
nv04_dac.c drm/nouveau/gpio: reimplement as nouveau_gpio.c, fixing a number of issues 2011-12-21 19:01:45 +10:00
nv04_dfp.c drm/nv04/disp: handle dual-link spwg panels without needing quirks 2011-12-21 19:01:43 +10:00
nv04_display.c drm/nv04/disp: disable vblank interrupts when disabling display 2012-05-24 16:32:01 +10:00
nv04_fb.c drm/nouveau: memory type detection for the really old chipsets 2012-03-13 17:05:23 +10:00
nv04_fbcon.c drm/nouveau: use the same packet header macros as userspace 2012-05-24 16:31:49 +10:00
nv04_fence.c drm/nouveau/fence: fix a race where fence->channel can disappear 2012-05-24 16:55:58 +10:00
nv04_fifo.c drm/nouveau/fifo: turn all fifo modules into engine modules 2012-05-24 16:56:11 +10:00
nv04_graph.c drm/nouveau/fifo: turn all fifo modules into engine modules 2012-05-24 16:56:11 +10:00
nv04_instmem.c drm/nouveau/fifo: turn all fifo modules into engine modules 2012-05-24 16:56:11 +10:00
nv04_mc.c
nv04_pm.c drm/nv04-nv30/pm: port to newer interfaces 2011-12-21 19:01:24 +10:00
nv04_software.c drm/nouveau/fence: convert to exec engine, and improve channel sync 2012-05-24 16:55:53 +10:00
nv04_timer.c drm/nouveau/pm: remove the older interfaces completely 2011-12-21 19:01:25 +10:00
nv04_tv.c
nv10_fb.c drm/nv20: split PFB code out of nv10_fb.c 2012-03-13 17:05:29 +10:00
nv10_fence.c drm/nouveau/fence: fix a race where fence->channel can disappear 2012-05-24 16:55:58 +10:00
nv10_fifo.c drm/nouveau/fifo: turn all fifo modules into engine modules 2012-05-24 16:56:11 +10:00
nv10_gpio.c drm/nv10/gpio: fix thinko in mask for gpio lines 2-9 2012-04-30 15:55:54 +10:00
nv10_graph.c drm/nouveau/fifo: turn all fifo modules into engine modules 2012-05-24 16:56:11 +10:00
nv17_fifo.c drm/nouveau/fifo: turn all fifo modules into engine modules 2012-05-24 16:56:11 +10:00
nv17_tv_modes.c
nv17_tv.c drm/nouveau/gpio: reimplement as nouveau_gpio.c, fixing a number of issues 2011-12-21 19:01:45 +10:00
nv17_tv.h
nv20_fb.c drm/nv20-nv40: add memory type detection 2012-03-13 17:05:35 +10:00
nv20_graph.c drm/nouveau/fifo: turn all fifo modules into engine modules 2012-05-24 16:56:11 +10:00
nv30_fb.c
nv31_mpeg.c drm/nouveau/fifo: turn all fifo modules into engine modules 2012-05-24 16:56:11 +10:00
nv40_fb.c drm/nv20-nv40: add memory type detection 2012-03-13 17:05:35 +10:00
nv40_fifo.c drm/nouveau/fifo: turn all fifo modules into engine modules 2012-05-24 16:56:11 +10:00
nv40_graph.c drm/nouveau/fifo: turn all fifo modules into engine modules 2012-05-24 16:56:11 +10:00
nv40_grctx.c drm/nv40-50/gr: restructure grctx/prog generation 2012-05-24 16:31:58 +10:00
nv40_mc.c
nv40_pm.c drm/nouveau/fifo: turn all fifo modules into engine modules 2012-05-24 16:56:11 +10:00
nv50_calc.c drm/nva3/clk: better pll calculation when no fractional fb div available 2011-05-16 10:50:59 +10:00
nv50_crtc.c drm/nv50/disp: fixup error paths in crtc object creation 2012-05-24 16:31:56 +10:00
nv50_cursor.c drm/nouveau: use the same packet header macros as userspace 2012-05-24 16:31:49 +10:00
nv50_dac.c drm/nouveau: use the same packet header macros as userspace 2012-05-24 16:31:49 +10:00
nv50_display.c drm/nouveau: move flip-related channel setup to software engine 2012-05-24 16:55:43 +10:00
nv50_display.h drm/nouveau: create real execution engine for software object class 2012-05-24 16:55:41 +10:00
nv50_evo.c nouveau: add PRIME support 2012-05-23 10:46:55 +01:00
nv50_evo.h drm/nv50/display: expose color vibrance control 2012-03-13 17:14:56 +10:00
nv50_fb.c drm/nouveau/fifo: turn all fifo modules into engine modules 2012-05-24 16:56:11 +10:00
nv50_fbcon.c drm/nouveau/ttm: untangle code to support accelerated buffer moves 2012-05-24 16:56:16 +10:00
nv50_fifo.c drm/nouveau/fifo: turn all fifo modules into engine modules 2012-05-24 16:56:11 +10:00
nv50_gpio.c drm/nouveau/gpio: reimplement as nouveau_gpio.c, fixing a number of issues 2011-12-21 19:01:45 +10:00
nv50_graph.c drm/nv50: decode PGRAPH DATA_ERROR = 0x24 2012-05-24 16:56:27 +10:00
nv50_grctx.c drm/nv50/gr: make sure NEXT_TO_CURRENT is executed even if nothing done 2012-05-24 16:56:03 +10:00
nv50_instmem.c drm/nv50: fix ramin heap size for kernel channel too 2012-05-24 16:31:52 +10:00
nv50_mc.c
nv50_mpeg.c drm/nv50: remove manual context unload on context destruction 2012-05-24 16:56:08 +10:00
nv50_pm.c drm/nv50/hwsq: some nv92 fixes 2012-03-13 17:15:03 +10:00
nv50_software.c drm/nouveau: move flip-related channel setup to software engine 2012-05-24 16:55:43 +10:00
nv50_sor.c drm/nouveau: use the same packet header macros as userspace 2012-05-24 16:31:49 +10:00
nv50_vm.c drm/nouveau/fifo: turn all fifo modules into engine modules 2012-05-24 16:56:11 +10:00
nv50_vram.c drm/nv50: fix detection of second vram rank 2012-03-13 17:08:51 +10:00
nv84_bsp.c drm/nouveau/vdec: implement stub modules for the known engines 2011-12-21 19:01:10 +10:00
nv84_crypt.c drm/nouveau: pass flag to engine fini() method on suspend 2011-07-25 09:43:22 +10:00
nv84_fence.c drm/nouveau/fifo: turn all fifo modules into engine modules 2012-05-24 16:56:11 +10:00
nv84_fifo.c drm/nouveau/fifo: turn all fifo modules into engine modules 2012-05-24 16:56:11 +10:00
nv84_vp.c drm/nouveau/vdec: implement stub modules for the known engines 2011-12-21 19:01:10 +10:00
nv98_crypt.c drm/nv98/crypt: non-stub implementation of the engine hooks 2012-05-24 16:56:13 +10:00
nv98_crypt.fuc drm/nv98/crypt: non-stub implementation of the engine hooks 2012-05-24 16:56:13 +10:00
nv98_crypt.fuc.h drm/nv98/crypt: non-stub implementation of the engine hooks 2012-05-24 16:56:13 +10:00
nv98_ppp.c drm/nouveau/vdec: implement stub modules for the known engines 2011-12-21 19:01:10 +10:00
nva3_copy.c drm/nv50: remove manual context unload on context destruction 2012-05-24 16:56:08 +10:00
nva3_copy.fuc drm/nva3/copy: fix typo in fuc which caused host to not recieve exceptions 2011-12-21 19:01:30 +10:00
nva3_copy.fuc.h drm/nva3/copy: fix typo in fuc which caused host to not recieve exceptions 2011-12-21 19:01:30 +10:00
nva3_pm.c drm/nouveau/pm: some more delays for ddr3 reclocking 2012-05-24 16:31:36 +10:00
nvc0_copy.c drm/nouveau: pass flag to engine fini() method on suspend 2011-07-25 09:43:22 +10:00
nvc0_copy.fuc.h drm/nva3/copy: fix typo in fuc which caused host to not recieve exceptions 2011-12-21 19:01:30 +10:00
nvc0_fb.c nvc0/fb: shut up PMFB interrupt after the first occurrence 2012-04-30 15:55:46 +10:00
nvc0_fbcon.c drm/nouveau: use the same packet header macros as userspace 2012-05-24 16:31:49 +10:00
nvc0_fence.c drm/nouveau/fifo: turn all fifo modules into engine modules 2012-05-24 16:56:11 +10:00
nvc0_fifo.c drm/nouveau/fifo: turn all fifo modules into engine modules 2012-05-24 16:56:11 +10:00
nvc0_graph.c drm/nouveau/fifo: turn all fifo modules into engine modules 2012-05-24 16:56:11 +10:00
nvc0_graph.fuc drm/nvc0/gr: update fuc source to assemble with latest envyas 2011-12-21 19:01:26 +10:00
nvc0_graph.h drm/nvc0/gr: add initial support for nvd9, not quite there yet.. 2011-12-21 19:01:27 +10:00
nvc0_grctx.c drm/nvc0/gr: add initial support for nvd9, not quite there yet.. 2011-12-21 19:01:27 +10:00
nvc0_grgpc.fuc drm/nvc0/gr: add initial support for nvd9, not quite there yet.. 2011-12-21 19:01:27 +10:00
nvc0_grgpc.fuc.h drm/nvc0/gr: add initial support for nvd9, not quite there yet.. 2011-12-21 19:01:27 +10:00
nvc0_grhub.fuc drm/nvc0/gr: add initial support for nvd9, not quite there yet.. 2011-12-21 19:01:27 +10:00
nvc0_grhub.fuc.h drm/nvc0/gr: add initial support for nvd9, not quite there yet.. 2011-12-21 19:01:27 +10:00
nvc0_instmem.c drm/nvc0: enable per-client address spaces 2011-06-23 16:01:41 +10:00
nvc0_pm.c drm/nvc0/pm: very initial mclk freq change 2012-05-24 16:31:34 +10:00
nvc0_software.c drm/nouveau: move flip-related channel setup to software engine 2012-05-24 16:55:43 +10:00
nvc0_vm.c drm/nv50-nvc0/vm: support unsnooped system memory 2012-03-13 17:14:06 +10:00
nvc0_vram.c drm/nvc0/vram: get part count from PUNITS 2012-03-13 17:15:00 +10:00
nvd0_display.c drm/nouveau: move flip-related channel setup to software engine 2012-05-24 16:55:43 +10:00
nve0_fifo.c drm/nouveau/fifo: turn all fifo modules into engine modules 2012-05-24 16:56:11 +10:00
nve0_graph.c drm/nouveau/ttm: untangle code to support accelerated buffer moves 2012-05-24 16:56:16 +10:00
nve0_graph.h drm/nve0/gr: initial implementation 2012-05-24 16:31:41 +10:00
nve0_grctx.c drm/nve0/gr: initial implementation 2012-05-24 16:31:41 +10:00
nvreg.h drm/nv17-nv40: Fix modesetting failure when pitch == 4096px (fdo bug 35901). 2011-06-07 09:22:29 +10:00