drm/amd/display: Register DMUB service with DC (9a71c7d3) · Commits · 戴 / test

[Why] DC can utilize the DMUB server to send commands to the DMUB but it's the DM responsibility to pass it the service to use. [How] Create the dc_dmub_srv after we finish initializing the dmub_srv. Cleanup the dc_dmub_srv before destroying the dmub_srv or dc. Signed-off-by:

Nicholas Kazlauskas <nicholas.kazlauskas@amd.com> Reviewed-by:

Hersen Wu <hersenxs.wu@amd.com> Acked-by:

Harry Wentland <harry.wentland@amd.com> Signed-off-by:

Alex Deucher <alexander.deucher@amd.com>

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

+12 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@
		#include "dmub/inc/dmub_srv.h"
		#include "dc/inc/hw/dmcu.h"
		#include "dc/inc/hw/abm.h"
		#include "dc/dc_dmub_srv.h"
		#endif

		#include "vid.h"
		@@ -803,6 +804,12 @@ static int dm_dmub_hw_init(struct amdgpu_device *adev)
		abm->dmcu_is_running = dmcu->funcs->is_dmcu_initialized(dmcu);
		}

		adev->dm.dc->ctx->dmub_srv = dc_dmub_srv_create(adev->dm.dc, dmub_srv);
		if (!adev->dm.dc->ctx->dmub_srv) {
		DRM_ERROR("Couldn't allocate DC DMUB server!\n");
		return -ENOMEM;
		}

		DRM_INFO("DMUB hardware initialized: version=0x%08X\n",
		adev->dm.dmcub_fw_version);

		@@ -976,6 +983,11 @@ static void amdgpu_dm_fini(struct amdgpu_device *adev)
		dc_deinit_callbacks(adev->dm.dc);
		#endif
		#ifdef CONFIG_DRM_AMD_DC_DMUB
		if (adev->dm.dc->ctx->dmub_srv) {
		dc_dmub_srv_destroy(&adev->dm.dc->ctx->dmub_srv);
		adev->dm.dc->ctx->dmub_srv = NULL;
		}

		if (adev->dm.dmub_bo)
		amdgpu_bo_free_kernel(&adev->dm.dmub_bo,
		&adev->dm.dmub_bo_gpu_addr,

Admin message