Merge branch 'mediatek-drm-fixes-5.1' of... (86dc6612) · Commits · 戴 / test

drivers/gpu/drm/mediatek/mtk_dpi.c

+3 −5

Original line number	Diff line number	Diff line
		@@ -662,13 +662,11 @@ static unsigned int mt8173_calculate_factor(int clock)
		static unsigned int mt2701_calculate_factor(int clock)
		{
		if (clock <= 64000)
		return 16;
		else if (clock <= 128000)
		return 8;
		else if (clock <= 256000)
		return 4;
		else
		else if (clock <= 128000)
		return 2;
		else
		return 1;
		}

		static const struct mtk_dpi_conf mt8173_conf = {

+7 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		#include <drm/drmP.h>
		#include <drm/drm_atomic.h>
		#include <drm/drm_atomic_helper.h>
		#include <drm/drm_fb_helper.h>
		#include <drm/drm_gem.h>
		#include <drm/drm_gem_cma_helper.h>
		#include <drm/drm_of.h>
		@@ -341,6 +342,8 @@ static struct drm_driver mtk_drm_driver = {
		.gem_prime_get_sg_table = mtk_gem_prime_get_sg_table,
		.gem_prime_import_sg_table = mtk_gem_prime_import_sg_table,
		.gem_prime_mmap = mtk_drm_gem_mmap_buf,
		.gem_prime_vmap = mtk_drm_gem_prime_vmap,
		.gem_prime_vunmap = mtk_drm_gem_prime_vunmap,
		.fops = &mtk_drm_fops,

		.name = DRIVER_NAME,
		@@ -376,6 +379,10 @@ static int mtk_drm_bind(struct device *dev)
		if (ret < 0)
		goto err_deinit;

		ret = drm_fbdev_generic_setup(drm, 32);
		if (ret)
		DRM_ERROR("Failed to initialize fbdev: %d\n", ret);

		return 0;

		err_deinit:

+46 −0

Original line number	Diff line number	Diff line
		@@ -241,3 +241,49 @@ err_gem_free:
		kfree(mtk_gem);
		return ERR_PTR(ret);
		}

		void mtk_drm_gem_prime_vmap(struct drm_gem_object obj)
		{
		struct mtk_drm_gem_obj *mtk_gem = to_mtk_gem_obj(obj);
		struct sg_table *sgt;
		struct sg_page_iter iter;
		unsigned int npages;
		unsigned int i = 0;

		if (mtk_gem->kvaddr)
		return mtk_gem->kvaddr;

		sgt = mtk_gem_prime_get_sg_table(obj);
		if (IS_ERR(sgt))
		return NULL;

		npages = obj->size >> PAGE_SHIFT;
		mtk_gem->pages = kcalloc(npages, sizeof(*mtk_gem->pages), GFP_KERNEL);
		if (!mtk_gem->pages)
		goto out;

		for_each_sg_page(sgt->sgl, &iter, sgt->orig_nents, 0) {
		mtk_gem->pages[i++] = sg_page_iter_page(&iter);
		if (i > npages)
		break;
		}
		mtk_gem->kvaddr = vmap(mtk_gem->pages, npages, VM_MAP,
		pgprot_writecombine(PAGE_KERNEL));

		out:
		kfree((void *)sgt);

		return mtk_gem->kvaddr;
		}

		void mtk_drm_gem_prime_vunmap(struct drm_gem_object obj, void vaddr)
		{
		struct mtk_drm_gem_obj *mtk_gem = to_mtk_gem_obj(obj);

		if (!mtk_gem->pages)
		return;

		vunmap(vaddr);
		mtk_gem->kvaddr = 0;
		kfree((void *)mtk_gem->pages);
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@ struct mtk_drm_gem_obj {
		dma_addr_t dma_addr;
		unsigned long dma_attrs;
		struct sg_table *sg;
		struct page **pages;
		};

		#define to_mtk_gem_obj(x) container_of(x, struct mtk_drm_gem_obj, base)
		@@ -52,5 +53,7 @@ int mtk_drm_gem_mmap_buf(struct drm_gem_object *obj,
		struct sg_table mtk_gem_prime_get_sg_table(struct drm_gem_object obj);
		struct drm_gem_object mtk_gem_prime_import_sg_table(struct drm_device dev,
		struct dma_buf_attachment attach, struct sg_table sg);
		void mtk_drm_gem_prime_vmap(struct drm_gem_object obj);
		void mtk_drm_gem_prime_vunmap(struct drm_gem_object obj, void vaddr);

		#endif

+1 −1

Original line number	Diff line number	Diff line
		@@ -1480,7 +1480,6 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,
		if (IS_ERR(regmap))
		ret = PTR_ERR(regmap);
		if (ret) {
		ret = PTR_ERR(regmap);
		dev_err(dev,
		"Failed to get system configuration registers: %d\n",
		ret);
		@@ -1516,6 +1515,7 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,
		of_node_put(remote);

		hdmi->ddc_adpt = of_find_i2c_adapter_by_node(i2c_np);
		of_node_put(i2c_np);
		if (!hdmi->ddc_adpt) {
		dev_err(dev, "Failed to get ddc i2c adapter by node\n");
		return -EINVAL;