From: broonie@kernel.org To: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>, Intel Graphics <intel-gfx@lists.freedesktop.org> Cc: "Jani Nikula" <jani.nikula@intel.com>, "Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>, "Linux Next Mailing List" <linux-next@vger.kernel.org>, "Lucas De Marchi" <lucas.demarchi@intel.com>, "Robert Beckett" <bob.beckett@collabora.com>, "Thomas Hellström" <thomas.hellstrom@linux.intel.com>, "Tvrtko Ursulin" <tvrtko.ursulin@intel.com> Subject: linux-next: manual merge of the drm-intel-gt tree with the drm-intel tree Date: Mon, 21 Feb 2022 14:33:36 +0000 [thread overview] Message-ID: <20220221143337.3527550-1-broonie@kernel.org> (raw) Hi all, Today's linux-next merge of the drm-intel-gt tree got conflicts in: drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c drivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/i915_reg.h drivers/gpu/drm/i915/selftests/i915_gem_gtt.c between commits: b508d01fa577e ("drm/i915: split out i915_gem_internal.h from i915_drv.h") 29b9702ffe70d ("drm/i915/ttm: Return some errors instead of trying memcpy move") 9a8e720fd0641 ("drm/i915: split out gem/i915_gem_domain.h from i915_drv.h") b508d01fa577e ("drm/i915: split out i915_gem_internal.h from i915_drv.h") from the drm-intel tree and commits: 3526b607b0239 ("drm/i915/ttm: Return some errors instead of trying memcpy move") a413c99fc1e49 ("drm/i915: add gtt misalignment test") b508d01fa577e ("drm/i915: split out i915_gem_internal.h from i915_drv.h") from the drm-intel-gt 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. diff --cc drivers/gpu/drm/i915/i915_drv.h index ffde71b6b3f1f,6ffadf4b3f1ab..0000000000000 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@@ -1089,10 -1284,10 +1087,12 @@@ IS_SUBPLATFORM(const struct drm_i915_pr IS_SUBPLATFORM(dev_priv, INTEL_DG2, INTEL_SUBPLATFORM_G10) #define IS_DG2_G11(dev_priv) \ IS_SUBPLATFORM(dev_priv, INTEL_DG2, INTEL_SUBPLATFORM_G11) + #define IS_DG2_G12(dev_priv) \ + IS_SUBPLATFORM(dev_priv, INTEL_DG2, INTEL_SUBPLATFORM_G12) #define IS_ADLS_RPLS(dev_priv) \ IS_SUBPLATFORM(dev_priv, INTEL_ALDERLAKE_S, INTEL_SUBPLATFORM_RPL_S) +#define IS_ADLP_N(dev_priv) \ + IS_SUBPLATFORM(dev_priv, INTEL_ALDERLAKE_P, INTEL_SUBPLATFORM_N) #define IS_HSW_EARLY_SDV(dev_priv) (IS_HASWELL(dev_priv) && \ (INTEL_DEVID(dev_priv) & 0xFF00) == 0x0C00) #define IS_BDW_ULT(dev_priv) \ diff --cc drivers/gpu/drm/i915/i915_reg.h index 8e1b469a4cd1b,4b95c94084d98..0000000000000 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h diff --cc drivers/gpu/drm/i915/selftests/i915_gem_gtt.c index 1b508c89468c1,ca4ed9dd909b8..0000000000000 --- a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c @@@ -26,7 -26,7 +26,8 @@@ #include <linux/prime_numbers.h> #include "gem/i915_gem_context.h" +#include "gem/i915_gem_internal.h" + #include "gem/i915_gem_region.h" #include "gem/selftests/mock_context.h" #include "gt/intel_context.h" #include "gt/intel_gpu_commands.h" diff --git a/drivers/gpu/drm/i915/i915_gem_evict.h b/drivers/gpu/drm/i915/i915_gem_evict.h index d4478b6ad11bb..b7f8e9435b2c6 100644 --- a/drivers/gpu/drm/i915/i915_gem_evict.h +++ b/drivers/gpu/drm/i915/i915_gem_evict.h @@ -12,13 +12,16 @@ struct drm_mm_node; struct i915_address_space; int __must_check i915_gem_evict_something(struct i915_address_space *vm, + struct i915_gem_ww_ctx *ww, u64 min_size, u64 alignment, unsigned long color, u64 start, u64 end, unsigned flags); int __must_check i915_gem_evict_for_node(struct i915_address_space *vm, + struct i915_gem_ww_ctx *ww, struct drm_mm_node *node, unsigned int flags); -int i915_gem_evict_vm(struct i915_address_space *vm); +int i915_gem_evict_vm(struct i915_address_space *vm, + struct i915_gem_ww_ctx *ww); #endif /* __I915_GEM_EVICT_H__ */
WARNING: multiple messages have this Message-ID (diff)
From: broonie@kernel.org To: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>, Intel Graphics <intel-gfx@lists.freedesktop.org> Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>, "Jani Nikula" <jani.nikula@intel.com>, "Lucas De Marchi" <lucas.demarchi@intel.com>, "Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>, "Linux Next Mailing List" <linux-next@vger.kernel.org> Subject: [Intel-gfx] linux-next: manual merge of the drm-intel-gt tree with the drm-intel tree Date: Mon, 21 Feb 2022 14:33:36 +0000 [thread overview] Message-ID: <20220221143337.3527550-1-broonie@kernel.org> (raw) Hi all, Today's linux-next merge of the drm-intel-gt tree got conflicts in: drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c drivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/i915_reg.h drivers/gpu/drm/i915/selftests/i915_gem_gtt.c between commits: b508d01fa577e ("drm/i915: split out i915_gem_internal.h from i915_drv.h") 29b9702ffe70d ("drm/i915/ttm: Return some errors instead of trying memcpy move") 9a8e720fd0641 ("drm/i915: split out gem/i915_gem_domain.h from i915_drv.h") b508d01fa577e ("drm/i915: split out i915_gem_internal.h from i915_drv.h") from the drm-intel tree and commits: 3526b607b0239 ("drm/i915/ttm: Return some errors instead of trying memcpy move") a413c99fc1e49 ("drm/i915: add gtt misalignment test") b508d01fa577e ("drm/i915: split out i915_gem_internal.h from i915_drv.h") from the drm-intel-gt 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. diff --cc drivers/gpu/drm/i915/i915_drv.h index ffde71b6b3f1f,6ffadf4b3f1ab..0000000000000 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@@ -1089,10 -1284,10 +1087,12 @@@ IS_SUBPLATFORM(const struct drm_i915_pr IS_SUBPLATFORM(dev_priv, INTEL_DG2, INTEL_SUBPLATFORM_G10) #define IS_DG2_G11(dev_priv) \ IS_SUBPLATFORM(dev_priv, INTEL_DG2, INTEL_SUBPLATFORM_G11) + #define IS_DG2_G12(dev_priv) \ + IS_SUBPLATFORM(dev_priv, INTEL_DG2, INTEL_SUBPLATFORM_G12) #define IS_ADLS_RPLS(dev_priv) \ IS_SUBPLATFORM(dev_priv, INTEL_ALDERLAKE_S, INTEL_SUBPLATFORM_RPL_S) +#define IS_ADLP_N(dev_priv) \ + IS_SUBPLATFORM(dev_priv, INTEL_ALDERLAKE_P, INTEL_SUBPLATFORM_N) #define IS_HSW_EARLY_SDV(dev_priv) (IS_HASWELL(dev_priv) && \ (INTEL_DEVID(dev_priv) & 0xFF00) == 0x0C00) #define IS_BDW_ULT(dev_priv) \ diff --cc drivers/gpu/drm/i915/i915_reg.h index 8e1b469a4cd1b,4b95c94084d98..0000000000000 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h diff --cc drivers/gpu/drm/i915/selftests/i915_gem_gtt.c index 1b508c89468c1,ca4ed9dd909b8..0000000000000 --- a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c @@@ -26,7 -26,7 +26,8 @@@ #include <linux/prime_numbers.h> #include "gem/i915_gem_context.h" +#include "gem/i915_gem_internal.h" + #include "gem/i915_gem_region.h" #include "gem/selftests/mock_context.h" #include "gt/intel_context.h" #include "gt/intel_gpu_commands.h" diff --git a/drivers/gpu/drm/i915/i915_gem_evict.h b/drivers/gpu/drm/i915/i915_gem_evict.h index d4478b6ad11bb..b7f8e9435b2c6 100644 --- a/drivers/gpu/drm/i915/i915_gem_evict.h +++ b/drivers/gpu/drm/i915/i915_gem_evict.h @@ -12,13 +12,16 @@ struct drm_mm_node; struct i915_address_space; int __must_check i915_gem_evict_something(struct i915_address_space *vm, + struct i915_gem_ww_ctx *ww, u64 min_size, u64 alignment, unsigned long color, u64 start, u64 end, unsigned flags); int __must_check i915_gem_evict_for_node(struct i915_address_space *vm, + struct i915_gem_ww_ctx *ww, struct drm_mm_node *node, unsigned int flags); -int i915_gem_evict_vm(struct i915_address_space *vm); +int i915_gem_evict_vm(struct i915_address_space *vm, + struct i915_gem_ww_ctx *ww); #endif /* __I915_GEM_EVICT_H__ */
next reply other threads:[~2022-02-21 14:33 UTC|newest] Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-02-21 14:33 broonie [this message] 2022-02-21 14:33 ` [Intel-gfx] linux-next: manual merge of the drm-intel-gt tree with the drm-intel tree broonie 2022-02-21 19:34 ` [Intel-gfx] ✗ Fi.CI.BAT: failure for linux-next: manual merge of the drm-intel-gt tree with the drm-intel tree (rev3) Patchwork -- strict thread matches above, loose matches on Subject: below -- 2022-02-14 0:54 linux-next: manual merge of the drm-intel-gt tree with the drm-intel tree Stephen Rothwell 2022-02-14 0:54 ` Stephen Rothwell 2022-02-03 0:14 Stephen Rothwell 2022-02-03 0:14 ` Stephen Rothwell 2022-01-24 23:07 Stephen Rothwell 2022-01-24 23:07 ` Stephen Rothwell 2021-12-14 13:23 broonie 2021-12-02 0:30 Stephen Rothwell 2021-12-02 0:30 ` Stephen Rothwell 2021-11-24 0:09 Stephen Rothwell 2021-11-24 0:09 ` 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=20220221143337.3527550-1-broonie@kernel.org \ --to=broonie@kernel.org \ --cc=bob.beckett@collabora.com \ --cc=intel-gfx@lists.freedesktop.org \ --cc=jani.nikula@intel.com \ --cc=joonas.lahtinen@linux.intel.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-next@vger.kernel.org \ --cc=lucas.demarchi@intel.com \ --cc=thomas.hellstrom@linux.intel.com \ --cc=tvrtko.ursulin@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 an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.