linux-next: manual merge of the drm tree with the drm-intel-fixes tree

Commit Message

Mark Brown June 17, 2024, 6:33 p.m. UTC

Hi all,

Today's linux-next merge of the drm tree got conflicts in:

  drivers/gpu/drm/xe/xe_gt_idle.c
  drivers/gpu/drm/xe/xe_guc_pc.c

between commits:

  2470b141bfae2 ("drm/xe: move disable_c6 call")
  7c877115da419 ("drm/xe/xe_gt_idle: use GT forcewake domain assertion")

from the drm-intel-fixes tree and commits:

  21b7085546481 ("drm/xe/xe_gt_idle: use GT forcewake domain assertion")
  6800e63cf97ba ("drm/xe: move disable_c6 call")

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.

+++ b/drivers/gpu/drm/xe/xe_gt_idle.c
diff --cc drivers/gpu/drm/xe/xe_guc_pc.c
index 23382ced4ea74,508f0d39b4ad5..0000000000000
--- a/drivers/gpu/drm/xe/xe_guc_pc.c
+++ b/drivers/gpu/drm/xe/xe_guc_pc.c

Patch

diff --cc drivers/gpu/drm/xe/xe_gt_idle.c
index 944770fb2daff,5d6181117ab26..0000000000000
--- a/drivers/gpu/drm/xe/xe_gt_idle.c