Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
drivers/gpu/drm/i915/display/intel_display.c
between commit:
1b321026e213 ("drm/i915: Pass ww ctx to intel_pin_to_display_plane")
from the drm tree and commit:
61169987c4d9 ("drm/i915: Unify the FB and plane state
Hi all,
On Wed, 17 Mar 2021 14:08:24 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the drm-intel tree got a conflict in:
>
> drivers/gpu/drm/i915/display/intel_sprite.c
>
> between commit:
>
> 92f1d09ca4ed ("drm: Switch to %p4cc format modifier")
>
> from the drm tree and
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
drivers/gpu/drm/i915/display/intel_sprite.c
between commit:
92f1d09ca4ed ("drm: Switch to %p4cc format modifier")
from the drm tree and commit:
46d12f911821 ("drm/i915: migrate skl planes code new file (v5)")
fro
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
drivers/gpu/drm/i915/gem/i915_gem_object.h
between commit:
41a9c75d0acf ("drm/i915/gem: Move stolen node into GEM object union")
from the drm tree and commit:
5fbc2c2bfa5c ("drm/i915/gem: Add a helper to read data
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
drivers/gpu/drm/drm_probe_helper.c
between commit:
12c683e12cd8 ("drm: bridge: Pass drm_display_info to drm_bridge_funcs
.mode_valid()")
from the drm tree and commit:
1c26b8e09004 ("drm/probe_helper: Add
drm_con
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
drivers/gpu/drm/i915/i915_pci.c
between commit:
fcd70cd36b9b ("drm: Split out drm_probe_helper.h")
from the drm tree and commit:
5f5c139d6900 ("drm/i915: Allocate active tracking nodes from a slabcache")
from the
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
drivers/gpu/drm/i915/i915_gem.c
between commit:
dd847a706974 ("drm/i915: Compile fix for 64b dma-fence seqno")
from the drm tree and commit:
9f58892ea996 ("drm/i915: Pull all the reset functionality together into
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
drivers/gpu/drm/i915/intel_dp_mst.c
between commit:
f424f55e3177 ("drm/i915: Track MST link bandwidth")
from the drm tree and commit:
3d65a735d834 ("drm/i915/mst: use max link not sink lane count")
from the drm-i
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
include/drm/drmP.h
between commit:
c4e68a583202 ("drm: Introduce DRM_DEV_* log messages")
from the drm tree and commit:
30b0da8d556e ("drm: extra printk() wrapper macros")
from the drm-intel tree.
I fixed it up
On Wed, Jul 23, 2014 at 5:06 AM, Stephen Rothwell wrote:
> P.S. Daniel, that drm-intel tree commit has no Signed-off-by from its
> author ...
Oops, fixed. Thanks for pointing this out.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
--
To
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in
drivers/gpu/drm/i915/intel_dp.c between commit b19729617929 ("drm/i915:
fix psr match conditions screw ups") from the drm tree and commit
24acaf94ed4a ("drm/i915: Fix up PSR frontbuffer tracking") from the
drm-intel tree.
I
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in
drivers/gpu/drm/i915/intel_display.c between commit d05410f9a450
("drm/i915: split conversion function out into separate function") from
the drm tree and commit 6b09e72050b4 ("drm/i915: Power gating display
wells during i915_
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in
drivers/gpu/drm/i915/intel_display.c between commit f4510a2752b7 ("drm:
Replace crtc fb with primary plane fb (v3)") from the drm tree and commit
262ca2b08fbd ("drm/i915: Rename similar plane functions to avoid
confusion") fr
On Wed, Jan 22, 2014 at 5:21 PM, Olof Johansson wrote:
> On Wed, Jan 22, 2014 at 2:06 AM, Daniel Vetter wrote:
>> Hi Stephen,
>>
>> On Wed, Jan 22, 2014 at 4:04 AM, Stephen Rothwell
>> wrote:
>>> Hi all,
>>>
>>> Today's linux-next merge of the drm-intel tree got a conflict in
>>> drivers/gpu/dr
On Wed, Jan 22, 2014 at 2:06 AM, Daniel Vetter wrote:
> Hi Stephen,
>
> On Wed, Jan 22, 2014 at 4:04 AM, Stephen Rothwell
> wrote:
>> Hi all,
>>
>> Today's linux-next merge of the drm-intel tree got a conflict in
>> drivers/gpu/drm/i915/i915_irq.c between commit abca9e454498 ("drm: Pass
>> 'flag
Hi Stephen,
On Wed, Jan 22, 2014 at 4:04 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the drm-intel tree got a conflict in
> drivers/gpu/drm/i915/i915_irq.c between commit abca9e454498 ("drm: Pass
> 'flags' from the caller to .get_scanout_position()") from the drm tree
>
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in
drivers/gpu/drm/i915/intel_display.c between commit c326c0a9c98c
("drm/i915: Call drm_calc_timestamping_constants() earlier") from the drm
tree and commit bbee18af2a25 ("drm/i915: Prepare to track new pipe config
per pipe") f
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in
drivers/gpu/drm/i915/i915_irq.c between commit abca9e454498 ("drm: Pass
'flags' from the caller to .get_scanout_position()") from the drm tree
and commit d59a63ad8234 ("drm/i915: Add intel_get_crtc_scanline()") from
the drm-i
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in
drivers/gpu/drm/i915/intel_panel.c between commit 5bdebb183c97
("drm/sysfs: sort out minor and connector device object lifetimes") from
the drm tree and commit 752aa88a1e78 ("drm/i915: make backlight functions
take a connecto
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in
drivers/gpu/drm/drm_crtc.c between commit b21e3afe2357 ("drm: use ida to
allocate connector ids") from the drm tree and commit 88cd8b8b1503 ("drm:
add MIPI DSI encoder and connector types") from the drm-intel tree.
I fixed i
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in
drivers/gpu/drm/i915/intel_fb.c between commit b72447cdf129 ("drm/i915:
Drop bogus fbdev sprite disable code") from the drm tree and commit
b51b32cde175 ("drm/i915: s/drm_i915_private_t/struct drm_i915_private/")
from the drm
21 matches
Mail list logo
