Hi! I get a conflict when merging drm-next into drm-tip as part of 'dim push-branch'.
The conflicting patches appear to be
commit 1c4d821db919366034dc9ff4c01b4b0da0b8e30f
Author: Anshuman Gupta <anshuman.gu...@intel.com>
Date: Thu Oct 3 13:47:37 2019 +0530
drm/i915/tgl: Switch between dc3co and dc5 based on display idleness
and
commit ceaaf5300f881e54bba4221a710a40b48423f610
Author: José Roberto de Souza <jose.so...@intel.com>
Date: Wed Feb 5 13:49:45 2020 -0800
drm/i915/dc3co: Add description of how it works
Best regards
Thomas
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
