Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52807ae9 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Vincent Abriou
Browse files

drm/sti: use u32 to store DMA addresses 



The STi drm driver correctly warns about invalid format strings
when built with 64-bit dma_addr_t:

sti_hqvdp.c: In function 'sti_hqvdp_vtg_cb':
sti_hqvdp.c:605:119: warning: format '%x' expects argument of type
'unsigned int', but argument 5 has type 'dma_addr_t {aka long long
unsigned int}' [-Wformat=]
sti_hqvdp.c: In function 'sti_hqvdp_atomic_update':
sti_hqvdp.c:931:118: warning: format '%x' expects argument of type
'unsigned int', but argument 5 has type 'dma_addr_t {aka long long
unsigned int}' [-Wformat=]

This could be changed to using the %pad format string, but that
does not work when printing an rvalue, so instead I'm changing
the type in the sti_hqvdp structure to u32, which is what gets
written into the registers anyway.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarVincent Abriou <vincent.abriou@st.com>
parent ffd157ce

drivers/gpu/drm/sti/sti_hqvdp.c

+8 −6
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ struct sti_hqvdp { 
	struct notifier_block vtg_nb;

	bool btm_field_pending;

	void *hqvdp_cmd;

	dma_addr_t hqvdp_cmd_paddr;

	u32 hqvdp_cmd_paddr;

	struct sti_vtg *vtg;

	bool xp70_initialized;

};
@@ -365,8 +365,8 @@ static const uint32_t hqvdp_supported_formats[] = { 
 */

static int sti_hqvdp_get_free_cmd(struct sti_hqvdp *hqvdp)

{

	int curr_cmd, next_cmd;

	dma_addr_t cmd = hqvdp->hqvdp_cmd_paddr;

	u32 curr_cmd, next_cmd;

	u32 cmd = hqvdp->hqvdp_cmd_paddr;

	int i;



	curr_cmd = readl(hqvdp->regs + HQVDP_MBX_CURRENT_CMD);
@@ -393,8 +393,8 @@ static int sti_hqvdp_get_free_cmd(struct sti_hqvdp *hqvdp) 
 */

static int sti_hqvdp_get_curr_cmd(struct sti_hqvdp *hqvdp)

{

	int curr_cmd;

	dma_addr_t cmd = hqvdp->hqvdp_cmd_paddr;

	u32 curr_cmd;

	u32 cmd = hqvdp->hqvdp_cmd_paddr;

	unsigned int i;



	curr_cmd = readl(hqvdp->regs + HQVDP_MBX_CURRENT_CMD);
@@ -846,19 +846,21 @@ int sti_hqvdp_vtg_cb(struct notifier_block *nb, unsigned long evt, void *data) 
static void sti_hqvdp_init(struct sti_hqvdp *hqvdp)

{

	int size;

	dma_addr_t dma_addr;



	hqvdp->vtg_nb.notifier_call = sti_hqvdp_vtg_cb;



	/* Allocate memory for the VDP commands */

	size = NB_VDP_CMD * sizeof(struct sti_hqvdp_cmd);

	hqvdp->hqvdp_cmd = dma_alloc_writecombine(hqvdp->dev, size,

					 &hqvdp->hqvdp_cmd_paddr,

					 &dma_addr,

					 GFP_KERNEL | GFP_DMA);

	if (!hqvdp->hqvdp_cmd) {

		DRM_ERROR("Failed to allocate memory for VDP cmd\n");

		return;

	}



	hqvdp->hqvdp_cmd_paddr = (u32)dma_addr;

	memset(hqvdp->hqvdp_cmd, 0, size);

}