Revert "drm/amdgpu: validate user GEM object size"
Subsystems (2)
PATCH 1/1 Revert "drm/amdgpu: validate user GEM object size"
From: Michel Dänzer <[email protected]>
It was at the same time too strict (for linear tiling modes, where no height alignment is required) and too lenient (for 2D tiling modes, where height may need to be aligned to values > 8).
--- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 8 -------- 1 file changed, 8 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +0 -8
@@ -531,7 +531,6 @@ amdgpu_display_user_framebuffer_create(struct drm_device *dev,struct drm_gem_object *obj;struct amdgpu_framebuffer *amdgpu_fb;int ret; -int height;struct amdgpu_device *adev = dev->dev_private;int cpp =drm_format_plane_cpp (mode_cmd->pixel_format,0 );int pitch = mode_cmd->pitches[0 ] / cpp;
@@ -556,13 +555,6 @@ amdgpu_display_user_framebuffer_create(struct drm_device *dev,return ERR_PTR (-EINVAL ); } - height =ALIGN (mode_cmd->height,8 ); -if (obj->size < pitch * height) { -DRM_DEBUG_KMS ("Invalid GEM size: expecting >= %d but got %zu\n" , - pitch * height, obj->size); -return ERR_PTR (-EINVAL ); - } - amdgpu_fb =kzalloc (sizeof (*amdgpu_fb),GFP_KERNEL );if (amdgpu_fb ==NULL ) {drm_gem_object_put_unlocked (obj);
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 20190110112121.4606-1-michel-otUistvHUpPR7s880joybQ@public.gmane.org
Alex Deucher
Acked-byQuoted 8 lines · Michel Dänzer
From: Michel Dänzer <[email protected]>
It was at the same time too strict (for linear tiling modes, where no height alignment is required) and too lenient (for 2D tiling modes, where height may need to be aligned to values > 8).
Signed-off-by Michel Dänzer <[email protected]>
Quoted 33 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 8 -------- 1 file changed, 8 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +0
-9@@ -531,7 +531,6 @@ amdgpu_display_user_framebuffer_create(struct drm_device *dev,struct drm_gem_object *obj;struct amdgpu_framebuffer *amdgpu_fb;int ret; -int height;struct amdgpu_device *adev = dev->dev_private;int cpp =drm_format_plane_cpp (mode_cmd->pixel_format,0 );int pitch = mode_cmd->pitches[0 ] / cpp;@@ -556,13 +555,6 @@ amdgpu_display_user_framebuffer_create(struct drm_device *dev,return ERR_PTR (-EINVAL ); } - height =ALIGN (mode_cmd->height,8 ); -if (obj->size < pitch * height) { -DRM_DEBUG_KMS ("Invalid GEM size: expecting >= %d but got %zu\n" , - pitch * height, obj->size); -return ERR_PTR (-EINVAL ); - } - amdgpu_fb =kzalloc (sizeof (*amdgpu_fb),GFP_KERNEL );if (amdgpu_fb ==NULL ) {drm_gem_object_put_unlocked (obj); --2.20.1
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx