Commit 4cd82aa3 authored by Rob Clark's avatar Rob Clark
Browse files

drm/msm: A bit more docs + cleanup 



msm_file_private is more gpu related, and in the next commit it will
need access to other GPU specific #defines.  While we're at it, add
some comments.

Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
parent 14eb0cb4

drivers/gpu/drm/msm/msm_drv.h

+0 −44
Original line number Diff line number Diff line
@@ -53,15 +53,6 @@ struct msm_disp_state; 


#define FRAC_16_16(mult, div)    (((mult) << 16) / (div))



struct msm_file_private {

	rwlock_t queuelock;

	struct list_head submitqueues;

	int queueid;

	struct msm_gem_address_space *aspace;

	struct kref ref;

	int seqno;

};



enum msm_mdp_plane_property {

	PLANE_PROP_ZPOS,

	PLANE_PROP_ALPHA,
@@ -489,41 +480,6 @@ void msm_writel(u32 data, void __iomem *addr); 
u32 msm_readl(const void __iomem *addr);

void msm_rmw(void __iomem *addr, u32 mask, u32 or);



struct msm_gpu_submitqueue;

int msm_submitqueue_init(struct drm_device *drm, struct msm_file_private *ctx);

struct msm_gpu_submitqueue *msm_submitqueue_get(struct msm_file_private *ctx,

		u32 id);

int msm_submitqueue_create(struct drm_device *drm,

		struct msm_file_private *ctx,

		u32 prio, u32 flags, u32 *id);

int msm_submitqueue_query(struct drm_device *drm, struct msm_file_private *ctx,

		struct drm_msm_submitqueue_query *args);

int msm_submitqueue_remove(struct msm_file_private *ctx, u32 id);

void msm_submitqueue_close(struct msm_file_private *ctx);



void msm_submitqueue_destroy(struct kref *kref);



static inline void __msm_file_private_destroy(struct kref *kref)

{

	struct msm_file_private *ctx = container_of(kref,

		struct msm_file_private, ref);



	msm_gem_address_space_put(ctx->aspace);

	kfree(ctx);

}



static inline void msm_file_private_put(struct msm_file_private *ctx)

{

	kref_put(&ctx->ref, __msm_file_private_destroy);

}



static inline struct msm_file_private *msm_file_private_get(

	struct msm_file_private *ctx)

{

	kref_get(&ctx->ref);

	return ctx;

}



#define DBG(fmt, ...) DRM_DEBUG_DRIVER(fmt"\n", ##__VA_ARGS__)

#define VERB(fmt, ...) if (0) DRM_DEBUG_DRIVER(fmt"\n", ##__VA_ARGS__)

drivers/gpu/drm/msm/msm_gpu.h

+57 −1
Original line number Diff line number Diff line
@@ -257,6 +257,26 @@ struct msm_gpu_perfcntr { 
 */

#define NR_SCHED_PRIORITIES (1 + DRM_SCHED_PRIORITY_HIGH - DRM_SCHED_PRIORITY_MIN)



/**

 * struct msm_file_private - per-drm_file context

 *

 * @queuelock:    synchronizes access to submitqueues list

 * @submitqueues: list of &msm_gpu_submitqueue created by userspace

 * @queueid:      counter incremented each time a submitqueue is created,

 *                used to assign &msm_gpu_submitqueue.id

 * @aspace:       the per-process GPU address-space

 * @ref:          reference count

 * @seqno:        unique per process seqno

 */

struct msm_file_private {

	rwlock_t queuelock;

	struct list_head submitqueues;

	int queueid;

	struct msm_gem_address_space *aspace;

	struct kref ref;

	int seqno;

};



/**

 * msm_gpu_convert_priority - Map userspace priority to ring # and sched priority

 *
@@ -304,6 +324,8 @@ static inline int msm_gpu_convert_priority(struct msm_gpu *gpu, int prio, 
}



/**

 * struct msm_gpu_submitqueues - Userspace created context.

 *

 * A submitqueue is associated with a gl context or vk queue (or equiv)

 * in userspace.

 *
@@ -421,6 +443,40 @@ static inline void gpu_write64(struct msm_gpu *gpu, u32 lo, u32 hi, u64 val) 
int msm_gpu_pm_suspend(struct msm_gpu *gpu);

int msm_gpu_pm_resume(struct msm_gpu *gpu);



int msm_submitqueue_init(struct drm_device *drm, struct msm_file_private *ctx);

struct msm_gpu_submitqueue *msm_submitqueue_get(struct msm_file_private *ctx,

		u32 id);

int msm_submitqueue_create(struct drm_device *drm,

		struct msm_file_private *ctx,

		u32 prio, u32 flags, u32 *id);

int msm_submitqueue_query(struct drm_device *drm, struct msm_file_private *ctx,

		struct drm_msm_submitqueue_query *args);

int msm_submitqueue_remove(struct msm_file_private *ctx, u32 id);

void msm_submitqueue_close(struct msm_file_private *ctx);



void msm_submitqueue_destroy(struct kref *kref);



static inline void __msm_file_private_destroy(struct kref *kref)

{

	struct msm_file_private *ctx = container_of(kref,

		struct msm_file_private, ref);



	msm_gem_address_space_put(ctx->aspace);

	kfree(ctx);

}



static inline void msm_file_private_put(struct msm_file_private *ctx)

{

	kref_put(&ctx->ref, __msm_file_private_destroy);

}



static inline struct msm_file_private *msm_file_private_get(

	struct msm_file_private *ctx)

{

	kref_get(&ctx->ref);

	return ctx;

}



void msm_devfreq_init(struct msm_gpu *gpu);

void msm_devfreq_cleanup(struct msm_gpu *gpu);

void msm_devfreq_resume(struct msm_gpu *gpu);