diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0288-drm-amdgpu-allocate-ip_block_enabled-memory-in-commo.patch')
| -rw-r--r-- | common/recipes-kernel/linux/files/0288-drm-amdgpu-allocate-ip_block_enabled-memory-in-commo.patch | 68 |
1 files changed, 0 insertions, 68 deletions
diff --git a/common/recipes-kernel/linux/files/0288-drm-amdgpu-allocate-ip_block_enabled-memory-in-commo.patch b/common/recipes-kernel/linux/files/0288-drm-amdgpu-allocate-ip_block_enabled-memory-in-commo.patch deleted file mode 100644 index 058de276..00000000 --- a/common/recipes-kernel/linux/files/0288-drm-amdgpu-allocate-ip_block_enabled-memory-in-commo.patch +++ /dev/null @@ -1,68 +0,0 @@ -From d8d090b711bc56e095e59f9b536ed3c73c47b36d Mon Sep 17 00:00:00 2001 -From: Alex Deucher <alexander.deucher@amd.com> -Date: Fri, 26 Jun 2015 13:02:57 -0400 -Subject: [PATCH 0288/1050] drm/amdgpu: allocate ip_block_enabled memory in - common code -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Remove duplication across asic families and make it symmetric -with the freeing of the code in amdgpu_device.c - -Reviewed-by: Christian König <christian.koenig@amd.com> -Signed-off-by: Alex Deucher <alexander.deucher@amd.com> ---- - drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +++- - drivers/gpu/drm/amd/amdgpu/cik.c | 4 ---- - drivers/gpu/drm/amd/amdgpu/vi.c | 4 ---- - 3 files changed, 3 insertions(+), 9 deletions(-) - -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c -index a85cd08..e190975 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c -@@ -1191,7 +1191,9 @@ static int amdgpu_early_init(struct amdgpu_device *adev) - return -EINVAL; - } - -- -+ adev->ip_block_enabled = kcalloc(adev->num_ip_blocks, sizeof(bool), GFP_KERNEL); -+ if (adev->ip_block_enabled == NULL) -+ return -ENOMEM; - - if (adev->ip_blocks == NULL) { - DRM_ERROR("No IP blocks found!\n"); -diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c b/drivers/gpu/drm/amd/amdgpu/cik.c -index 5dab578..341c566 100644 ---- a/drivers/gpu/drm/amd/amdgpu/cik.c -+++ b/drivers/gpu/drm/amd/amdgpu/cik.c -@@ -2256,10 +2256,6 @@ int cik_set_ip_blocks(struct amdgpu_device *adev) - return -EINVAL; - } - -- adev->ip_block_enabled = kcalloc(adev->num_ip_blocks, sizeof(bool), GFP_KERNEL); -- if (adev->ip_block_enabled == NULL) -- return -ENOMEM; -- - return 0; - } - -diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c -index 90fc93c..fa5a444 100644 ---- a/drivers/gpu/drm/amd/amdgpu/vi.c -+++ b/drivers/gpu/drm/amd/amdgpu/vi.c -@@ -1189,10 +1189,6 @@ int vi_set_ip_blocks(struct amdgpu_device *adev) - return -EINVAL; - } - -- adev->ip_block_enabled = kcalloc(adev->num_ip_blocks, sizeof(bool), GFP_KERNEL); -- if (adev->ip_block_enabled == NULL) -- return -ENOMEM; -- - return 0; - } - --- -1.9.1 - |