Commit f98f915b authored by Rob Clark's avatar Rob Clark
Browse files

drm/msm/gpu: Add ctx to get_param() 



Prep work for next patch.

Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
Link: https://lore.kernel.org/r/20220201161618.778455-2-robdclark@gmail.com


Reviewed-by: default avatarEmma Anholt <emma@anholt.net>
Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
parent 17180961

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

+2 −1
Original line number Diff line number Diff line
@@ -227,7 +227,8 @@ adreno_iommu_create_address_space(struct msm_gpu *gpu, 
	return aspace;

}



int adreno_get_param(struct msm_gpu *gpu, uint32_t param, uint64_t *value)

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

		     uint32_t param, uint64_t *value)

{

	struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);

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

+2 −1
Original line number Diff line number Diff line
@@ -279,7 +279,8 @@ static inline int adreno_is_a650_family(struct adreno_gpu *gpu) 
	       adreno_is_a660_family(gpu);

}



int adreno_get_param(struct msm_gpu *gpu, uint32_t param, uint64_t *value);

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

		     uint32_t param, uint64_t *value);

const struct firmware *adreno_request_fw(struct adreno_gpu *adreno_gpu,

		const char *fwname);

struct drm_gem_object *adreno_fw_create_bo(struct msm_gpu *gpu,

drivers/gpu/drm/msm/msm_drv.c

+2 −1
Original line number Diff line number Diff line
@@ -609,7 +609,8 @@ static int msm_ioctl_get_param(struct drm_device *dev, void *data, 
	if (!gpu)

		return -ENXIO;



	return gpu->funcs->get_param(gpu, args->param, &args->value);

	return gpu->funcs->get_param(gpu, file->driver_priv,

				     args->param, &args->value);

}



static int msm_ioctl_gem_new(struct drm_device *dev, void *data,

drivers/gpu/drm/msm/msm_gpu.h

+2 −1
Original line number Diff line number Diff line
@@ -42,7 +42,8 @@ struct msm_gpu_config { 
 *    + z180_gpu

 */

struct msm_gpu_funcs {

	int (*get_param)(struct msm_gpu *gpu, uint32_t param, uint64_t *value);

	int (*get_param)(struct msm_gpu *gpu, struct msm_file_private *ctx,

			 uint32_t param, uint64_t *value);

	int (*hw_init)(struct msm_gpu *gpu);

	int (*pm_suspend)(struct msm_gpu *gpu);

	int (*pm_resume)(struct msm_gpu *gpu);

drivers/gpu/drm/msm/msm_rd.c

+4 −2
Original line number Diff line number Diff line
@@ -197,13 +197,15 @@ static int rd_open(struct inode *inode, struct file *file) 


	/* the parsing tools need to know gpu-id to know which

	 * register database to load.

	 *

	 * Note: These particular params do not require a context

	 */

	gpu->funcs->get_param(gpu, MSM_PARAM_GPU_ID, &val);

	gpu->funcs->get_param(gpu, NULL, MSM_PARAM_GPU_ID, &val);

	gpu_id = val;



	rd_write_section(rd, RD_GPU_ID, &gpu_id, sizeof(gpu_id));



	gpu->funcs->get_param(gpu, MSM_PARAM_CHIP_ID, &val);

	gpu->funcs->get_param(gpu, NULL, MSM_PARAM_CHIP_ID, &val);

	rd_write_section(rd, RD_CHIP_ID, &val, sizeof(val));



out: