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

Commit ef790030 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm: set proper printf format specifiers"

parents 80381832 dafe1ee2

drivers/gpu/drm/msm/msm_gem_prime.c

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ struct drm_gem_object *msm_gem_prime_import(struct drm_device *dev, 
	attach_dev = dev->dev;

	attach = dma_buf_attach(dma_buf, attach_dev);

	if (IS_ERR(attach)) {

		DRM_ERROR("dma_buf_attach failure, err=%d\n", PTR_ERR(attach));

		DRM_ERROR("dma_buf_attach failure, err=%ld\n", PTR_ERR(attach));

		return ERR_CAST(attach);

	}

drivers/gpu/drm/msm/msm_smmu.c

+2 −2
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ static int msm_smmu_map_dma_buf(struct msm_mmu *mmu, struct sg_table *sgt, 
	}



	if (sgt && sgt->sgl) {

		DRM_DEBUG("%pad/0x%x/0x%x/0x%x/0x%lx\n",

		DRM_DEBUG("%pad/0x%x/0x%x/0x%lx\n",

				&sgt->sgl->dma_address, sgt->sgl->dma_length,

				dir, attrs);

		SDE_EVT32(sgt->sgl->dma_address, sgt->sgl->dma_length,
@@ -261,7 +261,7 @@ static void msm_smmu_unmap_dma_buf(struct msm_mmu *mmu, struct sg_table *sgt, 
	}



	if (sgt->sgl) {

		DRM_DEBUG("%pad/0x%x/0x%x/0x%x\n",

		DRM_DEBUG("%pad/0x%x/0x%x\n",

				&sgt->sgl->dma_address, sgt->sgl->dma_length,

				dir);

		SDE_EVT32(sgt->sgl->dma_address, sgt->sgl->dma_length,