Commit f258907f authored by Mark Yacoub's avatar Mark Yacoub Committed by Alex Deucher
Browse files

drm/amdgpu: Verify bo size can fit framebuffer size on init. 



To initialize the framebuffer, call drm_gem_fb_init_with_funcs which
verifies that the BO size can fit the FB size by calculating the minimum
expected size of each plane.

The bug was caught using igt-gpu-tools test: kms_addfb_basic.too-high
and kms_addfb_basic.bo-too-small

Tested on ChromeOS Zork by turning on the display and running a YT
video.

=== Changes from v1 ===
1. Added new line under declarations.
2. Use C style comment.

Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: Sean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarMark Yacoub <markyacoub@chromium.org>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent c1534016

drivers/gpu/drm/amd/amdgpu/amdgpu_display.c

+55 −13
Original line number Diff line number Diff line
@@ -870,17 +870,62 @@ static int amdgpu_display_get_fb_info(const struct amdgpu_framebuffer *amdgpu_fb 
	return r;

}



int amdgpu_display_framebuffer_init(struct drm_device *dev,

int amdgpu_display_gem_fb_init(struct drm_device *dev,

			       struct amdgpu_framebuffer *rfb,

			       const struct drm_mode_fb_cmd2 *mode_cmd,

			       struct drm_gem_object *obj)

{

	int ret, i;

	int ret;



	rfb->base.obj[0] = obj;

	drm_helper_mode_fill_fb_struct(dev, &rfb->base, mode_cmd);

	ret = drm_framebuffer_init(dev, &rfb->base, &amdgpu_fb_funcs);

	if (ret)

		goto fail;

		goto err;



	ret = amdgpu_display_framebuffer_init(dev, rfb, mode_cmd, obj);

	if (ret)

		goto err;



	return 0;

err:

	drm_err(dev, "Failed to init gem fb: %d\n", ret);

	rfb->base.obj[0] = NULL;

	return ret;

}



int amdgpu_display_gem_fb_verify_and_init(

	struct drm_device *dev, struct amdgpu_framebuffer *rfb,

	struct drm_file *file_priv, const struct drm_mode_fb_cmd2 *mode_cmd,

	struct drm_gem_object *obj)

{

	int ret;



	rfb->base.obj[0] = obj;



	/* Verify that bo size can fit the fb size. */

	ret = drm_gem_fb_init_with_funcs(dev, &rfb->base, file_priv, mode_cmd,

					 &amdgpu_fb_funcs);

	if (ret)

		goto err;



	ret = amdgpu_display_framebuffer_init(dev, rfb, mode_cmd, obj);

	if (ret)

		goto err;



	return 0;

err:

	drm_err(dev, "Failed to verify and init gem fb: %d\n", ret);

	rfb->base.obj[0] = NULL;

	return ret;

}



int amdgpu_display_framebuffer_init(struct drm_device *dev,

				    struct amdgpu_framebuffer *rfb,

				    const struct drm_mode_fb_cmd2 *mode_cmd,

				    struct drm_gem_object *obj)

{

	int ret, i;



	/*

	 * This needs to happen before modifier conversion as that might change
@@ -891,13 +936,13 @@ int amdgpu_display_framebuffer_init(struct drm_device *dev, 
			drm_dbg_kms(dev, "Plane 0 and %d have different BOs: %u vs. %u\n",

				    i, mode_cmd->handles[0], mode_cmd->handles[i]);

			ret = -EINVAL;

			goto fail;

			return ret;

		}

	}



	ret = amdgpu_display_get_fb_info(rfb, &rfb->tiling_flags, &rfb->tmz_surface);

	if (ret)

		goto fail;

		return ret;



	if (dev->mode_config.allow_fb_modifiers &&

	    !(rfb->base.flags & DRM_MODE_FB_MODIFIERS)) {
@@ -905,7 +950,7 @@ int amdgpu_display_framebuffer_init(struct drm_device *dev, 
		if (ret) {

			drm_dbg_kms(dev, "Failed to convert tiling flags 0x%llX to a modifier",

				    rfb->tiling_flags);

			goto fail;

			return ret;

		}

	}
@@ -915,10 +960,6 @@ int amdgpu_display_framebuffer_init(struct drm_device *dev, 
	}



	return 0;



fail:

	rfb->base.obj[0] = NULL;

	return ret;

}



struct drm_framebuffer *
@@ -953,7 +994,8 @@ amdgpu_display_user_framebuffer_create(struct drm_device *dev, 
		return ERR_PTR(-ENOMEM);

	}



	ret = amdgpu_display_framebuffer_init(dev, amdgpu_fb, mode_cmd, obj);

	ret = amdgpu_display_gem_fb_verify_and_init(dev, amdgpu_fb, file_priv,

						    mode_cmd, obj);

	if (ret) {

		kfree(amdgpu_fb);

		drm_gem_object_put(obj);

drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c

+2 −2
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ static int amdgpufb_create(struct drm_fb_helper *helper, 
		goto out;

	}



	ret = amdgpu_display_framebuffer_init(adev_to_drm(adev), &rfbdev->rfb,

	ret = amdgpu_display_gem_fb_init(adev_to_drm(adev), &rfbdev->rfb,

					 &mode_cmd, gobj);

	if (ret) {

		DRM_ERROR("failed to initialize framebuffer %d\n", ret);

drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h

+8 −0
Original line number Diff line number Diff line
@@ -602,6 +602,14 @@ int amdgpu_display_get_crtc_scanoutpos(struct drm_device *dev, 
			int *hpos, ktime_t *stime, ktime_t *etime,

			const struct drm_display_mode *mode);



int amdgpu_display_gem_fb_init(struct drm_device *dev,

			       struct amdgpu_framebuffer *rfb,

			       const struct drm_mode_fb_cmd2 *mode_cmd,

			       struct drm_gem_object *obj);

int amdgpu_display_gem_fb_verify_and_init(

	struct drm_device *dev, struct amdgpu_framebuffer *rfb,

	struct drm_file *file_priv, const struct drm_mode_fb_cmd2 *mode_cmd,

	struct drm_gem_object *obj);

int amdgpu_display_framebuffer_init(struct drm_device *dev,

				    struct amdgpu_framebuffer *rfb,

				    const struct drm_mode_fb_cmd2 *mode_cmd,