Commit 6cba3fe4 authored by Lyude Paul's avatar Lyude Paul
Browse files

drm/dp: Add backpointer to drm_device in drm_dp_aux 



This is something that we've wanted for a while now: the ability to
actually look up the respective drm_device for a given drm_dp_aux struct.
This will also allow us to transition over to using the drm_dbg_*() helpers
for debug message printing, as we'll finally have a drm_device to reference
for doing so.

Note that there is one limitation with this - because some DP AUX adapters
exist as platform devices which are initialized independently of their
respective DRM devices, one cannot rely on drm_dp_aux->drm_dev to always be
non-NULL until drm_dp_aux_register() has been called. We make sure to point
this out in the documentation for struct drm_dp_aux.

v3:
* Add WARN_ON_ONCE() to drm_dp_aux_register() if drm_dev isn't filled out

Signed-off-by: default avatarLyude Paul <lyude@redhat.com>
Acked-by: default avatarThierry Reding <treding@nvidia.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210423184309.207645-4-lyude@redhat.com


Reviewed-by: default avatarDave Airlie <airlied@redhat.com>
parent fd43ad9d

drivers/gpu/drm/amd/amdgpu/atombios_dp.c

+2 −0
Original line number Diff line number Diff line
@@ -188,6 +188,8 @@ void amdgpu_atombios_dp_aux_init(struct amdgpu_connector *amdgpu_connector) 
{

	amdgpu_connector->ddc_bus->rec.hpd = amdgpu_connector->hpd.hpd;

	amdgpu_connector->ddc_bus->aux.transfer = amdgpu_atombios_dp_aux_transfer;

	amdgpu_connector->ddc_bus->aux.drm_dev = amdgpu_connector->base.dev;



	drm_dp_aux_init(&amdgpu_connector->ddc_bus->aux);

	amdgpu_connector->ddc_bus->has_aux = true;

}

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

+1 −0
Original line number Diff line number Diff line
@@ -433,6 +433,7 @@ void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm, 
		kasprintf(GFP_KERNEL, "AMDGPU DM aux hw bus %d",

			  link_index);

	aconnector->dm_dp_aux.aux.transfer = dm_dp_aux_transfer;

	aconnector->dm_dp_aux.aux.drm_dev = dm->ddev;

	aconnector->dm_dp_aux.ddc_service = aconnector->dc_link->ddc;



	drm_dp_aux_init(&aconnector->dm_dp_aux.aux);

drivers/gpu/drm/bridge/analogix/analogix-anx6345.c

+1 −0
Original line number Diff line number Diff line
@@ -537,6 +537,7 @@ static int anx6345_bridge_attach(struct drm_bridge *bridge, 
	/* Register aux channel */

	anx6345->aux.name = "DP-AUX";

	anx6345->aux.dev = &anx6345->client->dev;

	anx6345->aux.drm_dev = bridge->dev;

	anx6345->aux.transfer = anx6345_aux_transfer;



	err = drm_dp_aux_register(&anx6345->aux);

drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c

+1 −0
Original line number Diff line number Diff line
@@ -905,6 +905,7 @@ static int anx78xx_bridge_attach(struct drm_bridge *bridge, 
	/* Register aux channel */

	anx78xx->aux.name = "DP-AUX";

	anx78xx->aux.dev = &anx78xx->client->dev;

	anx78xx->aux.drm_dev = bridge->dev;

	anx78xx->aux.transfer = anx78xx_aux_transfer;



	err = drm_dp_aux_register(&anx78xx->aux);

drivers/gpu/drm/bridge/analogix/analogix_dp_core.c

+1 −0
Original line number Diff line number Diff line
@@ -1765,6 +1765,7 @@ int analogix_dp_bind(struct analogix_dp_device *dp, struct drm_device *drm_dev) 
	dp->aux.name = "DP-AUX";

	dp->aux.transfer = analogix_dpaux_transfer;

	dp->aux.dev = dp->dev;

	dp->aux.drm_dev = drm_dev;



	ret = drm_dp_aux_register(&dp->aux);

	if (ret)