Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 441921d5 authored by Daniel Vetter's avatar Daniel Vetter Committed by Dave Airlie
Browse files

drm/radeon: embed struct drm_gem_object 



Unconditionally initialize the drm gem object - it's not
worth the trouble not to for the few kernel objects.

This patch only changes the place of the drm gem object,
access is still done via pointers.

v2: Uncoditionally align the size in radeon_bo_create. At
least the r600/evergreen blit code didn't to this, angering
the paranoid gem code.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent ae0cec28

drivers/gpu/drm/radeon/evergreen_blit_kms.c

+1 −1
Original line number Diff line number Diff line
@@ -572,7 +572,7 @@ int evergreen_blit_init(struct radeon_device *rdev) 
	obj_size += evergreen_ps_size * 4;

	obj_size = ALIGN(obj_size, 256);



	r = radeon_bo_create(rdev, NULL, obj_size, PAGE_SIZE, true, RADEON_GEM_DOMAIN_VRAM,

	r = radeon_bo_create(rdev, obj_size, PAGE_SIZE, true, RADEON_GEM_DOMAIN_VRAM,

				&rdev->r600_blit.shader_obj);

	if (r) {

		DRM_ERROR("evergreen failed to allocate shader\n");

drivers/gpu/drm/radeon/r600.c

+1 −1
Original line number Diff line number Diff line
@@ -2728,7 +2728,7 @@ static int r600_ih_ring_alloc(struct radeon_device *rdev) 


	/* Allocate ring buffer */

	if (rdev->ih.ring_obj == NULL) {

		r = radeon_bo_create(rdev, NULL, rdev->ih.ring_size,

		r = radeon_bo_create(rdev, rdev->ih.ring_size,

				     PAGE_SIZE, true,

				     RADEON_GEM_DOMAIN_GTT,

				     &rdev->ih.ring_obj);

drivers/gpu/drm/radeon/r600_blit_kms.c

+1 −1
Original line number Diff line number Diff line
@@ -501,7 +501,7 @@ int r600_blit_init(struct radeon_device *rdev) 
	obj_size += r6xx_ps_size * 4;

	obj_size = ALIGN(obj_size, 256);



	r = radeon_bo_create(rdev, NULL, obj_size, PAGE_SIZE, true, RADEON_GEM_DOMAIN_VRAM,

	r = radeon_bo_create(rdev, obj_size, PAGE_SIZE, true, RADEON_GEM_DOMAIN_VRAM,

				&rdev->r600_blit.shader_obj);

	if (r) {

		DRM_ERROR("r600 failed to allocate shader\n");

drivers/gpu/drm/radeon/radeon.h

+1 −0
Original line number Diff line number Diff line
@@ -259,6 +259,7 @@ struct radeon_bo { 
	/* Constant after initialization */

	struct radeon_device		*rdev;

	struct drm_gem_object		*gobj;

	struct drm_gem_object		gem_base;

};



struct radeon_bo_list {

drivers/gpu/drm/radeon/radeon_benchmark.c

+2 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ void radeon_benchmark_move(struct radeon_device *rdev, unsigned bsize, 


	size = bsize;

	n = 1024;

	r = radeon_bo_create(rdev, NULL, size, PAGE_SIZE, true, sdomain, &sobj);

	r = radeon_bo_create(rdev, size, PAGE_SIZE, true, sdomain, &sobj);

	if (r) {

		goto out_cleanup;

	}
@@ -53,7 +53,7 @@ void radeon_benchmark_move(struct radeon_device *rdev, unsigned bsize, 
	if (r) {

		goto out_cleanup;

	}

	r = radeon_bo_create(rdev, NULL, size, PAGE_SIZE, true, ddomain, &dobj);

	r = radeon_bo_create(rdev, size, PAGE_SIZE, true, ddomain, &dobj);

	if (r) {

		goto out_cleanup;

	}