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

Commit 1b9c3dd0 authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie
Browse files

drm/radeon: make use of radeon_gem_init() consistent 



All radeon_gem_init() does is initialize the gem objects
list.  radeon_device.c does this explicitly.  r600+ calls
radeon_gem_init() so the list gets initialized twice.  Older
asics don't call it at all and rely on the the init in
radeon_device.c.  Just call radeon_gem_init() in radeon_device.c
and remove the explicit calls from all the newer asics.

All asics call radeon_gem_fini() in their fini pathes.  That
could possibly be cleaned up too.

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent c1d2dbd2

drivers/gpu/drm/radeon/evergreen.c

+0 −4
Original line number Diff line number Diff line
@@ -3435,10 +3435,6 @@ int evergreen_init(struct radeon_device *rdev) 
{

	int r;



	/* This don't do much */

	r = radeon_gem_init(rdev);

	if (r)

		return r;

	/* Read BIOS */

	if (!radeon_get_bios(rdev)) {

		if (ASIC_IS_AVIVO(rdev))

drivers/gpu/drm/radeon/ni.c

+0 −4
Original line number Diff line number Diff line
@@ -1629,10 +1629,6 @@ int cayman_init(struct radeon_device *rdev) 
	struct radeon_ring *ring = &rdev->ring[RADEON_RING_TYPE_GFX_INDEX];

	int r;



	/* This don't do much */

	r = radeon_gem_init(rdev);

	if (r)

		return r;

	/* Read BIOS */

	if (!radeon_get_bios(rdev)) {

		if (ASIC_IS_AVIVO(rdev))

drivers/gpu/drm/radeon/r600.c

+0 −4
Original line number Diff line number Diff line
@@ -2560,10 +2560,6 @@ int r600_init(struct radeon_device *rdev) 
	if (r600_debugfs_mc_info_init(rdev)) {

		DRM_ERROR("Failed to register debugfs file for mc !\n");

	}

	/* This don't do much */

	r = radeon_gem_init(rdev);

	if (r)

		return r;

	/* Read BIOS */

	if (!radeon_get_bios(rdev)) {

		if (ASIC_IS_AVIVO(rdev))

drivers/gpu/drm/radeon/radeon_device.c

+3 −1
Original line number Diff line number Diff line
@@ -736,9 +736,11 @@ int radeon_device_init(struct radeon_device *rdev, 
	mutex_init(&rdev->gem.mutex);

	mutex_init(&rdev->pm.mutex);

	mutex_init(&rdev->vram_mutex);

	INIT_LIST_HEAD(&rdev->gem.objects);

	init_waitqueue_head(&rdev->irq.vblank_queue);

	init_waitqueue_head(&rdev->irq.idle_queue);

	r = radeon_gem_init(rdev);

	if (r)

		return r;

	/* initialize vm here */

	rdev->vm_manager.use_bitmap = 1;

	rdev->vm_manager.max_pfn = 1 << 20;

drivers/gpu/drm/radeon/rv770.c

+0 −4
Original line number Diff line number Diff line
@@ -1175,10 +1175,6 @@ int rv770_init(struct radeon_device *rdev) 
{

	int r;



	/* This don't do much */

	r = radeon_gem_init(rdev);

	if (r)

		return r;

	/* Read BIOS */

	if (!radeon_get_bios(rdev)) {

		if (ASIC_IS_AVIVO(rdev))