Hi all,
Today's linux-next merge of the amdgpu tree got a conflict in:
include/drm/display/drm_dp.h
between commit:
55b24786b748 ("drm/display: Add missing OLED Vesa brightnesses definitions")
from the drm-misc tree and commit:
4d5f872dbc75 ("drm/amd/display: Adding support for VESA
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:
a6276e92a037 ("drm: Include where needed")
from the drm-misc tree and commit:
a98cdd8c4856 ("drm/amd/display: refactor ddc logic from dc_link_ddc to
Hi all,
Today's linux-next merge of the amdgpu tree got a conflict in:
include/drm/gpu_scheduler.h
between commit:
2cf9886e2816 ("drm/scheduler: remove drm_sched_dependency_optimized")
from the drm-misc tree and commit:
06a2d7cc3f04 ("drm/amdgpu: revert "implement tdr advanced mode"")
Hi all,
On Wed, 13 Apr 2022 10:10:14 +1000 Stephen Rothwell
wrote:
>
> On Wed, 6 Apr 2022 10:34:05 +1000 Stephen Rothwell
> wrote:
> >
> > Today's linux-next merge of the amdgpu tree got a conflict in:
> >
> > drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> >
> > between commit:
> >
> >
Hi all,
On Wed, 6 Apr 2022 10:34:05 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the amdgpu tree got a conflict in:
>
> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>
> between commit:
>
> fee2ede15542 ("drm/ttm: rework bulk move handling v5")
>
> from the drm-misc tree and
Hi all,
Today's linux-next merge of the amdgpu tree got a conflict in:
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
between commit:
fee2ede15542 ("drm/ttm: rework bulk move handling v5")
from the drm-misc tree and commit:
184a69ca4d41 ("drm/amdgpu: separate VM PT handling into
Hi all,
On Thu, 3 Jun 2021 12:48:47 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the amdgpu tree got conflicts in:
>
> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>
> between commit:
>
> d3116756a710 ("drm/ttm: rename bo->mem and
Hi all,
On Thu, 3 Jun 2021 12:48:47 +1000 Stephen Rothwell
wrote:
>
> diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> index bcfd4a8d0288,1923f035713a..
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> @@@ -657,11 -657,10 +658,11 @@@
Hi all,
Today's linux-next merge of the amdgpu tree got conflicts in:
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
between commit:
d3116756a710 ("drm/ttm: rename bo->mem and make it a pointer")
from the drm-misc tree and commits:
b453e42a6e8b
Hi all,
Today's linux-next merge of the amdgpu tree got a conflict in:
drivers/gpu/drm/amd/amdkfd/kfd_device.c
between commit:
e9669fb78262 ("drm/amdgpu: Add early fini callback")
from the drm-misc tree and commit:
814ab9930cfd ("drm/amdkfd: register HMM device private zone")
from the
Hi all,
Today's linux-next merge of the amdgpu tree got a conflict in:
drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
between commit:
35bba8313b95 ("drm/amdgpu: Convert driver sysfs attributes to static
attributes")
from the drm-misc tree and commit:
589939d40116 ("drm/amdgpu: fix
Hi all,
Today's linux-next merge of the amdgpu tree got a conflict in:
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
between commit:
f89f8c6bafd0 ("drm/amdgpu: Guard against write accesses after device removal")
from the drm-misc tree and commit:
0ccc3ccf5b3a ("drm/amdgpu: re-apply "use the
Hi all,
Today's linux-next merge of the amdgpu tree got a conflict in:
drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
between commit:
35bba8313b95 ("drm/amdgpu: Convert driver sysfs attributes to static
attributes")
from the drm-misc tree and commit:
a614b336f1c1 ("drm/amdgpu: fix coding
Hi all,
Today's linux-next merge of the amdgpu tree got a conflict in:
drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
between commit:
c777dc9e7933 ("drm/ttm: move the page_alignment into the BO v2")
from the drm-misc tree and commit:
dd03daec0ff1 ("drm/amdgpu: restructure
14 matches
Mail list logo
