aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichel Dänzer <michel.daenzer@amd.com>2019-01-11 10:21:02 -0500
committerAlex Deucher <alexander.deucher@amd.com>2019-01-15 11:14:25 -0500
commit92b0730eaf2d549fdfb10ecc8b71f34b9f472c12 (patch)
treea4e85bc69fcd7ff65b8dcc44f0c09cdb8b3eeac0
parent25ec429e86bb790e40387a550f0501d0ac55a47c (diff)
Revert "drm/amdgpu: validate user pitch alignment"
The check turned out to be too strict in some cases. Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Michel Dänzer <michel.daenzer@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_display.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
index cb72d9675ab1..b083b219b1a9 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
@@ -531,16 +531,6 @@ amdgpu_display_user_framebuffer_create(struct drm_device *dev,
531 struct drm_gem_object *obj; 531 struct drm_gem_object *obj;
532 struct amdgpu_framebuffer *amdgpu_fb; 532 struct amdgpu_framebuffer *amdgpu_fb;
533 int ret; 533 int ret;
534 struct amdgpu_device *adev = dev->dev_private;
535 int cpp = drm_format_plane_cpp(mode_cmd->pixel_format, 0);
536 int pitch = mode_cmd->pitches[0] / cpp;
537
538 pitch = amdgpu_align_pitch(adev, pitch, cpp, false);
539 if (mode_cmd->pitches[0] != pitch) {
540 DRM_DEBUG_KMS("Invalid pitch: expecting %d but got %d\n",
541 pitch, mode_cmd->pitches[0]);
542 return ERR_PTR(-EINVAL);
543 }
544 534
545 obj = drm_gem_object_lookup(file_priv, mode_cmd->handles[0]); 535 obj = drm_gem_object_lookup(file_priv, mode_cmd->handles[0]);
546 if (obj == NULL) { 536 if (obj == NULL) {