Commit 5c0d8d38 authored by Thierry Reding's avatar Thierry Reding
Browse files

gpu: host1x: Use unsigned int consistently for IDs 



IDs can never be negative so use unsigned int. In some instances an
explicitly sized type (such as u32) was used for no particular reason,
so turn those into unsigned int as well for consistency.

Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 14c95fc8

drivers/gpu/host1x/dev.h

+12 −11
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ struct host1x_cdma_ops { 
	void (*start)(struct host1x_cdma *cdma);

	void (*stop)(struct host1x_cdma *cdma);

	void (*flush)(struct  host1x_cdma *cdma);

	int (*timeout_init)(struct host1x_cdma *cdma, u32 syncpt_id);

	int (*timeout_init)(struct host1x_cdma *cdma, unsigned int syncpt);

	void (*timeout_destroy)(struct host1x_cdma *cdma);

	void (*freeze)(struct host1x_cdma *cdma);

	void (*resume)(struct host1x_cdma *cdma, u32 getptr);
@@ -82,9 +82,9 @@ struct host1x_intr_ops { 
	int (*init_host_sync)(struct host1x *host, u32 cpm,

		void (*syncpt_thresh_work)(struct work_struct *work));

	void (*set_syncpt_threshold)(

		struct host1x *host, u32 id, u32 thresh);

	void (*enable_syncpt_intr)(struct host1x *host, u32 id);

	void (*disable_syncpt_intr)(struct host1x *host, u32 id);

		struct host1x *host, unsigned int id, u32 thresh);

	void (*enable_syncpt_intr)(struct host1x *host, unsigned int id);

	void (*disable_syncpt_intr)(struct host1x *host, unsigned int id);

	void (*disable_all_syncpt_intrs)(struct host1x *host);

	int (*free_syncpt_irq)(struct host1x *host);

};
@@ -182,19 +182,20 @@ static inline int host1x_hw_intr_init_host_sync(struct host1x *host, u32 cpm, 
}



static inline void host1x_hw_intr_set_syncpt_threshold(struct host1x *host,

						       u32 id, u32 thresh)

						       unsigned int id,

						       u32 thresh)

{

	host->intr_op->set_syncpt_threshold(host, id, thresh);

}



static inline void host1x_hw_intr_enable_syncpt_intr(struct host1x *host,

						     u32 id)

						     unsigned int id)

{

	host->intr_op->enable_syncpt_intr(host, id);

}



static inline void host1x_hw_intr_disable_syncpt_intr(struct host1x *host,

						      u32 id)

						      unsigned int id)

{

	host->intr_op->disable_syncpt_intr(host, id);

}
@@ -211,9 +212,9 @@ static inline int host1x_hw_intr_free_syncpt_irq(struct host1x *host) 


static inline int host1x_hw_channel_init(struct host1x *host,

					 struct host1x_channel *channel,

					 int chid)

					 unsigned int id)

{

	return host->channel_op->init(channel, host, chid);

	return host->channel_op->init(channel, host, id);

}



static inline int host1x_hw_channel_submit(struct host1x *host,
@@ -242,9 +243,9 @@ static inline void host1x_hw_cdma_flush(struct host1x *host, 


static inline int host1x_hw_cdma_timeout_init(struct host1x *host,

					      struct host1x_cdma *cdma,

					      u32 syncpt_id)

					      unsigned int syncpt)

{

	return host->cdma_op->timeout_init(cdma, syncpt_id);

	return host->cdma_op->timeout_init(cdma, syncpt);

}



static inline void host1x_hw_cdma_timeout_destroy(struct host1x *host,

drivers/gpu/host1x/hw/cdma_hw.c

+3 −3
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ static void cdma_resume(struct host1x_cdma *cdma, u32 getptr) 
	u32 cmdproc_stop;



	dev_dbg(host1x->dev,

		"resuming channel (id %d, DMAGET restart = 0x%x)\n",

		"resuming channel (id %u, DMAGET restart = 0x%x)\n",

		ch->id, getptr);



	cmdproc_stop = host1x_sync_readl(host1x, HOST1X_SYNC_CMDPROC_STOP);
@@ -277,7 +277,7 @@ static void cdma_timeout_handler(struct work_struct *work) 
		return;

	}



	dev_warn(host1x->dev, "%s: timeout: %d (%s), HW thresh %d, done %d\n",

	dev_warn(host1x->dev, "%s: timeout: %u (%s), HW thresh %d, done %d\n",

		__func__, cdma->timeout.syncpt->id, cdma->timeout.syncpt->name,

		syncpt_val, cdma->timeout.syncpt_val);
@@ -291,7 +291,7 @@ static void cdma_timeout_handler(struct work_struct *work) 
/*

 * Init timeout resources

 */

static int cdma_timeout_init(struct host1x_cdma *cdma, u32 syncpt_id)

static int cdma_timeout_init(struct host1x_cdma *cdma, unsigned int syncpt)

{

	INIT_DELAYED_WORK(&cdma->timeout.wq, cdma_timeout_handler);

	cdma->timeout.initialized = true;

drivers/gpu/host1x/hw/channel_hw.c

+2 −1
Original line number Diff line number Diff line
@@ -75,7 +75,8 @@ static inline void synchronize_syncpt_base(struct host1x_job *job) 
{

	struct host1x *host = dev_get_drvdata(job->channel->dev->parent);

	struct host1x_syncpt *sp = host->syncpt + job->syncpt_id;

	u32 id, value;

	unsigned int id;

	u32 value;



	value = host1x_syncpt_read_max(sp);

	id = sp->base->id;

drivers/gpu/host1x/hw/debug_hw.c

+2 −2
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ static void host1x_debug_show_channel_cdma(struct host1x *host, 
	cbread = host1x_sync_readl(host, HOST1X_SYNC_CBREAD(ch->id));

	cbstat = host1x_sync_readl(host, HOST1X_SYNC_CBSTAT(ch->id));



	host1x_debug_output(o, "%d-%s: ", ch->id, dev_name(ch->dev));

	host1x_debug_output(o, "%u-%s: ", ch->id, dev_name(ch->dev));



	if (HOST1X_CHANNEL_DMACTRL_DMASTOP_V(dmactrl) ||

	    !ch->cdma.push_buffer.mapped) {
@@ -237,7 +237,7 @@ static void host1x_debug_show_channel_fifo(struct host1x *host, 
	u32 val, rd_ptr, wr_ptr, start, end;

	unsigned int data_count = 0;



	host1x_debug_output(o, "%d: fifo:\n", ch->id);

	host1x_debug_output(o, "%u: fifo:\n", ch->id);



	val = host1x_ch_readl(ch, HOST1X_CHANNEL_FIFOSTAT);

	host1x_debug_output(o, "FIFOSTAT %08x\n", val);

drivers/gpu/host1x/hw/intr_hw.c

+6 −3
Original line number Diff line number Diff line
@@ -107,18 +107,21 @@ static int _host1x_intr_init_host_sync(struct host1x *host, u32 cpm, 
}



static void _host1x_intr_set_syncpt_threshold(struct host1x *host,

	u32 id, u32 thresh)

					      unsigned int id,

					      u32 thresh)

{

	host1x_sync_writel(host, thresh, HOST1X_SYNC_SYNCPT_INT_THRESH(id));

}



static void _host1x_intr_enable_syncpt_intr(struct host1x *host, u32 id)

static void _host1x_intr_enable_syncpt_intr(struct host1x *host,

					    unsigned int id)

{

	host1x_sync_writel(host, BIT_MASK(id),

		HOST1X_SYNC_SYNCPT_THRESH_INT_ENABLE_CPU0(BIT_WORD(id)));

}



static void _host1x_intr_disable_syncpt_intr(struct host1x *host, u32 id)

static void _host1x_intr_disable_syncpt_intr(struct host1x *host,

					     unsigned int id)

{

	host1x_sync_writel(host, BIT_MASK(id),

		HOST1X_SYNC_SYNCPT_THRESH_INT_DISABLE(BIT_WORD(id)));

CRA Git | Maintained and supported by SUSTech CRA and CCSE