Commit 236f0f4e authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'exynos-drm-next-for-v5.17' of... 

Merge tag 'exynos-drm-next-for-v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos

 into drm-next

Four cleanups
- Replacing lagacy gpio interface of dsi driver with gpiod one.
- Implementing a generic GEM object mmap and use it instead of
  exynos specific one.
- Dropping the use of label from dsi driver. Which also fixes
  a build warning.
- Just trivial cleanup by dropping unnecessay code.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Inki Dae <inki.dae@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211222035345.26595-1-inki.dae@samsung.com
parents 63b0951b 760cceff

drivers/gpu/drm/exynos/exynos_drm_drv.c

+2 −11
Original line number Diff line number Diff line
@@ -102,16 +102,7 @@ static const struct drm_ioctl_desc exynos_ioctls[] = { 
			DRM_RENDER_ALLOW),

};



static const struct file_operations exynos_drm_driver_fops = {

	.owner		= THIS_MODULE,

	.open		= drm_open,

	.mmap		= exynos_drm_gem_mmap,

	.poll		= drm_poll,

	.read		= drm_read,

	.unlocked_ioctl	= drm_ioctl,

	.compat_ioctl = drm_compat_ioctl,

	.release	= drm_release,

};

DEFINE_DRM_GEM_FOPS(exynos_drm_driver_fops);



static const struct drm_driver exynos_drm_driver = {

	.driver_features	= DRIVER_MODESET | DRIVER_GEM
@@ -124,7 +115,7 @@ static const struct drm_driver exynos_drm_driver = { 
	.prime_fd_to_handle	= drm_gem_prime_fd_to_handle,

	.gem_prime_import	= exynos_drm_gem_prime_import,

	.gem_prime_import_sg_table	= exynos_drm_gem_prime_import_sg_table,

	.gem_prime_mmap		= exynos_drm_gem_prime_mmap,

	.gem_prime_mmap		= drm_gem_prime_mmap,

	.ioctls			= exynos_ioctls,

	.num_ioctls		= ARRAY_SIZE(exynos_ioctls),

	.fops			= &exynos_drm_driver_fops,

drivers/gpu/drm/exynos/exynos_drm_dsi.c

+17 −32
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <linux/gpio/consumer.h>

#include <linux/irq.h>

#include <linux/of_device.h>

#include <linux/of_gpio.h>

#include <linux/of_graph.h>

#include <linux/phy/phy.h>

#include <linux/regulator/consumer.h>
@@ -265,7 +264,7 @@ struct exynos_dsi { 
	struct clk **clks;

	struct regulator_bulk_data supplies[2];

	int irq;

	int te_gpio;

	struct gpio_desc *te_gpio;



	u32 pll_clk_rate;

	u32 burst_clk_rate;
@@ -1298,14 +1297,14 @@ static void exynos_dsi_enable_irq(struct exynos_dsi *dsi) 
{

	enable_irq(dsi->irq);



	if (gpio_is_valid(dsi->te_gpio))

		enable_irq(gpio_to_irq(dsi->te_gpio));

	if (dsi->te_gpio)

		enable_irq(gpiod_to_irq(dsi->te_gpio));

}



static void exynos_dsi_disable_irq(struct exynos_dsi *dsi)

{

	if (gpio_is_valid(dsi->te_gpio))

		disable_irq(gpio_to_irq(dsi->te_gpio));

	if (dsi->te_gpio)

		disable_irq(gpiod_to_irq(dsi->te_gpio));



	disable_irq(dsi->irq);

}
@@ -1335,42 +1334,31 @@ static int exynos_dsi_register_te_irq(struct exynos_dsi *dsi, 
	int ret;

	int te_gpio_irq;



	dsi->te_gpio = of_get_named_gpio(panel->of_node, "te-gpios", 0);

	if (dsi->te_gpio == -ENOENT)

		return 0;



	if (!gpio_is_valid(dsi->te_gpio)) {

		ret = dsi->te_gpio;

		dev_err(dsi->dev, "cannot get te-gpios, %d\n", ret);

		goto out;

	}



	ret = gpio_request(dsi->te_gpio, "te_gpio");

	if (ret) {

		dev_err(dsi->dev, "gpio request failed with %d\n", ret);

		goto out;

	dsi->te_gpio = devm_gpiod_get_optional(dsi->dev, "te", GPIOD_IN);

	if (IS_ERR(dsi->te_gpio)) {

		dev_err(dsi->dev, "gpio request failed with %ld\n",

				PTR_ERR(dsi->te_gpio));

		return PTR_ERR(dsi->te_gpio);

	}



	te_gpio_irq = gpio_to_irq(dsi->te_gpio);

	te_gpio_irq = gpiod_to_irq(dsi->te_gpio);



	ret = request_threaded_irq(te_gpio_irq, exynos_dsi_te_irq_handler, NULL,

				   IRQF_TRIGGER_RISING | IRQF_NO_AUTOEN, "TE", dsi);

	if (ret) {

		dev_err(dsi->dev, "request interrupt failed with %d\n", ret);

		gpio_free(dsi->te_gpio);

		goto out;

		gpiod_put(dsi->te_gpio);

		return ret;

	}



out:

	return ret;

	return 0;

}



static void exynos_dsi_unregister_te_irq(struct exynos_dsi *dsi)

{

	if (gpio_is_valid(dsi->te_gpio)) {

		free_irq(gpio_to_irq(dsi->te_gpio), dsi);

		gpio_free(dsi->te_gpio);

		dsi->te_gpio = -ENOENT;

	if (dsi->te_gpio) {

		free_irq(gpiod_to_irq(dsi->te_gpio), dsi);

		gpiod_put(dsi->te_gpio);

	}

}
@@ -1745,9 +1733,6 @@ static int exynos_dsi_probe(struct platform_device *pdev) 
	if (!dsi)

		return -ENOMEM;



	/* To be checked as invalid one */

	dsi->te_gpio = -ENOENT;



	init_completion(&dsi->completed);

	spin_lock_init(&dsi->transfer_lock);

	INIT_LIST_HEAD(&dsi->transfer_list);

drivers/gpu/drm/exynos/exynos_drm_fbdev.c

+2 −18
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <drm/drm_crtc.h>

#include <drm/drm_fb_helper.h>

#include <drm/drm_fourcc.h>

#include <drm/drm_prime.h>

#include <drm/drm_probe_helper.h>

#include <drm/exynos_drm.h>
@@ -39,25 +40,8 @@ static int exynos_drm_fb_mmap(struct fb_info *info, 
	struct drm_fb_helper *helper = info->par;

	struct exynos_drm_fbdev *exynos_fbd = to_exynos_fbdev(helper);

	struct exynos_drm_gem *exynos_gem = exynos_fbd->exynos_gem;

	unsigned long vm_size;

	int ret;



	vma->vm_flags |= VM_IO | VM_DONTEXPAND | VM_DONTDUMP;



	vm_size = vma->vm_end - vma->vm_start;



	if (vm_size > exynos_gem->size)

		return -EINVAL;



	ret = dma_mmap_attrs(to_dma_dev(helper->dev), vma, exynos_gem->cookie,

			     exynos_gem->dma_addr, exynos_gem->size,

			     exynos_gem->dma_attrs);

	if (ret < 0) {

		DRM_DEV_ERROR(to_dma_dev(helper->dev), "failed to mmap.\n");

		return ret;

	}



	return 0;

	return drm_gem_prime_mmap(&exynos_gem->base, vma);

}



static const struct fb_ops exynos_drm_fb_ops = {

drivers/gpu/drm/exynos/exynos_drm_fimc.c

+2 −2
Original line number Diff line number Diff line
@@ -782,8 +782,8 @@ static int fimc_set_prescaler(struct fimc_context *ctx, struct fimc_scaler *sc, 


	sc->hratio = (src_w << 14) / (dst_w << hfactor);

	sc->vratio = (src_h << 14) / (dst_h << vfactor);

	sc->up_h = (dst_w >= src_w) ? true : false;

	sc->up_v = (dst_h >= src_h) ? true : false;

	sc->up_h = (dst_w >= src_w);

	sc->up_v = (dst_h >= src_h);

	DRM_DEV_DEBUG_KMS(ctx->dev, "hratio[%d]vratio[%d]up_h[%d]up_v[%d]\n",

			  sc->hratio, sc->vratio, sc->up_h, sc->up_v);

drivers/gpu/drm/exynos/exynos_drm_gem.c

+9 −34
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 


MODULE_IMPORT_NS(DMA_BUF);



static int exynos_drm_gem_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma);



static int exynos_drm_alloc_buf(struct exynos_drm_gem *exynos_gem, bool kvmap)

{

	struct drm_device *dev = exynos_gem->base.dev;
@@ -138,6 +140,7 @@ static const struct vm_operations_struct exynos_drm_gem_vm_ops = { 
static const struct drm_gem_object_funcs exynos_drm_gem_object_funcs = {

	.free = exynos_drm_gem_free_object,

	.get_sg_table = exynos_drm_gem_prime_get_sg_table,

	.mmap = exynos_drm_gem_mmap,

	.vm_ops = &exynos_drm_gem_vm_ops,

};
@@ -357,12 +360,16 @@ int exynos_drm_gem_dumb_create(struct drm_file *file_priv, 
	return 0;

}



static int exynos_drm_gem_mmap_obj(struct drm_gem_object *obj,

				   struct vm_area_struct *vma)

static int exynos_drm_gem_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma)

{

	struct exynos_drm_gem *exynos_gem = to_exynos_gem(obj);

	int ret;



	if (obj->import_attach)

		return dma_buf_mmap(obj->dma_buf, vma, 0);



	vma->vm_flags |= VM_IO | VM_DONTEXPAND | VM_DONTDUMP;



	DRM_DEV_DEBUG_KMS(to_dma_dev(obj->dev), "flags = 0x%x\n",

			  exynos_gem->flags);
@@ -388,26 +395,6 @@ static int exynos_drm_gem_mmap_obj(struct drm_gem_object *obj, 
	return ret;

}



int exynos_drm_gem_mmap(struct file *filp, struct vm_area_struct *vma)

{

	struct drm_gem_object *obj;

	int ret;



	/* set vm_area_struct. */

	ret = drm_gem_mmap(filp, vma);

	if (ret < 0) {

		DRM_ERROR("failed to mmap.\n");

		return ret;

	}



	obj = vma->vm_private_data;



	if (obj->import_attach)

		return dma_buf_mmap(obj->dma_buf, vma, 0);



	return exynos_drm_gem_mmap_obj(obj, vma);

}



/* low-level interface prime helpers */

struct drm_gem_object *exynos_drm_gem_prime_import(struct drm_device *dev,

					    struct dma_buf *dma_buf)
@@ -469,15 +456,3 @@ exynos_drm_gem_prime_import_sg_table(struct drm_device *dev, 
	exynos_gem->sgt = sgt;

	return &exynos_gem->base;

}
 


int exynos_drm_gem_prime_mmap(struct drm_gem_object *obj,

			      struct vm_area_struct *vma)

{

	int ret;



	ret = drm_gem_mmap_obj(obj, obj->size, vma);

	if (ret < 0)

		return ret;



	return exynos_drm_gem_mmap_obj(obj, vma);

}