leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3e8d222f2a
linux/drivers/gpu/drm/amd/amdkfd
History
Dave Airlie bdcddf95e8 Linux 4.1-rc4 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJVWh3TAAoJEHm+PkMAQRiG/kwH/2c9irodp2+M9OUnX2bfsBb6
 LnChiDpvkF5BB8jhP6d/XmvPp4NJzAbTxByhjdfb2E2HkorCUHCOIn2tI1TE2pUs
 2qjkOVH+XCzoV0goGtQjzK1ht8f2IrtlDiEjyRekK5cJHzhggb22QPtWL4npyd0O
 reDmG2jsRaF9POr9uLSFEv4CEnkksmRLUU0vuQX0TZeCJ41O7TXrkN/wKrLZ5mj4
 IWpqXQaSlrffq/T5HnVbXBxk3/T8QmhrIoppiMpV1mUVj0uTqlFRNi5qwT2Nit1h
 FVljWI4+WgOk3bf7fUlp+ahopjkTgu+GuXkiRP/pdgWNQO0cxCWSAzSndAlIIAE=
 =uOoJ
 -----END PGP SIGNATURE-----

Backmerge v4.1-rc4 into into drm-next

We picked up a silent conflict in amdkfd with drm-fixes and drm-next,
backmerge v4.1-rc5 and fix the conflicts

Signed-off-by: Dave Airlie <airlied@redhat.com>

Conflicts:
	drivers/gpu/drm/drm_irq.c
2015-05-20 16:23:53 +10:00
..
cik_event_interrupt.c drm/amdkfd: Add bad opcode exception handling 2015-05-19 13:02:28 +03:00
cik_int.h drm/amdkfd: Add bad opcode exception handling 2015-05-19 13:02:28 +03:00
cik_regs.h drm/amdkfd: Don't include header files from radeon 2015-01-02 23:18:54 +02:00
Kconfig amdkfd: Remove DRM_AMDGPU dependency from Kconfig 2014-11-21 22:36:09 +02:00
kfd_chardev.c drm/amdkfd: Implement events IOCTLs 2015-05-19 13:02:29 +03:00
kfd_crat.h
kfd_device_queue_manager_cik.c drm/amdkfd: make the sdma vm init to be asic specific 2015-05-19 12:13:39 +03:00
kfd_device_queue_manager_vi.c drm/amdkfd: make the sdma vm init to be asic specific 2015-05-19 12:13:39 +03:00
kfd_device_queue_manager.c Linux 4.1-rc4 2015-05-20 16:23:53 +10:00
kfd_device_queue_manager.h drm/amdkfd: make the sdma vm init to be asic specific 2015-05-19 12:13:39 +03:00
kfd_device.c drm/amdkfd: Add memory exception handling 2015-05-19 13:02:27 +03:00
kfd_doorbell.c drm/amdkfd: reformat some debug prints 2015-05-19 12:13:38 +03:00
kfd_events.c drm/amdkfd: Add module parameter of send_sigterm 2015-05-19 13:02:28 +03:00
kfd_events.h drm/amdkfd: Add bad opcode exception handling 2015-05-19 13:02:28 +03:00
kfd_flat_memory.c drm/amdkfd: Process-device data creation and lookup split 2015-01-09 22:25:58 +02:00
kfd_interrupt.c drm/amdkfd: Add the events module 2015-05-19 13:02:26 +03:00
kfd_kernel_queue_cik.c drm/amdkfd: Add initial VI support for KQ 2014-12-02 16:38:57 +02:00
kfd_kernel_queue_vi.c drm/amdkfd: Add initial VI support for KQ 2014-12-02 16:38:57 +02:00
kfd_kernel_queue.c drm/amdkfd: reformat some debug prints 2015-05-19 12:13:38 +03:00
kfd_kernel_queue.h drm/amdkfd: Remove sync_with_hw() from amdkfd 2015-01-15 12:07:48 +02:00
kfd_module.c drm/amdkfd: change driver version to 0.7.2 2015-05-19 13:02:30 +03:00
kfd_mqd_manager_cik.c drm/amdkfd: Add multiple kgd support 2015-03-25 14:02:05 +02:00
kfd_mqd_manager_vi.c drm/amdkfd: Change MQD manager to be H/W specific 2015-01-04 11:24:25 +02:00
kfd_mqd_manager.c drm/amdkfd: Change MQD manager to be H/W specific 2015-01-04 11:24:25 +02:00
kfd_mqd_manager.h amdkfd: Add mqd_manager module 2014-07-17 00:36:17 +03:00
kfd_packet_manager.c drm/amdkfd: Remove sync_with_hw() from amdkfd 2015-01-15 12:07:48 +02:00
kfd_pasid.c drm/amdkfd: Allow user to limit only queues per device 2015-01-18 13:18:01 +02:00
kfd_pm4_headers.h amdkfd: Add kernel queue module 2014-07-17 00:45:35 +03:00
kfd_pm4_opcodes.h amdkfd: Add kernel queue module 2014-07-17 00:45:35 +03:00
kfd_priv.h drm/amdkfd: Add module parameter of send_sigterm 2015-05-19 13:02:28 +03:00
kfd_process_queue_manager.c Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 2015-02-16 15:48:00 -08:00
kfd_process.c drm/amdkfd: Add the events module 2015-05-19 13:02:26 +03:00
kfd_queue.c amdkfd: Add queue module 2014-07-17 00:18:51 +03:00
kfd_topology.c drm/amdkfd: Don't report local memory size 2015-05-07 17:37:52 +03:00
kfd_topology.h
Makefile drm/amdkfd: Add the events module 2015-05-19 13:02:26 +03:00