video: tegra: host: Give names to chip_support parts

Give names to the structures inside nvhost_chip_support. This way
they can be referred to individually.

Change-Id: I9b727bfc232d11957a8bd3e3570583d47cff778e
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/109103
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Mayuresh Kulkarni <mkulkarni@nvidia.com>
Reviewed-by: Juha Tukkinen <jtukkinen@nvidia.com>
Reviewed-by: Ken Adams <kadams@nvidia.com>

1 files changed, 119 insertions, 111 deletions

diff --git a/drivers/video/tegra/host/chip_support.h b/drivers/video/tegra/host/chip_support.h
index 5bc0c9f63e1d..f5d2811f143f 100644
--- a/drivers/video/tegra/host/chip_support.h
+++ b/drivers/video/tegra/host/chip_support.h
@@ -42,118 +42,126 @@ struct mem_handle;
 struct mem_mgr;
 struct nvhost_device;
 
+struct nvhost_channel_ops {
+	int (*init)(struct nvhost_channel *,
+		    struct nvhost_master *,
+		    int chid);
+	int (*submit)(struct nvhost_job *job);
+	int (*read3dreg)(struct nvhost_channel *channel,
+			struct nvhost_hwctx *hwctx,
+			u32 offset,
+			u32 *value);
+	int (*save_context)(struct nvhost_channel *channel);
+	int (*drain_read_fifo)(struct nvhost_channel *ch,
+		u32 *ptr, unsigned int count, unsigned int *pending);
+};
+
+struct nvhost_cdma_ops {
+	void (*start)(struct nvhost_cdma *);
+	void (*stop)(struct nvhost_cdma *);
+	void (*kick)(struct  nvhost_cdma *);
+	int (*timeout_init)(struct nvhost_cdma *,
+			    u32 syncpt_id);
+	void (*timeout_destroy)(struct nvhost_cdma *);
+	void (*timeout_teardown_begin)(struct nvhost_cdma *);
+	void (*timeout_teardown_end)(struct nvhost_cdma *,
+				     u32 getptr);
+	void (*timeout_cpu_incr)(struct nvhost_cdma *,
+				 u32 getptr,
+				 u32 syncpt_incrs,
+				 u32 syncval,
+				 u32 nr_slots,
+				 u32 waitbases);
+};
+
+struct nvhost_pushbuffer_ops {
+	void (*reset)(struct push_buffer *);
+	int (*init)(struct push_buffer *);
+	void (*destroy)(struct push_buffer *);
+	void (*push_to)(struct push_buffer *,
+			struct mem_mgr *, struct mem_handle *,
+			u32 op1, u32 op2);
+	void (*pop_from)(struct push_buffer *,
+			 unsigned int slots);
+	u32 (*space)(struct push_buffer *);
+	u32 (*putptr)(struct push_buffer *);
+};
+
+struct nvhost_debug_ops {
+	void (*debug_init)(struct dentry *de);
+	void (*show_channel_cdma)(struct nvhost_master *,
+				  struct nvhost_channel *,
+				  struct output *,
+				  int chid);
+	void (*show_channel_fifo)(struct nvhost_master *,
+				  struct nvhost_channel *,
+				  struct output *,
+				  int chid);
+	void (*show_mlocks)(struct nvhost_master *m,
+			    struct output *o);
+
+};
+
+struct nvhost_syncpt_ops {
+	void (*reset)(struct nvhost_syncpt *, u32 id);
+	void (*reset_wait_base)(struct nvhost_syncpt *, u32 id);
+	void (*read_wait_base)(struct nvhost_syncpt *, u32 id);
+	u32 (*update_min)(struct nvhost_syncpt *, u32 id);
+	void (*cpu_incr)(struct nvhost_syncpt *, u32 id);
+	int (*patch_wait)(struct nvhost_syncpt *sp,
+			void *patch_addr);
+	void (*debug)(struct nvhost_syncpt *);
+	const char * (*name)(struct nvhost_syncpt *, u32 id);
+	int (*mutex_try_lock)(struct nvhost_syncpt *,
+			      unsigned int idx);
+	void (*mutex_unlock)(struct nvhost_syncpt *,
+			     unsigned int idx);
+};
+
+struct nvhost_intr_ops {
+	void (*init_host_sync)(struct nvhost_intr *);
+	void (*set_host_clocks_per_usec)(
+		struct nvhost_intr *, u32 clocks);
+	void (*set_syncpt_threshold)(
+		struct nvhost_intr *, u32 id, u32 thresh);
+	void (*enable_syncpt_intr)(struct nvhost_intr *, u32 id);
+	void (*disable_all_syncpt_intrs)(struct nvhost_intr *);
+	int  (*request_host_general_irq)(struct nvhost_intr *);
+	void (*free_host_general_irq)(struct nvhost_intr *);
+	int (*request_syncpt_irq)(struct nvhost_intr_syncpt *syncpt);
+};
+
+struct nvhost_dev_ops {
+	struct nvhost_channel *(*alloc_nvhost_channel)(
+			struct nvhost_device *dev);
+	void (*free_nvhost_channel)(struct nvhost_channel *ch);
+};
+
+struct nvhost_mem_ops {
+	struct mem_mgr *(*alloc_mgr)(void);
+	void (*put_mgr)(struct mem_mgr *);
+	struct mem_mgr *(*get_mgr)(struct mem_mgr *);
+	struct mem_mgr *(*get_mgr_file)(int fd);
+	struct mem_handle *(*alloc)(struct mem_mgr *,
+			size_t size, size_t align,
+			int flags);
+	struct mem_handle *(*get)(struct mem_mgr *, u32 id);
+	void (*put)(struct mem_mgr *, struct mem_handle *);
+	phys_addr_t (*pin)(struct mem_mgr *, struct mem_handle *);
+	void (*unpin)(struct mem_mgr *, struct mem_handle *);
+	void *(*mmap)(struct mem_handle *);
+	void (*munmap)(struct mem_handle *, void *);
+};
+
 struct nvhost_chip_support {
-	struct {
-		int (*init)(struct nvhost_channel *,
-			    struct nvhost_master *,
-			    int chid);
-		int (*submit)(struct nvhost_job *job);
-		int (*read3dreg)(struct nvhost_channel *channel,
-				struct nvhost_hwctx *hwctx,
-				u32 offset,
-				u32 *value);
-		int (*save_context)(struct nvhost_channel *channel);
-		int (*drain_read_fifo)(struct nvhost_channel *ch,
-				u32 *ptr, unsigned int count,
-				unsigned int *pending);
-	} channel;
-
-	struct {
-		void (*start)(struct nvhost_cdma *);
-		void (*stop)(struct nvhost_cdma *);
-		void (*kick)(struct  nvhost_cdma *);
-		int (*timeout_init)(struct nvhost_cdma *,
-				    u32 syncpt_id);
-		void (*timeout_destroy)(struct nvhost_cdma *);
-		void (*timeout_teardown_begin)(struct nvhost_cdma *);
-		void (*timeout_teardown_end)(struct nvhost_cdma *,
-					     u32 getptr);
-		void (*timeout_cpu_incr)(struct nvhost_cdma *,
-					 u32 getptr,
-					 u32 syncpt_incrs,
-					 u32 syncval,
-					 u32 nr_slots,
-					 u32 waitbases);
-	} cdma;
-
-	struct {
-		void (*reset)(struct push_buffer *);
-		int (*init)(struct push_buffer *);
-		void (*destroy)(struct push_buffer *);
-		void (*push_to)(struct push_buffer *,
-				struct mem_mgr *, struct mem_handle *,
-				u32 op1, u32 op2);
-		void (*pop_from)(struct push_buffer *,
-				 unsigned int slots);
-		u32 (*space)(struct push_buffer *);
-		u32 (*putptr)(struct push_buffer *);
-	} push_buffer;
-
-	struct {
-		void (*debug_init)(struct dentry *de);
-		void (*show_channel_cdma)(struct nvhost_master *,
-					  struct nvhost_channel *,
-					  struct output *,
-					  int chid);
-		void (*show_channel_fifo)(struct nvhost_master *,
-					  struct nvhost_channel *,
-					  struct output *,
-					  int chid);
-		void (*show_mlocks)(struct nvhost_master *m,
-				    struct output *o);
-
-	} debug;
-
-	struct {
-		void (*reset)(struct nvhost_syncpt *, u32 id);
-		void (*reset_wait_base)(struct nvhost_syncpt *, u32 id);
-		void (*read_wait_base)(struct nvhost_syncpt *, u32 id);
-		u32 (*update_min)(struct nvhost_syncpt *, u32 id);
-		void (*cpu_incr)(struct nvhost_syncpt *, u32 id);
-		int (*patch_wait)(struct nvhost_syncpt *sp,
-				void *patch_addr);
-		void (*debug)(struct nvhost_syncpt *);
-		const char * (*name)(struct nvhost_syncpt *, u32 id);
-		int (*mutex_try_lock)(struct nvhost_syncpt *,
-				      unsigned int idx);
-		void (*mutex_unlock)(struct nvhost_syncpt *,
-				     unsigned int idx);
-	} syncpt;
-
-	struct {
-		void (*init_host_sync)(struct nvhost_intr *);
-		void (*set_host_clocks_per_usec)(
-			struct nvhost_intr *, u32 clocks);
-		void (*set_syncpt_threshold)(
-			struct nvhost_intr *, u32 id, u32 thresh);
-		void (*enable_syncpt_intr)(struct nvhost_intr *, u32 id);
-		void (*disable_all_syncpt_intrs)(struct nvhost_intr *);
-		int  (*request_host_general_irq)(struct nvhost_intr *);
-		void (*free_host_general_irq)(struct nvhost_intr *);
-		int (*request_syncpt_irq)(struct nvhost_intr_syncpt *syncpt);
-	} intr;
-
-	struct {
-		struct nvhost_channel *(*alloc_nvhost_channel)(
-				struct nvhost_device *dev);
-		void (*free_nvhost_channel)(struct nvhost_channel *ch);
-	} nvhost_dev;
-
-	struct {
-		struct mem_mgr *(*alloc_mgr)(void);
-		void (*put_mgr)(struct mem_mgr *);
-		struct mem_mgr *(*get_mgr)(struct mem_mgr *);
-		struct mem_mgr *(*get_mgr_file)(int fd);
-		struct mem_handle *(*alloc)(struct mem_mgr *,
-				size_t size, size_t align,
-				int flags);
-		struct mem_handle *(*get)(struct mem_mgr *, u32 id);
-		void (*put)(struct mem_mgr *, struct mem_handle *);
-		phys_addr_t (*pin)(struct mem_mgr *, struct mem_handle *);
-		void (*unpin)(struct mem_mgr *, struct mem_handle *);
-		void *(*mmap)(struct mem_handle *);
-		void (*munmap)(struct mem_handle *, void *);
-	} mem;
+	struct nvhost_channel_ops channel;
+	struct nvhost_cdma_ops cdma;
+	struct nvhost_pushbuffer_ops push_buffer;
+	struct nvhost_debug_ops debug;
+	struct nvhost_syncpt_ops syncpt;
+	struct nvhost_intr_ops intr;
+	struct nvhost_dev_ops nvhost_dev;
+	struct nvhost_mem_ops mem;
 };
 
 struct nvhost_chip_support *nvhost_get_chip_ops(void);