]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 073fbfd f8a168f)
Merge branch 'drm-next' into drm-next-5.3
authorAlex Deucher <alexander.deucher@amd.com>
Tue, 25 Jun 2019 13:42:25 +0000 (08:42 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 25 Jun 2019 13:42:25 +0000 (08:42 -0500)
commit9459785abb88b7029a40c815de6877b0b02dbf9d
treecf513071edfc4499b4e025e4846244c9d0e4c6bdtree | snapshot
parent073fbfd68fd4a6056d55a43f93e3f627dd7de2e4commit | diff
parentf8a168f8c05430168c59ea9952a040db1c71d277commit | diff
Merge branch 'drm-next' into drm-next-5.3

Backmerge drm-next and fix up conflicts due to drmP.h removal.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
84 files changed:
drivers/gpu/drm/amd/amdgpu/amdgpu.h diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/dce_virtual.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c diff1 | | blob | history
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/mes_v10_1.c diff1 | | blob | history
drivers/gpu/drm/amd/amdgpu/psp_v11_0.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/soc15.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h diff1 | diff2 | blob | history
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/display/dc/core/dc.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/display/dc/core/dc_link.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/display/dc/core/dc_resource.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/display/dc/core/dc_stream.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/display/dc/core/dc_surface.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/display/dc/dce/dce_audio.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_ipp.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_link_encoder.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.c diff1 | | blob | history
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c diff1 | | blob | history
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_stream_encoder.c diff1 | | blob | history
drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/display/dc/irq/dcn10/irq_service_dcn10.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/display/dc/irq/dcn20/irq_service_dcn20.c diff1 | | blob | history
drivers/gpu/drm/amd/display/dc/virtual/virtual_stream_encoder.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/display/modules/color/color_gamma.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/powerplay/smu_v11_0.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c diff1 | diff2 | blob | history
drivers/gpu/drm/radeon/radeon_ttm.c diff1 | diff2 | blob | history
include/drm/drm_dp_helper.h diff1 | diff2 | blob | history
Linux Kernel Source Tree.