Commit 0594e2de authored by Rob Clark's avatar Rob Clark
Browse files

drm/msm: Rename msm_file_private -> msm_context 



This is a more descriptive name.

Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Signed-off-by: default avatarRob Clark <robin.clark@oss.qualcomm.com>
Tested-by: default avatarAntonino Maniscalco <antomani103@gmail.com>
Reviewed-by: default avatarAntonino Maniscalco <antomani103@gmail.com>
Patchwork: https://patchwork.freedesktop.org/patch/661459/
parent 02070f04

drivers/gpu/drm/msm/adreno/a6xx_gpu.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static void a6xx_set_pagetable(struct a6xx_gpu *a6xx_gpu, 
		struct msm_ringbuffer *ring, struct msm_gem_submit *submit)

{

	bool sysprof = refcount_read(&a6xx_gpu->base.base.sysprof_active) > 1;

	struct msm_file_private *ctx = submit->queue->ctx;

	struct msm_context *ctx = submit->queue->ctx;

	struct adreno_gpu *adreno_gpu = &a6xx_gpu->base;

	phys_addr_t ttbr;

	u32 asid;

drivers/gpu/drm/msm/adreno/adreno_gpu.c

+3 −3
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ int adreno_fault_handler(struct msm_gpu *gpu, unsigned long iova, int flags, 
	return 0;

}



int adreno_get_param(struct msm_gpu *gpu, struct msm_file_private *ctx,

int adreno_get_param(struct msm_gpu *gpu, struct msm_context *ctx,

		     uint32_t param, uint64_t *value, uint32_t *len)

{

	struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);
@@ -439,7 +439,7 @@ int adreno_get_param(struct msm_gpu *gpu, struct msm_file_private *ctx, 
	}

}



int adreno_set_param(struct msm_gpu *gpu, struct msm_file_private *ctx,

int adreno_set_param(struct msm_gpu *gpu, struct msm_context *ctx,

		     uint32_t param, uint64_t value, uint32_t len)

{

	struct drm_device *drm = gpu->dev;
@@ -485,7 +485,7 @@ int adreno_set_param(struct msm_gpu *gpu, struct msm_file_private *ctx, 
	case MSM_PARAM_SYSPROF:

		if (!capable(CAP_SYS_ADMIN))

			return UERR(EPERM, drm, "invalid permissions");

		return msm_file_private_set_sysprof(ctx, gpu, value);

		return msm_context_set_sysprof(ctx, gpu, value);

	default:

		return UERR(EINVAL, drm, "%s: invalid param: %u", gpu->name, param);

	}

drivers/gpu/drm/msm/adreno/adreno_gpu.h

+2 −2
Original line number Diff line number Diff line
@@ -581,9 +581,9 @@ static inline int adreno_is_a7xx(struct adreno_gpu *gpu) 
/* Put vm_start above 32b to catch issues with not setting xyz_BASE_HI */

#define ADRENO_VM_START 0x100000000ULL

u64 adreno_private_address_space_size(struct msm_gpu *gpu);

int adreno_get_param(struct msm_gpu *gpu, struct msm_file_private *ctx,

int adreno_get_param(struct msm_gpu *gpu, struct msm_context *ctx,

		     uint32_t param, uint64_t *value, uint32_t *len);

int adreno_set_param(struct msm_gpu *gpu, struct msm_file_private *ctx,

int adreno_set_param(struct msm_gpu *gpu, struct msm_context *ctx,

		     uint32_t param, uint64_t value, uint32_t len);

const struct firmware *adreno_request_fw(struct adreno_gpu *adreno_gpu,

		const char *fwname);

drivers/gpu/drm/msm/msm_drv.c

+7 −7
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ static int context_init(struct drm_device *dev, struct drm_file *file) 
{

	static atomic_t ident = ATOMIC_INIT(0);

	struct msm_drm_private *priv = dev->dev_private;

	struct msm_file_private *ctx;

	struct msm_context *ctx;



	ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);

	if (!ctx)
@@ -367,23 +367,23 @@ static int msm_open(struct drm_device *dev, struct drm_file *file) 
	return context_init(dev, file);

}



static void context_close(struct msm_file_private *ctx)

static void context_close(struct msm_context *ctx)

{

	msm_submitqueue_close(ctx);

	msm_file_private_put(ctx);

	msm_context_put(ctx);

}



static void msm_postclose(struct drm_device *dev, struct drm_file *file)

{

	struct msm_drm_private *priv = dev->dev_private;

	struct msm_file_private *ctx = file->driver_priv;

	struct msm_context *ctx = file->driver_priv;



	/*

	 * It is not possible to set sysprof param to non-zero if gpu

	 * is not initialized:

	 */

	if (priv->gpu)

		msm_file_private_set_sysprof(ctx, priv->gpu, 0);

		msm_context_set_sysprof(ctx, priv->gpu, 0);



	context_close(ctx);

}
@@ -515,7 +515,7 @@ static int msm_ioctl_gem_info_iova(struct drm_device *dev, 
		uint64_t *iova)

{

	struct msm_drm_private *priv = dev->dev_private;

	struct msm_file_private *ctx = file->driver_priv;

	struct msm_context *ctx = file->driver_priv;



	if (!priv->gpu)

		return -EINVAL;
@@ -535,7 +535,7 @@ static int msm_ioctl_gem_info_set_iova(struct drm_device *dev, 
		uint64_t iova)

{

	struct msm_drm_private *priv = dev->dev_private;

	struct msm_file_private *ctx = file->driver_priv;

	struct msm_context *ctx = file->driver_priv;



	if (!priv->gpu)

		return -EINVAL;

drivers/gpu/drm/msm/msm_gem.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static void update_device_mem(struct msm_drm_private *priv, ssize_t size) 


static void update_ctx_mem(struct drm_file *file, ssize_t size)

{

	struct msm_file_private *ctx = file->driver_priv;

	struct msm_context *ctx = file->driver_priv;

	uint64_t ctx_mem = atomic64_add_return(size, &ctx->ctx_mem);



	rcu_read_lock(); /* Locks file->pid! */