Commit e68d14dd authored by Daniel Stone's avatar Daniel Stone Committed by Alex Deucher
Browse files

drm/amdgpu: Move GEM BO to drm_framebuffer 



Since drm_framebuffer can now store GEM objects directly, place them
there rather than in our own subclass. As this makes the framebuffer
create_handle and destroy functions the same as the GEM framebuffer
helper, we can reuse those.

Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDaniel Stone <daniels@collabora.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Christian König <christian.koenig@amd.com>
Cc: David (ChunMing) Zhou <David1.Zhou@amd.com>
Cc: amd-gfx@lists.freedesktop.org
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9a0f0c9d

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

+3 −3
Original line number Diff line number Diff line
@@ -2541,7 +2541,7 @@ int amdgpu_device_suspend(struct drm_device *dev, bool suspend, bool fbcon) 
	/* unpin the front buffers and cursors */

	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {

		struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);

		struct amdgpu_framebuffer *rfb = to_amdgpu_framebuffer(crtc->primary->fb);

		struct drm_framebuffer *fb = crtc->primary->fb;

		struct amdgpu_bo *robj;



		if (amdgpu_crtc->cursor_bo) {
@@ -2553,10 +2553,10 @@ int amdgpu_device_suspend(struct drm_device *dev, bool suspend, bool fbcon) 
			}

		}



		if (rfb == NULL || rfb->obj == NULL) {

		if (fb == NULL || fb->obj[0] == NULL) {

			continue;

		}

		robj = gem_to_amdgpu_bo(rfb->obj);

		robj = gem_to_amdgpu_bo(fb->obj[0]);

		/* don't unpin kernel fb objects */

		if (!amdgpu_fbdev_robj_is_fb(adev, robj)) {

			r = amdgpu_bo_reserve(robj, true);

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

+7 −29
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <linux/pm_runtime.h>

#include <drm/drm_crtc_helper.h>

#include <drm/drm_edid.h>

#include <drm/drm_gem_framebuffer_helper.h>

#include <drm/drm_fb_helper.h>



static void amdgpu_display_flip_callback(struct dma_fence *f,
@@ -151,8 +152,6 @@ int amdgpu_display_crtc_page_flip_target(struct drm_crtc *crtc, 
	struct drm_device *dev = crtc->dev;

	struct amdgpu_device *adev = dev->dev_private;

	struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);

	struct amdgpu_framebuffer *old_amdgpu_fb;

	struct amdgpu_framebuffer *new_amdgpu_fb;

	struct drm_gem_object *obj;

	struct amdgpu_flip_work *work;

	struct amdgpu_bo *new_abo;
@@ -174,15 +173,13 @@ int amdgpu_display_crtc_page_flip_target(struct drm_crtc *crtc, 
	work->async = (page_flip_flags & DRM_MODE_PAGE_FLIP_ASYNC) != 0;



	/* schedule unpin of the old buffer */

	old_amdgpu_fb = to_amdgpu_framebuffer(crtc->primary->fb);

	obj = old_amdgpu_fb->obj;

	obj = crtc->primary->fb->obj[0];



	/* take a reference to the old object */

	work->old_abo = gem_to_amdgpu_bo(obj);

	amdgpu_bo_ref(work->old_abo);



	new_amdgpu_fb = to_amdgpu_framebuffer(fb);

	obj = new_amdgpu_fb->obj;

	obj = fb->obj[0];

	new_abo = gem_to_amdgpu_bo(obj);



	/* pin the new buffer */
@@ -482,28 +479,9 @@ bool amdgpu_display_ddc_probe(struct amdgpu_connector *amdgpu_connector, 
	return true;

}



static void amdgpu_display_user_framebuffer_destroy(struct drm_framebuffer *fb)

{

	struct amdgpu_framebuffer *amdgpu_fb = to_amdgpu_framebuffer(fb);



	drm_gem_object_put_unlocked(amdgpu_fb->obj);

	drm_framebuffer_cleanup(fb);

	kfree(amdgpu_fb);

}



static int amdgpu_display_user_framebuffer_create_handle(

			struct drm_framebuffer *fb,

			struct drm_file *file_priv,

			unsigned int *handle)

{

	struct amdgpu_framebuffer *amdgpu_fb = to_amdgpu_framebuffer(fb);



	return drm_gem_handle_create(file_priv, amdgpu_fb->obj, handle);

}



static const struct drm_framebuffer_funcs amdgpu_fb_funcs = {

	.destroy = amdgpu_display_user_framebuffer_destroy,

	.create_handle = amdgpu_display_user_framebuffer_create_handle,

	.destroy = drm_gem_fb_destroy,

	.create_handle = drm_gem_fb_create_handle,

};



uint32_t amdgpu_display_framebuffer_domains(struct amdgpu_device *adev)
@@ -526,11 +504,11 @@ int amdgpu_display_framebuffer_init(struct drm_device *dev, 
				    struct drm_gem_object *obj)

{

	int ret;

	rfb->obj = obj;

	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) {

		rfb->obj = NULL;

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

		return ret;

	}

	return 0;

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

+5 −5
Original line number Diff line number Diff line
@@ -292,9 +292,9 @@ static int amdgpu_fbdev_destroy(struct drm_device *dev, struct amdgpu_fbdev *rfb 


	drm_fb_helper_unregister_fbi(&rfbdev->helper);



	if (rfb->obj) {

		amdgpufb_destroy_pinned_object(rfb->obj);

		rfb->obj = NULL;

	if (rfb->base.obj[0]) {

		amdgpufb_destroy_pinned_object(rfb->base.obj[0]);

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

		drm_framebuffer_unregister_private(&rfb->base);

		drm_framebuffer_cleanup(&rfb->base);

	}
@@ -377,7 +377,7 @@ int amdgpu_fbdev_total_size(struct amdgpu_device *adev) 
	if (!adev->mode_info.rfbdev)

		return 0;



	robj = gem_to_amdgpu_bo(adev->mode_info.rfbdev->rfb.obj);

	robj = gem_to_amdgpu_bo(adev->mode_info.rfbdev->rfb.base.obj[0]);

	size += amdgpu_bo_size(robj);

	return size;

}
@@ -386,7 +386,7 @@ bool amdgpu_fbdev_robj_is_fb(struct amdgpu_device *adev, struct amdgpu_bo *robj) 
{

	if (!adev->mode_info.rfbdev)

		return false;

	if (robj == gem_to_amdgpu_bo(adev->mode_info.rfbdev->rfb.obj))

	if (robj == gem_to_amdgpu_bo(adev->mode_info.rfbdev->rfb.base.obj[0]))

		return true;

	return false;

}

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

+0 −1
Original line number Diff line number Diff line
@@ -308,7 +308,6 @@ struct amdgpu_display_funcs { 


struct amdgpu_framebuffer {

	struct drm_framebuffer base;

	struct drm_gem_object *obj;



	/* caching for later use */

	uint64_t address;

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

+5 −12
Original line number Diff line number Diff line
@@ -1823,7 +1823,6 @@ static int dce_v10_0_crtc_do_set_base(struct drm_crtc *crtc, 
	struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);

	struct drm_device *dev = crtc->dev;

	struct amdgpu_device *adev = dev->dev_private;

	struct amdgpu_framebuffer *amdgpu_fb;

	struct drm_framebuffer *target_fb;

	struct drm_gem_object *obj;

	struct amdgpu_bo *abo;
@@ -1842,18 +1841,15 @@ static int dce_v10_0_crtc_do_set_base(struct drm_crtc *crtc, 
		return 0;

	}



	if (atomic) {

		amdgpu_fb = to_amdgpu_framebuffer(fb);

	if (atomic)

		target_fb = fb;

	} else {

		amdgpu_fb = to_amdgpu_framebuffer(crtc->primary->fb);

	else

		target_fb = crtc->primary->fb;

	}



	/* If atomic, assume fb object is pinned & idle & fenced and

	 * just update base pointers

	 */

	obj = amdgpu_fb->obj;

	obj = target_fb->obj[0];

	abo = gem_to_amdgpu_bo(obj);

	r = amdgpu_bo_reserve(abo, false);

	if (unlikely(r != 0))
@@ -2043,8 +2039,7 @@ static int dce_v10_0_crtc_do_set_base(struct drm_crtc *crtc, 
	WREG32(mmMASTER_UPDATE_MODE + amdgpu_crtc->crtc_offset, 0);



	if (!atomic && fb && fb != crtc->primary->fb) {

		amdgpu_fb = to_amdgpu_framebuffer(fb);

		abo = gem_to_amdgpu_bo(amdgpu_fb->obj);

		abo = gem_to_amdgpu_bo(fb->obj[0]);

		r = amdgpu_bo_reserve(abo, true);

		if (unlikely(r != 0))

			return r;
@@ -2526,11 +2521,9 @@ static void dce_v10_0_crtc_disable(struct drm_crtc *crtc) 
	dce_v10_0_crtc_dpms(crtc, DRM_MODE_DPMS_OFF);

	if (crtc->primary->fb) {

		int r;

		struct amdgpu_framebuffer *amdgpu_fb;

		struct amdgpu_bo *abo;



		amdgpu_fb = to_amdgpu_framebuffer(crtc->primary->fb);

		abo = gem_to_amdgpu_bo(amdgpu_fb->obj);

		abo = gem_to_amdgpu_bo(crtc->primary->fb->obj[0]);

		r = amdgpu_bo_reserve(abo, true);

		if (unlikely(r))

			DRM_ERROR("failed to reserve abo before unpin\n");

CRA Git | Maintained and supported by SUSTech CRA and CCSE