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

Commit 8432a903 authored by Rob Clark's avatar Rob Clark
Browse files

drm/msm: remove address-space id 



Now that the msm_gem supports an arbitrary number of vma's, we no longer
need to assign an id (index) to each address space.  So rip out the
associated code.

Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent 4b85f7f5

drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c

+0 −7
Original line number Diff line number Diff line
@@ -522,13 +522,6 @@ struct msm_kms *mdp4_kms_init(struct drm_device *dev) 
		aspace = NULL;

	}



	kms->id = msm_register_address_space(dev, aspace);

	if (kms->id < 0) {

		ret = kms->id;

		dev_err(dev->dev, "failed to register mdp4 iommu: %d\n", ret);

		goto fail;

	}



	ret = modeset_init(mdp4_kms);

	if (ret) {

		dev_err(dev->dev, "modeset_init failed: %d\n", ret);

drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c

+0 −7
Original line number Diff line number Diff line
@@ -678,13 +678,6 @@ struct msm_kms *mdp5_kms_init(struct drm_device *dev) 
		aspace = NULL;;

	}



	kms->id = msm_register_address_space(dev, aspace);

	if (kms->id < 0) {

		ret = kms->id;

		dev_err(&pdev->dev, "failed to register mdp5 iommu: %d\n", ret);

		goto fail;

	}



	ret = modeset_init(mdp5_kms);

	if (ret) {

		dev_err(&pdev->dev, "modeset_init failed: %d\n", ret);

drivers/gpu/drm/msm/msm_drv.c

+0 −16
Original line number Diff line number Diff line
@@ -51,22 +51,6 @@ static const struct drm_mode_config_funcs mode_config_funcs = { 
	.atomic_state_free = msm_atomic_state_free,

};



#include "msm_gem.h"  /* temporary */

int msm_register_address_space(struct drm_device *dev,

		struct msm_gem_address_space *aspace)

{

	struct msm_drm_private *priv = dev->dev_private;



	if (WARN_ON(priv->num_aspaces >= ARRAY_SIZE(priv->aspace)))

		return -EINVAL;



	priv->aspace[priv->num_aspaces] = aspace;



	aspace->id = priv->num_aspaces++;



	return aspace->id;

}



#ifdef CONFIG_DRM_MSM_REGISTER_LOGGING

static bool reglog = false;

MODULE_PARM_DESC(reglog, "Enable register read/write logging");

drivers/gpu/drm/msm/msm_drv.h

+0 −11
Original line number Diff line number Diff line
@@ -123,14 +123,6 @@ struct msm_drm_private { 
	uint32_t pending_crtcs;

	wait_queue_head_t pending_crtcs_event;



	/* Registered address spaces.. currently this is fixed per # of

	 * iommu's.  Ie. one for display block and one for gpu block.

	 * Eventually, to do per-process gpu pagetables, we'll want one

	 * of these per-process.

	 */

	unsigned int num_aspaces;

	struct msm_gem_address_space *aspace[NUM_DOMAINS];



	unsigned int num_planes;

	struct drm_plane *planes[16];
@@ -183,9 +175,6 @@ struct drm_atomic_state *msm_atomic_state_alloc(struct drm_device *dev); 
void msm_atomic_state_clear(struct drm_atomic_state *state);

void msm_atomic_state_free(struct drm_atomic_state *state);



int msm_register_address_space(struct drm_device *dev,

		struct msm_gem_address_space *aspace);



void msm_gem_unmap_vma(struct msm_gem_address_space *aspace,

		struct msm_gem_vma *vma, struct sg_table *sgt);

int msm_gem_map_vma(struct msm_gem_address_space *aspace,

drivers/gpu/drm/msm/msm_gem.h

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ struct msm_gem_address_space { 
	struct drm_mm mm;

	struct msm_mmu *mmu;

	struct kref kref;

	int id;    /* temporary */

};



struct msm_gem_vma {