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

Commit 68a1c704 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm: fix format of prints in display driver"

parents 93330ce5 89d31f3b

drivers/gpu/drm/msm/edp/edp.c

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2014-2015, 2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -54,7 +54,7 @@ static struct msm_edp *edp_init(struct platform_device *pdev) 
		ret = -ENOMEM;

		goto fail;

	}

	DBG("eDP probed=%p", edp);

	DBG("eDP probed=%pK", edp);



	edp->pdev = pdev;

	platform_set_drvdata(pdev, edp);

drivers/gpu/drm/msm/msm_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -1179,7 +1179,7 @@ static int msm_enable_vblank(struct drm_device *dev, unsigned int pipe) 
	struct msm_kms *kms = priv->kms;

	if (!kms)

		return -ENXIO;

	DBG("dev=%p, crtc=%u", dev, pipe);

	DBG("dev=%pK, crtc=%u", dev, pipe);

	return vblank_ctrl_queue_work(priv, pipe, true);

}
@@ -1189,7 +1189,7 @@ static void msm_disable_vblank(struct drm_device *dev, unsigned int pipe) 
	struct msm_kms *kms = priv->kms;

	if (!kms)

		return;

	DBG("dev=%p, crtc=%u", dev, pipe);

	DBG("dev=%pK, crtc=%u", dev, pipe);

	vblank_ctrl_queue_work(priv, pipe, false);

}

drivers/gpu/drm/msm/msm_fb.c

+2 −2
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ struct drm_framebuffer *msm_framebuffer_init(struct drm_device *dev, 
	unsigned int hsub, vsub;

	bool is_modified = false;



	DBG("create framebuffer: dev=%p, mode_cmd=%p (%dx%d@%4.4s)",

	DBG("create framebuffer: dev=%pK, mode_cmd=%pK (%dx%d@%4.4s)",

			dev, mode_cmd, mode_cmd->width, mode_cmd->height,

			(char *)&mode_cmd->pixel_format);
@@ -405,7 +405,7 @@ struct drm_framebuffer *msm_framebuffer_init(struct drm_device *dev, 
		goto fail;

	}



	DBG("create: FB ID: %d (%p)", fb->base.id, fb);

	DBG("create: FB ID: %d (%pK)", fb->base.id, fb);



	return fb;

drivers/gpu/drm/msm/msm_fbdev.c

+2 −2
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ static int msm_fbdev_create(struct drm_fb_helper *helper, 
		goto fail_unlock;

	}



	DBG("fbi=%p, dev=%p", fbi, dev);

	DBG("fbi=%pK, dev=%pK", fbi, dev);



	fbdev->fb = fb;

	helper->fb = fb;
@@ -141,7 +141,7 @@ static int msm_fbdev_create(struct drm_fb_helper *helper, 
	fbi->fix.smem_start = paddr;

	fbi->fix.smem_len = bo->size;



	DBG("par=%p, %dx%d", fbi->par, fbi->var.xres, fbi->var.yres);

	DBG("par=%pK, %dx%d", fbi->par, fbi->var.xres, fbi->var.yres);

	DBG("allocated %dx%d fb", fbdev->fb->width, fbdev->fb->height);



	mutex_unlock(&dev->struct_mutex);

drivers/gpu/drm/msm/msm_gem.c

+2 −2
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ vm_fault_t msm_gem_fault(struct vm_fault *vmf) 


	pfn = page_to_pfn(pages[pgoff]);



	VERB("Inserting %p pfn %lx, pa %lx", (void *)vmf->address,

	VERB("Inserting %pK pfn %lx, pa %lx", (void *)vmf->address,

			pfn, pfn << PAGE_SHIFT);



	ret = vmf_insert_mixed(vma, vmf->address, __pfn_to_pfn_t(pfn, PFN_DEV));
@@ -921,7 +921,7 @@ void msm_gem_describe(struct drm_gem_object *obj, struct seq_file *m) 
		break;

	}



	seq_printf(m, "%08x: %c %2d (%2d) %08llx %p\t",

	seq_printf(m, "%08x: %c %2d (%2d) %08llx %pK\t",

			msm_obj->flags, is_active(msm_obj) ? 'A' : 'I',

			obj->name, kref_read(&obj->refcount),

			off, msm_obj->vaddr);