* linux-next: manual merge of the drm-intel tree with the drm-misc tree
@ 2024-12-18 0:51 Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2024-12-18 0:51 UTC (permalink / raw)
To: Simona Vetter, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi
Cc: Intel Graphics, DRI, Imre Deak, Jani Nikula,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 3632 bytes --]
[Thanks, Imre for the heads up and help with the conflict resolution]
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
drivers/gpu/drm/i915/display/intel_dp_mst.c
between commit:
6fe7b1d10cbd ("drm/i915/dp_mst: Expose a connector to kernel users after it's properly initialized")
from the drm-misc tree and commits:
529798bd786a ("drm/i915/mst: convert to struct intel_display")
d58f65df2dcb ("drm/i915/dp_mst: Fix connector initialization in intel_dp_add_mst_connector()")
fdb65ede8a45 ("drm/i915/mst: unify MST connector function naming to mst_connector_*")
from the drm-intel 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/display/intel_dp_mst.c
index 56ca571e534c,326ff20a5a49..000000000000
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@@ -1715,9 -1704,7 +1704,9 @@@ mst_topology_add_connector(struct drm_d
if (!intel_connector)
return NULL;
+ connector = &intel_connector->base;
+
- intel_connector->get_hw_state = intel_dp_mst_get_hw_state;
+ intel_connector->get_hw_state = mst_connector_get_hw_state;
intel_connector->sync_state = intel_dp_connector_sync_state;
intel_connector->mst_port = intel_dp;
intel_connector->port = port;
@@@ -1725,22 -1712,33 +1714,22 @@@
intel_dp_init_modeset_retry_work(intel_connector);
- ret = drm_connector_dynamic_init(&dev_priv->drm, connector, &intel_dp_mst_connector_funcs,
- /*
- * TODO: The following drm_connector specific initialization belongs
- * to DRM core, however it happens atm too late in
- * drm_connector_init(). That function will also expose the connector
- * to in-kernel users, so it can't be called until the connector is
- * sufficiently initialized; init the device pointer used by the
- * following DSC setup, until a fix moving this to DRM core.
- */
- intel_connector->base.dev = mgr->dev;
-
- intel_connector->dp.dsc_decompression_aux = drm_dp_mst_dsc_aux_for_port(port);
- intel_dp_mst_read_decompression_port_dsc_caps(intel_dp, intel_connector);
- intel_connector->dp.dsc_hblank_expansion_quirk =
- detect_dsc_hblank_expansion_quirk(intel_connector);
-
- connector = &intel_connector->base;
- ret = drm_connector_init(display->drm, connector, &mst_connector_funcs,
- DRM_MODE_CONNECTOR_DisplayPort);
++ ret = drm_connector_dynamic_init(display->drm, connector, &mst_connector_funcs,
+ DRM_MODE_CONNECTOR_DisplayPort, NULL);
if (ret) {
drm_dp_mst_put_port_malloc(port);
intel_connector_free(intel_connector);
return NULL;
}
+ intel_connector->dp.dsc_decompression_aux = drm_dp_mst_dsc_aux_for_port(port);
+ intel_dp_mst_read_decompression_port_dsc_caps(intel_dp, intel_connector);
+ intel_connector->dp.dsc_hblank_expansion_quirk =
+ detect_dsc_hblank_expansion_quirk(intel_connector);
+
- drm_connector_helper_add(connector, &intel_dp_mst_connector_helper_funcs);
+ drm_connector_helper_add(connector, &mst_connector_helper_funcs);
- for_each_pipe(dev_priv, pipe) {
+ for_each_pipe(display, pipe) {
struct drm_encoder *enc =
&intel_dp->mst_encoders[pipe]->base.base;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: manual merge of the drm-intel tree with the drm-misc tree
@ 2025-02-07 0:12 Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2025-02-07 0:12 UTC (permalink / raw)
To: Simona Vetter, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi
Cc: Intel Graphics, DRI, Dmitry Baryshkov, Imre Deak,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1437 bytes --]
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
drivers/gpu/drm/i915/display/intel_dp_mst.c
between commit:
66df9debcb29 ("drm/connector: make mode_valid_ctx take a const struct drm_display_mode")
from the drm-misc tree and commit:
d49b485d1be3 ("drm/i915/dp_mst: Use intel_connector vs. drm_connector pointer in intel_dp_mst.c")
from the drm-intel 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/display/intel_dp_mst.c
index aecaaf1d0fe2,2324ca8f6096..000000000000
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@@ -1422,8 -1454,8 +1454,8 @@@ static int mst_connector_get_modes(stru
}
static int
- mst_connector_mode_valid_ctx(struct drm_connector *connector,
+ mst_connector_mode_valid_ctx(struct drm_connector *_connector,
- struct drm_display_mode *mode,
+ const struct drm_display_mode *mode,
struct drm_modeset_acquire_ctx *ctx,
enum drm_mode_status *status)
{
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: manual merge of the drm-intel tree with the drm-misc tree
@ 2025-11-02 23:13 Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2025-11-02 23:13 UTC (permalink / raw)
To: Simona Vetter, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi
Cc: Jani Nikula, Intel Graphics, DRI, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1223 bytes --]
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
drivers/gpu/drm/i915/gt/intel_rc6.c
between commit:
f6e8dc9edf96 ("drm: include drm_print.h where needed")
from the drm-misc tree and commits:
8c2833ff1df3 ("drm/i915: add vlv_clock_get_czclk()")
5615e78e813e ("drm/i915: split out vlv_clock.[ch]")
from the drm-intel 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/gt/intel_rc6.c
index 13721c9081b6,932f9f1b06b2..000000000000
--- a/drivers/gpu/drm/i915/gt/intel_rc6.c
+++ b/drivers/gpu/drm/i915/gt/intel_rc6.c
@@@ -6,8 -6,7 +6,9 @@@
#include <linux/pm_runtime.h>
#include <linux/string_helpers.h>
+#include <drm/drm_print.h>
+
+ #include "display/vlv_clock.h"
#include "gem/i915_gem_region.h"
#include "i915_drv.h"
#include "i915_reg.h"
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: manual merge of the drm-intel tree with the drm-misc tree
@ 2025-11-02 23:22 Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2025-11-02 23:22 UTC (permalink / raw)
To: Simona Vetter, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi
Cc: Jani Nikula, Intel Graphics, DRI, Linux Kernel Mailing List,
Linux Next Mailing List, Ville Syrjälä
[-- Attachment #1: Type: text/plain, Size: 1167 bytes --]
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
drivers/gpu/drm/i915/display/intel_bw.c
between commit:
f6e8dc9edf96 ("drm: include drm_print.h where needed")
from the drm-misc tree and commit:
ac930bab1c89 ("drm/i915/bw: Untangle dbuf bw from the sagv/mem bw stuff")
from the drm-intel 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/display/intel_bw.c
index b3e4cc9985e9,3033c53e61d1..000000000000
--- a/drivers/gpu/drm/i915/display/intel_bw.c
+++ b/drivers/gpu/drm/i915/display/intel_bw.c
@@@ -3,9 -3,6 +3,8 @@@
* Copyright © 2019 Intel Corporation
*/
- #include <drm/drm_atomic_state_helper.h>
+#include <drm/drm_print.h>
+
#include "soc/intel_dram.h"
#include "i915_drv.h"
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-11-02 23:22 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-11-02 23:22 linux-next: manual merge of the drm-intel tree with the drm-misc tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2025-11-02 23:13 Stephen Rothwell
2025-02-07 0:12 Stephen Rothwell
2024-12-18 0:51 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox