Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd8a2ae8 authored by Harry Wentland's avatar Harry Wentland Committed by Alex Deucher
Browse files

drm/amd/display: Use single fail label in init_drm_dev 



No need for multiple labels as kfree will always do a NULL check
before freeing the memory.

Signed-off-by: default avatarHarry Wentland <harry.wentland@amd.com>
Reviewed-by: default avatarBhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
Reviewed-by: default avatarAndrey Grodzovsky <andrey.grodzovsky@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent efa6a8b7

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

+11 −13
Original line number Original line Diff line number Diff line
@@ -1335,7 +1335,7 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev) 




		if (!plane) {

		if (!plane) {

			DRM_ERROR("KMS: Failed to allocate plane\n");

			DRM_ERROR("KMS: Failed to allocate plane\n");

			goto fail_free_planes;

			goto fail;

		}

		}

		plane->base.type = mode_info->plane_type[i];

		plane->base.type = mode_info->plane_type[i];
@@ -1351,14 +1351,14 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev) 




		if (amdgpu_dm_plane_init(dm, mode_info->planes[i], possible_crtcs)) {

		if (amdgpu_dm_plane_init(dm, mode_info->planes[i], possible_crtcs)) {

			DRM_ERROR("KMS: Failed to initialize plane\n");

			DRM_ERROR("KMS: Failed to initialize plane\n");

			goto fail_free_planes;

			goto fail;

		}

		}

	}

	}





	for (i = 0; i < dm->dc->caps.max_streams; i++)

	for (i = 0; i < dm->dc->caps.max_streams; i++)

		if (amdgpu_dm_crtc_init(dm, &mode_info->planes[i]->base, i)) {

		if (amdgpu_dm_crtc_init(dm, &mode_info->planes[i]->base, i)) {

			DRM_ERROR("KMS: Failed to initialize crtc\n");

			DRM_ERROR("KMS: Failed to initialize crtc\n");

			goto fail_free_planes;

			goto fail;

		}

		}





	dm->display_indexes_num = dm->dc->caps.max_streams;

	dm->display_indexes_num = dm->dc->caps.max_streams;
@@ -1375,20 +1375,20 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev) 




		aconnector = kzalloc(sizeof(*aconnector), GFP_KERNEL);

		aconnector = kzalloc(sizeof(*aconnector), GFP_KERNEL);

		if (!aconnector)

		if (!aconnector)

			goto fail_free_planes;

			goto fail;





		aencoder = kzalloc(sizeof(*aencoder), GFP_KERNEL);

		aencoder = kzalloc(sizeof(*aencoder), GFP_KERNEL);

		if (!aencoder)

		if (!aencoder)

			goto fail_free_connector;

			goto fail;





		if (amdgpu_dm_encoder_init(dm->ddev, aencoder, i)) {

		if (amdgpu_dm_encoder_init(dm->ddev, aencoder, i)) {

			DRM_ERROR("KMS: Failed to initialize encoder\n");

			DRM_ERROR("KMS: Failed to initialize encoder\n");

			goto fail_free_encoder;

			goto fail;

		}

		}





		if (amdgpu_dm_connector_init(dm, aconnector, i, aencoder)) {

		if (amdgpu_dm_connector_init(dm, aconnector, i, aencoder)) {

			DRM_ERROR("KMS: Failed to initialize connector\n");

			DRM_ERROR("KMS: Failed to initialize connector\n");

			goto fail_free_encoder;

			goto fail;

		}

		}





		if (dc_link_detect(dc_get_link_at_index(dm->dc, i),

		if (dc_link_detect(dc_get_link_at_index(dm->dc, i),
@@ -1413,14 +1413,14 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev) 
	case CHIP_VEGA10:

	case CHIP_VEGA10:

		if (dce110_register_irq_handlers(dm->adev)) {

		if (dce110_register_irq_handlers(dm->adev)) {

			DRM_ERROR("DM: Failed to initialize IRQ\n");

			DRM_ERROR("DM: Failed to initialize IRQ\n");

			goto fail_free_encoder;

			goto fail;

		}

		}

		break;

		break;

#if defined(CONFIG_DRM_AMD_DC_DCN1_0)

#if defined(CONFIG_DRM_AMD_DC_DCN1_0)

	case CHIP_RAVEN:

	case CHIP_RAVEN:

		if (dcn10_register_irq_handlers(dm->adev)) {

		if (dcn10_register_irq_handlers(dm->adev)) {

			DRM_ERROR("DM: Failed to initialize IRQ\n");

			DRM_ERROR("DM: Failed to initialize IRQ\n");

			goto fail_free_encoder;

			goto fail;

		}

		}

		/*

		/*

		 * Temporary disable until pplib/smu interaction is implemented

		 * Temporary disable until pplib/smu interaction is implemented
@@ -1430,17 +1430,15 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev) 
#endif

#endif

	default:

	default:

		DRM_ERROR("Usupported ASIC type: 0x%X\n", adev->asic_type);

		DRM_ERROR("Usupported ASIC type: 0x%X\n", adev->asic_type);

		goto fail_free_encoder;

		goto fail;

	}

	}





	drm_mode_config_reset(dm->ddev);

	drm_mode_config_reset(dm->ddev);





	return 0;

	return 0;

fail_free_encoder:

fail:

	kfree(aencoder);

	kfree(aencoder);

fail_free_connector:

	kfree(aconnector);

	kfree(aconnector);

fail_free_planes:

	for (i = 0; i < dm->dc->caps.max_planes; i++)

	for (i = 0; i < dm->dc->caps.max_planes; i++)

		kfree(mode_info->planes[i]);

		kfree(mode_info->planes[i]);

	return -1;

	return -1;