From: Stephen Rothwell <sfr@canb.auug.org.au> To: Dave Airlie <airlied@linux.ie>, DRI <dri-devel@lists.freedesktop.org> Cc: Linux Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Uma Shankar <uma.shankar@intel.com>, Jon Bloomfield <jon.bloomfield@intel.com>, Anshuman Gupta <anshuman.gupta@intel.com>, Imre Deak <imre.deak@intel.com> Subject: linux-next: manual merge of the drm tree with Linus' tree Date: Wed, 13 Nov 2019 12:13:52 +1100 [thread overview] Message-ID: <20191113121352.3b1e85bd@canb.auug.org.au> (raw) [-- Attachment #1: Type: text/plain, Size: 1336 bytes --] Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/i915/i915_reg.h between commit: 1d85a299c4db ("drm/i915: Lower RM timeout to avoid DSI hard hangs") from Linus' tree and commit: 41286861b4c9 ("drm/i915/tgl: Add DC3CO counter in i915_dmc_info") from the drm tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/i915_reg.h index f8ee9aba3955,53c280c4e741..000000000000 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@@ -7217,10 -7351,8 +7357,12 @@@ enum #define TGL_DMC_DEBUG_DC5_COUNT _MMIO(0x101084) #define TGL_DMC_DEBUG_DC6_COUNT _MMIO(0x101088) + #define DMC_DEBUG3 _MMIO(0x101090) + +/* Display Internal Timeout Register */ +#define RM_TIMEOUT _MMIO(0x42060) +#define MMIO_TIMEOUT_US(us) ((us) << 0) + /* interrupts */ #define DE_MASTER_IRQ_CONTROL (1 << 31) #define DE_SPRITEB_FLIP_DONE (1 << 29) [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au> To: Dave Airlie <airlied@linux.ie>, DRI <dri-devel@lists.freedesktop.org> Cc: Anshuman Gupta <anshuman.gupta@intel.com>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List <linux-next@vger.kernel.org>, Jon Bloomfield <jon.bloomfield@intel.com>, Uma Shankar <uma.shankar@intel.com> Subject: linux-next: manual merge of the drm tree with Linus' tree Date: Wed, 13 Nov 2019 12:13:52 +1100 [thread overview] Message-ID: <20191113121352.3b1e85bd@canb.auug.org.au> (raw) Message-ID: <20191113011352.UXjTrehVWd1JBh50lXOzuylW-hlSk_rDcci4IYEYSfo@z> (raw) [-- Attachment #1.1: Type: text/plain, Size: 1336 bytes --] Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/i915/i915_reg.h between commit: 1d85a299c4db ("drm/i915: Lower RM timeout to avoid DSI hard hangs") from Linus' tree and commit: 41286861b4c9 ("drm/i915/tgl: Add DC3CO counter in i915_dmc_info") from the drm tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/i915_reg.h index f8ee9aba3955,53c280c4e741..000000000000 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@@ -7217,10 -7351,8 +7357,12 @@@ enum #define TGL_DMC_DEBUG_DC5_COUNT _MMIO(0x101084) #define TGL_DMC_DEBUG_DC6_COUNT _MMIO(0x101088) + #define DMC_DEBUG3 _MMIO(0x101090) + +/* Display Internal Timeout Register */ +#define RM_TIMEOUT _MMIO(0x42060) +#define MMIO_TIMEOUT_US(us) ((us) << 0) + /* interrupts */ #define DE_MASTER_IRQ_CONTROL (1 << 31) #define DE_SPRITEB_FLIP_DONE (1 << 29) [-- Attachment #1.2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] [-- Attachment #2: Type: text/plain, Size: 159 bytes --] _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next reply other threads:[~2019-11-13 1:13 UTC|newest] Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-13 1:13 Stephen Rothwell [this message] 2019-11-13 1:13 ` linux-next: manual merge of the drm tree with Linus' tree Stephen Rothwell -- strict thread matches above, loose matches on Subject: below -- 2024-03-04 1:08 Stephen Rothwell 2024-03-04 0:47 Stephen Rothwell 2024-01-08 0:14 Stephen Rothwell 2023-06-19 1:17 Stephen Rothwell 2022-11-30 22:57 Stephen Rothwell 2022-11-27 23:58 Stephen Rothwell 2022-11-29 9:07 ` Geert Uytterhoeven 2022-11-17 2:13 Stephen Rothwell 2022-09-19 0:58 Stephen Rothwell 2022-09-19 7:58 ` Geert Uytterhoeven 2022-09-19 14:23 ` Nathan Chancellor 2022-02-28 3:17 Stephen Rothwell 2021-10-29 0:48 Stephen Rothwell 2021-10-29 6:52 ` Joonas Lahtinen 2021-10-11 0:37 Stephen Rothwell 2021-08-23 2:41 Stephen Rothwell 2021-08-24 0:12 ` Stephen Rothwell 2021-08-12 1:20 Stephen Rothwell 2021-07-01 0:52 Stephen Rothwell 2021-03-29 2:14 Stephen Rothwell 2021-03-30 7:36 ` Geert Uytterhoeven 2021-03-30 23:41 ` Stephen Rothwell 2021-02-01 1:30 Stephen Rothwell 2021-02-14 22:07 ` Stephen Rothwell 2021-01-18 0:56 Stephen Rothwell 2020-10-02 3:42 Stephen Rothwell 2020-05-25 3:51 Stephen Rothwell 2020-03-23 0:50 Stephen Rothwell 2019-11-13 1:38 Stephen Rothwell 2019-11-13 1:38 ` Stephen Rothwell 2019-11-13 0:58 Stephen Rothwell 2019-11-13 0:58 ` Stephen Rothwell 2019-11-13 0:50 Stephen Rothwell 2019-11-13 0:50 ` Stephen Rothwell 2019-11-13 0:46 Stephen Rothwell 2019-11-13 0:46 ` Stephen Rothwell 2019-11-13 0:40 Stephen Rothwell 2019-11-13 0:40 ` Stephen Rothwell 2019-08-26 3:12 Stephen Rothwell 2019-06-11 2:19 Stephen Rothwell 2018-06-04 3:09 Stephen Rothwell 2018-03-26 3:38 Stephen Rothwell 2018-03-22 6:37 Stephen Rothwell 2018-03-26 3:45 ` Stephen Rothwell 2018-03-13 1:15 Stephen Rothwell 2018-02-18 23:10 Stephen Rothwell 2018-02-20 20:15 ` Rodrigo Vivi 2018-02-18 23:02 Stephen Rothwell 2018-01-15 1:08 Stephen Rothwell 2017-11-23 23:37 Stephen Rothwell
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20191113121352.3b1e85bd@canb.auug.org.au \ --to=sfr@canb.auug.org.au \ --cc=airlied@linux.ie \ --cc=anshuman.gupta@intel.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=imre.deak@intel.com \ --cc=jon.bloomfield@intel.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-next@vger.kernel.org \ --cc=uma.shankar@intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).