aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/linux-yocto-4.14.71/0312-drm-amd-display-Fix-cleanup-in-amdgpu_dm_initialize_.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/0312-drm-amd-display-Fix-cleanup-in-amdgpu_dm_initialize_.patch')
-rw-r--r--common/recipes-kernel/linux/linux-yocto-4.14.71/0312-drm-amd-display-Fix-cleanup-in-amdgpu_dm_initialize_.patch64
1 files changed, 0 insertions, 64 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/0312-drm-amd-display-Fix-cleanup-in-amdgpu_dm_initialize_.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/0312-drm-amd-display-Fix-cleanup-in-amdgpu_dm_initialize_.patch
deleted file mode 100644
index 6fcbf331..00000000
--- a/common/recipes-kernel/linux/linux-yocto-4.14.71/0312-drm-amd-display-Fix-cleanup-in-amdgpu_dm_initialize_.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 05d77c0ebf58703f348471892040d14789068fca Mon Sep 17 00:00:00 2001
-From: Harry Wentland <harry.wentland@amd.com>
-Date: Mon, 3 Apr 2017 13:36:26 -0400
-Subject: [PATCH 0312/4131] drm/amd/display: Fix cleanup in
- amdgpu_dm_initialize_drm_device
-
-Signed-off-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 | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
-index 1a40811..9db208b 100644
---- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
-+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
-@@ -1071,15 +1071,15 @@ int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)
- {
- struct amdgpu_display_manager *dm = &adev->dm;
- uint32_t i;
-- struct amdgpu_connector *aconnector;
-- struct amdgpu_encoder *aencoder;
-+ struct amdgpu_connector *aconnector = NULL;
-+ struct amdgpu_encoder *aencoder = NULL;
- struct amdgpu_mode_info *mode_info = &adev->mode_info;
- uint32_t link_cnt;
-
- link_cnt = dm->dc->caps.max_links;
- if (amdgpu_dm_mode_config_init(dm->adev)) {
- DRM_ERROR("DM: Failed to initialize mode config\n");
-- goto fail;
-+ return -1;
- }
-
- for (i = 0; i < dm->dc->caps.max_surfaces; i++) {
-@@ -1116,7 +1116,7 @@ int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)
-
- aconnector = kzalloc(sizeof(*aconnector), GFP_KERNEL);
- if (!aconnector)
-- goto fail;
-+ goto fail_free_planes;
-
- aencoder = kzalloc(sizeof(*aencoder), GFP_KERNEL);
- if (!aencoder) {
-@@ -1130,7 +1130,7 @@ int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)
-
- if (amdgpu_dm_connector_init(dm, aconnector, i, aencoder)) {
- DRM_ERROR("KMS: Failed to initialize connector\n");
-- goto fail_free_connector;
-+ goto fail_free_encoder;
- }
-
- if (dc_link_detect(dc_get_link_at_index(dm->dc, i), true))
-@@ -1169,7 +1169,6 @@ int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)
- fail_free_planes:
- for (i = 0; i < dm->dc->caps.max_surfaces; i++)
- kfree(mode_info->planes[i]);
--fail:
- return -1;
- }
-
---
-2.7.4
-