Hi all,
Today's linux-next merge of the amdgpu tree got a conflict in:
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
between commit:
b255ce4388e0 ("drm/amdgpu: don't change mode in
amdgpu_dm_connector_mode_valid()")
from the drm tree and commit:
cbf4890c6f28 ("drm/amd/display: Don'
Hi all,
Today's linux-next merge of the amdgpu tree got a conflict in:
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
between commit:
b2ef808786d9 ("drm/sched: add optional errno to drm_sched_start()")
from the drm tree and commit:
35984fd4a093 ("drm/amdgpu: add ring reset messages")
from the
Hi all,
Today's linux-next merge of the amdgpu tree got a conflict in:
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
between commit:
8a206685d36f ("drm/amdgpu: use drm_exec for GEM and CSA handling v2")
from the drm tree and commit:
30953c4d000b ("drm/amdgpu: Fix style issues in amdgpu_gem.c"
Hi all,
Today's linux-next merge of the amdgpu tree got a conflict in:
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
between commits:
1b2d5eda5ad7 ("drm/amdgpu: move explicit sync check into the CS")
1728baa7e4e6 ("drm/amdgpu: use scheduler dependencies for CS")
from the drm tree and commit:
Hi all,
Today's linux-next merge of the amdgpu tree got a conflict in:
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
between commit:
7c99616e3fe7 ("drm: Remove drm_mode_config::fb_base")
from the drm tree and commit:
887e8cec55f2 ("drm/amdgpu: set fb_modifiers_not_supported in vkms")
from t
Hi all,
Today's linux-next merge of the amdgpu tree got a conflict in:
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
between commit:
047a1b877ed4 ("dma-buf & drm/amdgpu: remove dma_resv workaround")
from the drm tree and commit:
3da2c38231a4 ("drm/amdgpu: Free user pages if amdgpu_cs_parser_bo
On Wed, Oct 27, 2021 at 11:06 PM Stephen Rothwell wrote:
>
> Hi all,
>
> Today's linux-next merge of the amdgpu tree got conflicts in:
>
> drivers/gpu/drm/amd/display/dc/core/dc_link.c
> drivers/gpu/drm/drm_dp_mst_topology.c
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>
> between com
Hi all,
Today's linux-next merge of the amdgpu tree got conflicts in:
drivers/gpu/drm/amd/display/dc/core/dc_link.c
drivers/gpu/drm/drm_dp_mst_topology.c
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
between commits:
d740e0bf8ed4 ("drm/amd/display: Add DP 2.0 MST DC Support")
4172
Hi all,
Today's linux-next merge of the amdgpu tree got a conflict in:
drivers/gpu/drm/radeon/radeon_drv.c
between commit:
384bc5e059d4 ("drm/radeon: Stop changing the drm_driver struct")
from the drm tree and commits:
4d3efadd374a ("drm/radeon/radeon: Move prototype into shared header"
Hi all,
Today's linux-next merge of the amdgpu tree got a conflict in:
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
between commit:
09b974e8983a ("drm/amd/amdgpu_dm/mst: Remove ->destroy_connector() callback")
from the drm tree and commit:
c33f212c0c92 ("drm/amdgpu/displa
Hi all,
Today's linux-next merge of the amdgpu tree got a conflict in:
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
between commits:
ea702333e567 ("drm/amdgpu: Convert to struct
drm_crtc_helper_funcs.get_scanout_position()")
e3eff4b5d91e ("drm/amdgpu: Convert to CRTC VBLANK callbacks")
from
Hi all,
Today's linux-next merge of the amdgpu tree got conflicts in:
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
between commit:
5e791166d377 ("drm/ttm: nuke invalidate_caches callback")
from the drm tree and commit:
58e6933fa53e ("drm/amdgpu/ttm: move debugfs init into core amdgpu debugfs
12 matches
Mail list logo
