Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/xe/xe_ggtt.c
between commit:
af2b588abe00 ("drm/xe: Process deferred GGTT node removals on device unwind")
from the drm-fixes tree and commit:
b2d6fd7ac598 ("drm/xe: Do not rely on GGTT internals in xe_g
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/display/intel_dp_mst.c
between commit:
69b3d8721267 ("drm/i915/dp_mst: Handle error during DSC BW overhead/slice
calculation")
from the drm-fixes tree and commit:
f2e2092a979c ("drm/i915/display: U
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h
between commit:
c223376b3019a ("drm/amd/swsmu: add MALL init support workaround for
smu_v14_0_1")
from the drm-fixes tree and commit:
ec41bdd82e9b0 ("drm/amd/pm: Update PMFW
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c
between commit:
f6f49dda49db7 ("drm/amdgpu/atomfirmware: fix parsing of vram_info")
from the drm-fixes tree and commit:
9a55c77978308 ("drm/amdgpu: fix getting vram info
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c
between commit:
c03d770c0b014 ("drm/amd/display: Attempt to avoid empty TUs when endpoint is
DPIA")
from the drm-fixes tree and commits:
47745acc5e8dd ("drm/amd/di
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
between commits:
61319b8e3b58 ("drm/amd/pm: disable the SMU13 OD feature support temporarily")
b6360a5ec31d ("drm/amd/pm: disallow the fan setting if there is no fan on
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
between commits:
877f26bf3ca6 ("drm/amd/display: disable S/G display on DCN 2.1.0")
077e9659581a ("drm/amd/display: disable S/G display on DCN 3.1.2/3")
7ece674cd946 ("R
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource_helpers.c
between commit:
58d97c99c99f4 ("drm/amd/display: Update MBLK calculation for SubVP")
from the drm-fixes tree and commits:
41c81dcf59991 ("drm/amd/display: Up
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
between commit:
e2b993302f40c ("drm/amdgpu: bypass tiling flag check in virtual display case
(v2)")
from the drm-fixes tree and commit:
2af104290da5e ("drm: introduce fb_modi
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/display/dc/core/dc_resource.c
between commit:
3743e7f6fcb93 ("drm/amd/display: Fix stream->link_enc unassigned during
stream removal")
from the drm-fixes tree and commits:
6d33f0e820bfb ("drm/amd/di
Hi Geert,
On Tue, 10 Aug 2021 13:56:12 +0200 Geert Uytterhoeven
wrote:
>
> On Fri, Aug 6, 2021 at 6:11 PM Mark Brown wrote:
> > Today's linux-next merge of the drm tree got a conflict in:
> >
> > drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> >
> > between commit:
> >
> > e00f543d3596 ("drm/amdg
Hi Mark, Stephen,
On Fri, Aug 6, 2021 at 6:11 PM Mark Brown wrote:
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
>
> between commit:
>
> e00f543d3596 ("drm/amdgpu: add DID for beige goby")
>
> from the drm-fixes tree and commit:
>
>
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
between commit:
e00f543d3596 ("drm/amdgpu: add DID for beige goby")
from the drm-fixes tree and commit:
a8f706966b92 ("drm/amdgpu: add pci device id for cyan_skillfish")
from the
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
between commit:
c564b8601ae9 ("drm/amdgpu: add TMR destory function for psp")
from the drm-fixes tree and commit:
3bda8acd974e ("drm/amdgpu/sriov: Add clear vf fw support")
from
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/mediatek/mtk_drm_drv.c
between commit:
4c6f3196e6ea ("drm/mediatek: use correct device to import PRIME buffers")
from the drm-fixes tree and commit:
3baeeb21983a ("drm/mtk: Drop drm_gem_prime_export/impo
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
between commit:
25f09f858835 ("drm/amdgpu/gfx9: use reset default for PA_SC_FIFO_SIZE")
from the drm-fixes tree and commit:
1bff7f6c679f ("drm/amdgpu: RLC to program regs for Vega10
On Mon, Mar 04, 2019 at 11:54:02AM +1100, Stephen Rothwell wrote:
> Hi Dave,
>
> On Fri, 1 Mar 2019 18:29:58 -0500 Alex Deucher wrote:
> >
> > On Thu, Feb 28, 2019 at 9:24 PM Stephen Rothwell
> > wrote:
> > >
> > > Today's linux-next merge of the drm tree got a conflict in:
> > >
> > > driver
Hi Dave,
On Fri, 1 Mar 2019 18:29:58 -0500 Alex Deucher wrote:
>
> On Thu, Feb 28, 2019 at 9:24 PM Stephen Rothwell
> wrote:
> >
> > Today's linux-next merge of the drm tree got a conflict in:
> >
> > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> >
> > between commit:
> >
> > d6371665
On Thu, Feb 28, 2019 at 9:24 PM Stephen Rothwell wrote:
>
> Hi all,
>
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>
> between commit:
>
> d63716658ac1 ("drm/amd/display: Use vrr friendly pageflip throttling in
> DC.")
>
>
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
between commit:
d63716658ac1 ("drm/amd/display: Use vrr friendly pageflip throttling in DC.")
from the drm-fixes tree and commits:
8a48b44cd00f ("drm/amd/display: Call i
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c
between commit:
fd567467753f ("drm/vmwgfx: Protect from excessive execbuf kernel memory
allocations v3")
from the drm-fixes tree and commit:
a64f784bb14a ("drm/ttm: initialize g
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
between commit:
c679fd55 ("drm/amd/display: Fix 6x4K displays light-up on Vega20 (v2)")
from the drm-fixes tree and commit:
24f7dd7ea98d ("drm/amd/display:
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
between commit:
49f1c44b581b ("rm/amd/display: Fix unintialized max_bpc state values")
from the drm-fixes tree and commits:
c1ee92f94ce3 ("drm/amd: Add abm level drm pro
23 matches
Mail list logo
