Commit 57c2af79 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'topic/mst-suspend-resume-reprobe-2019-10-29-2' of... 

Merge tag 'topic/mst-suspend-resume-reprobe-2019-10-29-2' of git://anongit.freedesktop.org/drm/drm-misc

 into drm-next

UAPI Changes:

Cross-subsystem Changes:

Core Changes:
* Handle UP requests asynchronously in the DP MST helpers, fixing
  hotplug notifications and allowing us to implement suspend/resume
  reprobing
* Add basic suspend/resume reprobing to the DP MST helpers
* Improve locking for link address reprobing and connection status
  request handling in the DP MST helpers
* Miscellaneous refactoring in the DP MST helpers
* Add a Kconfig option to the DP MST helpers to enable tracking of
  gets/puts for topology references for debugging purposes

Driver Changes:
* nouveau: Resume hotplug interrupts earlier, so that sideband
  messages may be transmitted during resume and thus allow
  suspend/resume reprobing for DP MST to work
* nouveau: Avoid grabbing runtime PM references when handling short DP
  pulses, so that handling sideband messages in resume codepaths with the
  DP MST helpers doesn't deadlock us
* i915, nouveau, amdgpu, radeon: Use detect_ctx for probing MST
  connectors, so that we can grab the topology manager's atomic lock

Note: there's some amdgpu patches that I didn't realize were pushed
upstream already when creating this topic branch. When they fail to
apply, you can just ignore and skip them.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Lyude Paul <lyude@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a74c6446bc960190d195a751cb6d8a00a98f3974.camel@redhat.com
parents 8c84b43f 12a280c7

drivers/gpu/drm/Kconfig

+14 −0
Original line number Diff line number Diff line
@@ -93,6 +93,20 @@ config DRM_KMS_FB_HELPER 
	help

	  FBDEV helpers for KMS drivers.



config DRM_DEBUG_DP_MST_TOPOLOGY_REFS

        bool "Enable refcount backtrace history in the DP MST helpers"

        select STACKDEPOT

        depends on DRM_KMS_HELPER

        depends on DEBUG_KERNEL

        depends on EXPERT

        help

          Enables debug tracing for topology refs in DRM's DP MST helpers. A

          history of each topology reference/dereference will be printed to the

          kernel log once a port or branch device's topology refcount reaches 0.



          This has the potential to use a lot of memory and print some very

          large kernel messages. If in doubt, say "N".



config DRM_FBDEV_EMULATION

	bool "Enable legacy fbdev support for your modesetting driver"

	depends on DRM

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+2 −2
Original line number Diff line number Diff line
@@ -1028,7 +1028,7 @@ static void s3_handle_mst(struct drm_device *dev, bool suspend) 
		if (suspend) {

			drm_dp_mst_topology_mgr_suspend(mgr);

		} else {

			ret = drm_dp_mst_topology_mgr_resume(mgr);

			ret = drm_dp_mst_topology_mgr_resume(mgr, true);

			if (ret < 0) {

				drm_dp_mst_topology_mgr_set_mst(mgr, false);

				need_hotplug = true;

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c

+12 −16
Original line number Diff line number Diff line
@@ -123,21 +123,6 @@ static ssize_t dm_dp_aux_transfer(struct drm_dp_aux *aux, 
	return result;

}



static enum drm_connector_status

dm_dp_mst_detect(struct drm_connector *connector, bool force)

{

	struct amdgpu_dm_connector *aconnector = to_amdgpu_dm_connector(connector);

	struct amdgpu_dm_connector *master = aconnector->mst_port;



	enum drm_connector_status status =

		drm_dp_mst_detect_port(

			connector,

			&master->mst_mgr,

			aconnector->port);



	return status;

}



static void

dm_dp_mst_connector_destroy(struct drm_connector *connector)

{
@@ -175,7 +160,6 @@ amdgpu_dm_mst_connector_early_unregister(struct drm_connector *connector) 
}



static const struct drm_connector_funcs dm_dp_mst_connector_funcs = {

	.detect = dm_dp_mst_detect,

	.fill_modes = drm_helper_probe_single_connector_modes,

	.destroy = dm_dp_mst_connector_destroy,

	.reset = amdgpu_dm_connector_funcs_reset,
@@ -250,10 +234,22 @@ dm_mst_atomic_best_encoder(struct drm_connector *connector, 
	return &to_amdgpu_dm_connector(connector)->mst_encoder->base;

}



static int

dm_dp_mst_detect(struct drm_connector *connector,

		 struct drm_modeset_acquire_ctx *ctx, bool force)

{

	struct amdgpu_dm_connector *aconnector = to_amdgpu_dm_connector(connector);

	struct amdgpu_dm_connector *master = aconnector->mst_port;



	return drm_dp_mst_detect_port(connector, ctx, &master->mst_mgr,

				      aconnector->port);

}



static const struct drm_connector_helper_funcs dm_dp_mst_connector_helper_funcs = {

	.get_modes = dm_dp_mst_get_modes,

	.mode_valid = amdgpu_dm_connector_mode_valid,

	.atomic_best_encoder = dm_mst_atomic_best_encoder,

	.detect_ctx = dm_dp_mst_detect,

};



static void amdgpu_dm_encoder_destroy(struct drm_encoder *encoder)

CRA Git | Maintained and supported by SUSTech CRA and CCSE