* [PATCH10 3/3] ARM:drm ivip Intel FPGA Video and Image Processing Suite [not found] <1534237029-2648-1-git-send-email-hean.loong.ong@intel.com> @ 2018-08-14 8:57 ` Hean-Loong, Ong 2018-08-14 15:46 ` Dinh Nguyen 2018-08-15 12:26 ` Noralf Trønnes [not found] ` <1534237029-2648-2-git-send-email-hean.loong.ong@intel.com> 2018-08-14 15:48 ` [PATCH10 0/3] " Dinh Nguyen 2 siblings, 2 replies; 9+ messages in thread From: Hean-Loong, Ong @ 2018-08-14 8:57 UTC (permalink / raw) To: linux-arm-kernel From: Ong Hean Loong <hean.loong.ong@intel.com> Driver for Intel FPGA Video and Image Processing Suite Frame Buffer II. The driver only supports the Intel Arria10 devkit and its variants. This driver can be either loaded staticlly or in modules. The OF device tree binding is located at: Documentation/devicetree/bindings/display/altr,vip-fb2.txt Signed-off-by: Ong Hean Loong <hean.loong.ong@intel.com> --- drivers/gpu/drm/Kconfig | 2 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/ivip/Kconfig | 14 +++ drivers/gpu/drm/ivip/Makefile | 9 ++ drivers/gpu/drm/ivip/intel_vip_conn.c | 95 ++++++++++++++++ drivers/gpu/drm/ivip/intel_vip_core.c | 161 +++++++++++++++++++++++++++ drivers/gpu/drm/ivip/intel_vip_drv.h | 52 +++++++++ drivers/gpu/drm/ivip/intel_vip_of.c | 193 +++++++++++++++++++++++++++++++++ 8 files changed, 527 insertions(+), 0 deletions(-) create mode 100644 drivers/gpu/drm/ivip/Kconfig create mode 100644 drivers/gpu/drm/ivip/Makefile create mode 100644 drivers/gpu/drm/ivip/intel_vip_conn.c create mode 100644 drivers/gpu/drm/ivip/intel_vip_core.c create mode 100644 drivers/gpu/drm/ivip/intel_vip_drv.h create mode 100644 drivers/gpu/drm/ivip/intel_vip_of.c diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index cb88528..6b2845b 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -215,6 +215,8 @@ source "drivers/gpu/drm/nouveau/Kconfig" source "drivers/gpu/drm/i915/Kconfig" +source "drivers/gpu/drm/ivip/Kconfig" + config DRM_VGEM tristate "Virtual GEM provider" depends on DRM diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index a6771ce..57205d8 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -61,6 +61,7 @@ obj-$(CONFIG_DRM_AMDGPU)+= amd/amdgpu/ obj-$(CONFIG_DRM_MGA) += mga/ obj-$(CONFIG_DRM_I810) += i810/ obj-$(CONFIG_DRM_I915) += i915/ +obj-$(CONFIG_DRM_IVIP) += ivip/ obj-$(CONFIG_DRM_MGAG200) += mgag200/ obj-$(CONFIG_DRM_V3D) += v3d/ obj-$(CONFIG_DRM_VC4) += vc4/ diff --git a/drivers/gpu/drm/ivip/Kconfig b/drivers/gpu/drm/ivip/Kconfig new file mode 100644 index 0000000..1d08b90 --- /dev/null +++ b/drivers/gpu/drm/ivip/Kconfig @@ -0,0 +1,14 @@ +config DRM_IVIP + tristate "Intel FGPA Video and Image Processing" + depends on DRM && OF + select DRM_GEM_CMA_HELPER + select DRM_KMS_HELPER + select DRM_KMS_FB_HELPER + select DRM_KMS_CMA_HELPER + help + Choose this option if you have an Intel FPGA Arria 10 system + and above with an Intel Display Port IP. This does not support + legacy Intel FPGA Cyclone V display port. Currently only single + frame buffer is supported. Note that ACPI and X_86 architecture + is not supported for Arria10. If M is selected the module will be + called ivip. diff --git a/drivers/gpu/drm/ivip/Makefile b/drivers/gpu/drm/ivip/Makefile new file mode 100644 index 0000000..cc55b04 --- /dev/null +++ b/drivers/gpu/drm/ivip/Makefile @@ -0,0 +1,9 @@ +# +# Makefile for the drm device driver. This driver provides support for the +# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. + +ccflags-y := -Iinclude/drm + +obj-$(CONFIG_DRM_IVIP) += ivip.o +ivip-objs := intel_vip_of.o intel_vip_core.o \ + intel_vip_conn.o diff --git a/drivers/gpu/drm/ivip/intel_vip_conn.c b/drivers/gpu/drm/ivip/intel_vip_conn.c new file mode 100644 index 0000000..46bb04c --- /dev/null +++ b/drivers/gpu/drm/ivip/intel_vip_conn.c @@ -0,0 +1,95 @@ +/* + * intel_vip_conn.c -- Intel Video and Image Processing(VIP) + * Frame Buffer II driver + * + * This driver supports the Intel VIP Frame Reader component. + * More info on the hardware can be found in the Intel Video + * and Image Processing Suite User Guide at this address + * http://www.altera.com/literature/ug/ug_vip.pdf. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * Authors: + * Ong, Hean-Loong <hean.loong.ong@intel.com> + * + */ + +#include <linux/init.h> +#include <linux/kernel.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_encoder_slave.h> +#include <drm/drm_plane_helper.h> + +static enum drm_connector_status +intelvipfb_drm_connector_detect(struct drm_connector *connector, bool force) +{ + return connector_status_connected; +} + +static void intelvipfb_drm_connector_destroy(struct drm_connector *connector) +{ + drm_connector_unregister(connector); + drm_connector_cleanup(connector); +} + +static const struct drm_connector_funcs intelvipfb_drm_connector_funcs = { + .reset = drm_atomic_helper_connector_reset, + .detect = intelvipfb_drm_connector_detect, + .fill_modes = drm_helper_probe_single_connector_modes, + .destroy = intelvipfb_drm_connector_destroy, + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, +}; + +static int intelvipfb_drm_connector_get_modes(struct drm_connector *connector) +{ + struct drm_device *drm = connector->dev; + int count; + + count = drm_add_modes_noedid(connector, drm->mode_config.max_width, + drm->mode_config.max_height); + drm_set_preferred_mode(connector, drm->mode_config.max_width, + drm->mode_config.max_height); + return count; +} + +static const struct drm_connector_helper_funcs +intelvipfb_drm_connector_helper_funcs = { + .get_modes = intelvipfb_drm_connector_get_modes, +}; + +struct drm_connector * +intelvipfb_conn_setup(struct drm_device *drm) +{ + struct drm_connector *conn; + int ret; + + conn = devm_kzalloc(drm->dev, sizeof(*conn), GFP_KERNEL); + if (IS_ERR(conn)) + return NULL; + + ret = drm_connector_init(drm, conn, &intelvipfb_drm_connector_funcs, + DRM_MODE_CONNECTOR_DisplayPort); + if (ret < 0) { + dev_err(drm->dev, "failed to initialize drm connector\n"); + ret = -ENOMEM; + goto error_connector_cleanup; + } + + conn->polled = 0; + drm_connector_helper_add(conn, &intelvipfb_drm_connector_helper_funcs); + + return conn; + +error_connector_cleanup: + drm_connector_cleanup(conn); + + return NULL; +} diff --git a/drivers/gpu/drm/ivip/intel_vip_core.c b/drivers/gpu/drm/ivip/intel_vip_core.c new file mode 100644 index 0000000..b601bb4 --- /dev/null +++ b/drivers/gpu/drm/ivip/intel_vip_core.c @@ -0,0 +1,160 @@ +/* + * intel_vip_core.c -- Intel Video and Image Processing(VIP) + * Frame Buffer II driver + * + * This driver supports the Intel VIP Frame Reader component. + * More info on the hardware can be found in the Intel Video + * and Image Processing Suite User Guide at this address + * http://www.altera.com/literature/ug/ug_vip.pdf. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * Authors: + * Ong, Hean-Loong <hean.loong.ong@intel.com> + * + */ + +#include <drm/drmP.h> +#include <drm/drm_atomic.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_fb_helper.h> +#include <drm/drm_fb_cma_helper.h> +#include <drm/drm_gem_cma_helper.h> +#include <drm/drm_plane_helper.h> +#include <drm/drm_simple_kms_helper.h> +#include <drm/drm_gem_framebuffer_helper.h> + +#include <linux/init.h> +#include <linux/kernel.h> +#include <linux/module.h> + +#include "intel_vip_drv.h" + +static void intelvipfb_enable(struct drm_simple_display_pipe *pipe, + struct drm_crtc_state *crtc_state, struct drm_plane_state *plane_state) +{ + /* + * The frameinfo variable has to correspond to the size of the VIP Suite + * Frame Reader register 7 which will determine the maximum size used + * in this frameinfo + */ + + u32 frameinfo; + struct intelvipfb_priv *priv = pipe->plane.dev->dev_private; + void __iomem *base = priv->base; + struct drm_plane_state *state = pipe->plane.state; + dma_addr_t addr; + + addr = drm_fb_cma_get_gem_addr(state->fb, state, 0); + + frameinfo = + readl(base + INTELVIPFB_FRAME_READER) & 0x00ffffff; + writel(frameinfo, base + INTELVIPFB_FRAME_INFO); + writel(addr, base + INTELVIPFB_FRAME_START); + /* Finally set the control register to 1 to start streaming */ + writel(1, base + INTELVIPFB_CONTROL); +} + +static void intelvipfb_disable(struct drm_simple_display_pipe *pipe) +{ + struct intelvipfb_priv *priv = pipe->plane.dev->dev_private; + void __iomem *base = priv->base; + /* set the control register to 0 to stop streaming */ + writel(0, base + INTELVIPFB_CONTROL); +} + +static const struct drm_mode_config_funcs intelvipfb_mode_config_funcs = { + .fb_create = drm_gem_fb_create, + .atomic_check = drm_atomic_helper_check, + .atomic_commit = drm_atomic_helper_commit, +}; + +static void intelvipfb_setup_mode_config(struct drm_device *drm) +{ + drm_mode_config_init(drm); + drm->mode_config.funcs = &intelvipfb_mode_config_funcs; +} + +static int intelvipfb_pipe_prepare_fb(struct drm_simple_display_pipe *pipe, + struct drm_plane_state *plane_state) +{ + return drm_gem_fb_prepare_fb(&pipe->plane, plane_state); +} + +static struct drm_simple_display_pipe_funcs fbpriv_funcs = { + .prepare_fb = intelvipfb_pipe_prepare_fb, + .enable = intelvipfb_enable, + .disable = intelvipfb_disable +}; + +int intelvipfb_probe(struct device *dev) +{ + int retval; + struct drm_device *drm; + struct intelvipfb_priv *fbpriv = dev_get_drvdata(dev); + struct drm_connector *connector; + u32 formats[] = {DRM_FORMAT_XRGB8888}; + + drm = fbpriv->drm; + + drm->dev_private = fbpriv; + + intelvipfb_setup_mode_config(drm); + + connector = intelvipfb_conn_setup(drm); + if (!connector) { + dev_err(drm->dev, "Connector setup failed\n"); + goto err_mode_config; + } + + retval = drm_simple_display_pipe_init(drm, &fbpriv->pipe, + &fbpriv_funcs, formats, + ARRAY_SIZE(formats), NULL, connector); + if (retval < 0) { + dev_err(drm->dev, "Cannot setup simple display pipe\n"); + goto err_mode_config; + } + + fbpriv->fbcma = drm_fbdev_cma_init(drm, + drm->mode_config.preferred_depth, + drm->mode_config.num_connector); + + drm_mode_config_reset(drm); + + drm_dev_register(drm, 0); + + return retval; + +err_mode_config: + + drm_mode_config_cleanup(drm); + return -ENODEV; +} + +int intelvipfb_remove(struct device *dev) +{ + struct intelvipfb_priv *fbpriv = dev_get_drvdata(dev); + struct drm_device *drm = fbpriv->drm; + + drm_dev_unregister(drm); + + if (fbpriv->fbcma) + drm_fbdev_cma_fini(fbpriv->fbcma); + + drm_mode_config_cleanup(drm); + drm_dev_unref(drm); + + return 0; +} + +MODULE_AUTHOR("Ong, Hean-Loong <hean.loong.ong@intel.com>"); +MODULE_DESCRIPTION("Intel VIP Frame Buffer II driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/ivip/intel_vip_drv.h b/drivers/gpu/drm/ivip/intel_vip_drv.h new file mode 100644 index 0000000..0a3555d --- /dev/null +++ b/drivers/gpu/drm/ivip/intel_vip_drv.h @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2017 Intel Corporation. + * + * Intel Video and Image Processing(VIP) Frame Buffer II driver. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see <http://www.gnu.org/licenses/>. + * + * Authors: + * Ong, Hean-Loong <hean.loong.ong@intel.com> + * + */ +#ifndef _INTEL_VIP_DRV_H +#define _INTEL_VIP_DRV_H + +#define DRIVER_NAME "intelvipfb" +#define BYTES_PER_PIXEL 4 +#define CRTC_NUM 1 +#define CONN_NUM 1 + +/* control registers */ +#define INTELVIPFB_CONTROL 0 +#define INTELVIPFB_STATUS 0x4 +#define INTELVIPFB_INTERRUPT 0x8 +#define INTELVIPFB_FRAME_COUNTER 0xC +#define INTELVIPFB_FRAME_DROP 0x10 +#define INTELVIPFB_FRAME_INFO 0x14 +#define INTELVIPFB_FRAME_START 0x18 +#define INTELVIPFB_FRAME_READER 0x1C + +int intelvipfb_probe(struct device *dev); +int intelvipfb_remove(struct device *dev); +int intelvipfb_setup_crtc(struct drm_device *drm); +struct drm_connector *intelvipfb_conn_setup(struct drm_device *drm); + +struct intelvipfb_priv { + struct drm_simple_display_pipe pipe; + struct drm_fbdev_cma *fbcma; + struct drm_device *drm; + void __iomem *base; +}; + +#endif diff --git a/drivers/gpu/drm/ivip/intel_vip_of.c b/drivers/gpu/drm/ivip/intel_vip_of.c new file mode 100644 index 0000000..47302f9 --- /dev/null +++ b/drivers/gpu/drm/ivip/intel_vip_of.c @@ -0,0 +1,193 @@ +/* + * intel_vip_of.c -- Intel Video and Image Processing(VIP) + * Frame Buffer II driver + * + * This driver supports the Intel VIP Frame Reader component. + * More info on the hardware can be found in the Intel Video + * and Image Processing Suite User Guide at this address + * http://www.altera.com/literature/ug/ug_vip.pdf. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * Authors: + * Ong, Hean-Loong <hean.loong.ong@intel.com> + * + */ +#include <drm/drm_fb_helper.h> +#include <drm/drm_fb_cma_helper.h> +#include <drm/drm_gem_cma_helper.h> +#include <drm/drm_of.h> +#include <drm/drm_simple_kms_helper.h> + +#include <linux/component.h> +#include <linux/init.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/platform_device.h> + +#include "intel_vip_drv.h" + +DEFINE_DRM_GEM_CMA_FOPS(drm_fops); + +static void intelvipfb_lastclose(struct drm_device *drm) +{ + struct intelvipfb_priv *priv = drm->dev_private; + + drm_fbdev_cma_restore_mode(priv->fbcma); +} + +static struct drm_driver intelvipfb_drm = { + .driver_features = + DRIVER_MODESET | DRIVER_GEM | + DRIVER_PRIME | DRIVER_ATOMIC, + .gem_free_object_unlocked = drm_gem_cma_free_object, + .gem_vm_ops = &drm_gem_cma_vm_ops, + .dumb_create = drm_gem_cma_dumb_create, + .dumb_destroy = drm_gem_dumb_destroy, + .prime_handle_to_fd = drm_gem_prime_handle_to_fd, + .prime_fd_to_handle = drm_gem_prime_fd_to_handle, + .gem_prime_export = drm_gem_prime_export, + .gem_prime_import = drm_gem_prime_import, + .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table, + .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, + .gem_prime_vmap = drm_gem_cma_prime_vmap, + .gem_prime_vunmap = drm_gem_cma_prime_vunmap, + .gem_prime_mmap = drm_gem_cma_prime_mmap, + .lastclose = intelvipfb_lastclose, + .name = DRIVER_NAME, + .date = "20170729", + .desc = "Intel FPGA VIP SUITE", + .major = 1, + .minor = 0, + .ioctls = NULL, + .patchlevel = 0, + .fops = &drm_fops, +}; + +/* + * Setting up information derived from OF Device Tree Nodes + * max-width, max-height, bits per pixel, memory port width + */ + +static int intelvipfb_drm_setup(struct device *dev, + struct intelvipfb_priv *fbpriv) +{ + struct drm_device *drm = fbpriv->drm; + struct device_node *np = dev->of_node; + int mem_word_width; + int max_h, max_w; + int ret; + + ret = of_property_read_u32(np, "altr,max-width", &max_w); + if (ret) { + dev_err(dev, + "Missing required parameter 'altr,max-width'"); + return ret; + } + + ret = of_property_read_u32(np, "altr,max-height", &max_h); + if (ret) { + dev_err(dev, + "Missing required parameter 'altr,max-height'"); + return ret; + } + + ret = of_property_read_u32(np, "altr,mem-port-width", &mem_word_width); + if (ret) { + dev_err(dev, "Missing required parameter 'altr,mem-port-width '"); + return ret; + } + + if (!(mem_word_width >= 32 && mem_word_width % 32 == 0)) { + dev_err(dev, + "mem-word-width is set to %i. must be >= 32 and multiple of 32.", + mem_word_width); + return -ENODEV; + } + + drm->mode_config.min_width = 640; + drm->mode_config.min_height = 480; + drm->mode_config.max_width = max_w; + drm->mode_config.max_height = max_h; + drm->mode_config.preferred_depth = 32; + + return 0; +} + +static int intelvipfb_of_probe(struct platform_device *pdev) +{ + int retval; + struct resource *reg_res; + struct intelvipfb_priv *fbpriv; + struct device *dev = &pdev->dev; + struct drm_device *drm; + + fbpriv = devm_kzalloc(dev, sizeof(*fbpriv), GFP_KERNEL); + if (!fbpriv) + return -ENOMEM; + + /*setup DRM */ + drm = drm_dev_alloc(&intelvipfb_drm, dev); + if (IS_ERR(drm)) + return PTR_ERR(drm); + + retval = dma_set_mask_and_coherent(drm->dev, DMA_BIT_MASK(32)); + if (retval) + return -ENODEV; + + fbpriv->drm = drm; + + reg_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!reg_res) + return -ENOMEM; + + fbpriv->base = devm_ioremap_resource(dev, reg_res); + + if (IS_ERR(fbpriv->base)) { + dev_err(dev, "devm_ioremap_resource failed\n"); + retval = PTR_ERR(fbpriv->base); + return -ENOMEM; + } + + intelvipfb_drm_setup(dev, fbpriv); + + dev_set_drvdata(dev, fbpriv); + + return intelvipfb_probe(dev); +} + +static int intelvipfb_of_remove(struct platform_device *pdev) +{ + return intelvipfb_remove(&pdev->dev); +} + +/* + * The name vip-frame-buffer-2.0 is derived from + * http://www.altera.com/literature/ug/ug_vip.pdf + * frame buffer IP cores section 14 + */ + +static const struct of_device_id intelvipfb_of_match[] = { + { .compatible = "altr,vip-frame-buffer-2.0" }, + {}, +}; + +MODULE_DEVICE_TABLE(of, intelvipfb_of_match); + +static struct platform_driver intelvipfb_driver = { + .probe = intelvipfb_of_probe, + .remove = intelvipfb_of_remove, + .driver = { + .name = DRIVER_NAME, + .of_match_table = intelvipfb_of_match, + }, +}; + +module_platform_driver(intelvipfb_driver); -- 1.7.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH10 3/3] ARM:drm ivip Intel FPGA Video and Image Processing Suite 2018-08-14 8:57 ` [PATCH10 3/3] ARM:drm ivip Intel FPGA Video and Image Processing Suite Hean-Loong, Ong @ 2018-08-14 15:46 ` Dinh Nguyen 2018-08-15 1:44 ` Ong, Hean Loong 2018-08-15 12:26 ` Noralf Trønnes 1 sibling, 1 reply; 9+ messages in thread From: Dinh Nguyen @ 2018-08-14 15:46 UTC (permalink / raw) To: linux-arm-kernel On 08/14/2018 03:57 AM, Hean-Loong, Ong wrote: > From: Ong Hean Loong <hean.loong.ong@intel.com> > > Driver for Intel FPGA Video and Image Processing Suite Frame Buffer II. > The driver only supports the Intel Arria10 devkit and its variants. Why only Arria10? That's not true is it? I remember running a version of this on the Cyclone5 SoCKit. Dinh ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH10 3/3] ARM:drm ivip Intel FPGA Video and Image Processing Suite 2018-08-14 15:46 ` Dinh Nguyen @ 2018-08-15 1:44 ` Ong, Hean Loong 0 siblings, 0 replies; 9+ messages in thread From: Ong, Hean Loong @ 2018-08-15 1:44 UTC (permalink / raw) To: linux-arm-kernel On Tue, 2018-08-14 at 10:46 -0500, Dinh Nguyen wrote: > > On 08/14/2018 03:57 AM, Hean-Loong, Ong wrote: > > > > From: Ong Hean Loong <hean.loong.ong@intel.com> > > > > Driver for Intel FPGA Video and Image Processing Suite Frame Buffer > > II. > > The driver only supports the Intel Arria10 devkit and its variants. > Why only Arria10? That's not true is it? I remember running a version > of > this on the Cyclone5 SoCKit. > During Cyclone5 SoCkit it was the older version of the Frambuffer. From the IP owner the FrameBuffer II design is only available for Arria10 > Dinh > ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH10 3/3] ARM:drm ivip Intel FPGA Video and Image Processing Suite 2018-08-14 8:57 ` [PATCH10 3/3] ARM:drm ivip Intel FPGA Video and Image Processing Suite Hean-Loong, Ong 2018-08-14 15:46 ` Dinh Nguyen @ 2018-08-15 12:26 ` Noralf Trønnes 2018-08-16 8:33 ` Ong, Hean Loong 1 sibling, 1 reply; 9+ messages in thread From: Noralf Trønnes @ 2018-08-15 12:26 UTC (permalink / raw) To: linux-arm-kernel Den 14.08.2018 10.57, skrev Hean-Loong, Ong: > From: Ong Hean Loong <hean.loong.ong@intel.com> > > Driver for Intel FPGA Video and Image Processing Suite Frame Buffer II. > The driver only supports the Intel Arria10 devkit and its variants. > This driver can be either loaded staticlly or in modules. > The OF device tree binding is located at: > Documentation/devicetree/bindings/display/altr,vip-fb2.txt > > Signed-off-by: Ong Hean Loong <hean.loong.ong@intel.com> > --- > drivers/gpu/drm/Kconfig | 2 + > drivers/gpu/drm/Makefile | 1 + > drivers/gpu/drm/ivip/Kconfig | 14 +++ > drivers/gpu/drm/ivip/Makefile | 9 ++ > drivers/gpu/drm/ivip/intel_vip_conn.c | 95 ++++++++++++++++ > drivers/gpu/drm/ivip/intel_vip_core.c | 161 +++++++++++++++++++++++++++ > drivers/gpu/drm/ivip/intel_vip_drv.h | 52 +++++++++ > drivers/gpu/drm/ivip/intel_vip_of.c | 193 +++++++++++++++++++++++++++++++++ > 8 files changed, 527 insertions(+), 0 deletions(-) > create mode 100644 drivers/gpu/drm/ivip/Kconfig > create mode 100644 drivers/gpu/drm/ivip/Makefile > create mode 100644 drivers/gpu/drm/ivip/intel_vip_conn.c > create mode 100644 drivers/gpu/drm/ivip/intel_vip_core.c > create mode 100644 drivers/gpu/drm/ivip/intel_vip_drv.h > create mode 100644 drivers/gpu/drm/ivip/intel_vip_of.c > > diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig > index cb88528..6b2845b 100644 > --- a/drivers/gpu/drm/Kconfig > +++ b/drivers/gpu/drm/Kconfig > @@ -215,6 +215,8 @@ source "drivers/gpu/drm/nouveau/Kconfig" > > source "drivers/gpu/drm/i915/Kconfig" > > +source "drivers/gpu/drm/ivip/Kconfig" > + > config DRM_VGEM > tristate "Virtual GEM provider" > depends on DRM > diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile > index a6771ce..57205d8 100644 > --- a/drivers/gpu/drm/Makefile > +++ b/drivers/gpu/drm/Makefile > @@ -61,6 +61,7 @@ obj-$(CONFIG_DRM_AMDGPU)+= amd/amdgpu/ > obj-$(CONFIG_DRM_MGA) += mga/ > obj-$(CONFIG_DRM_I810) += i810/ > obj-$(CONFIG_DRM_I915) += i915/ > +obj-$(CONFIG_DRM_IVIP) += ivip/ > obj-$(CONFIG_DRM_MGAG200) += mgag200/ > obj-$(CONFIG_DRM_V3D) += v3d/ > obj-$(CONFIG_DRM_VC4) += vc4/ > diff --git a/drivers/gpu/drm/ivip/Kconfig b/drivers/gpu/drm/ivip/Kconfig > new file mode 100644 > index 0000000..1d08b90 > --- /dev/null > +++ b/drivers/gpu/drm/ivip/Kconfig > @@ -0,0 +1,14 @@ > +config DRM_IVIP > + tristate "Intel FGPA Video and Image Processing" > + depends on DRM && OF > + select DRM_GEM_CMA_HELPER > + select DRM_KMS_HELPER > + select DRM_KMS_FB_HELPER > + select DRM_KMS_CMA_HELPER > + help > + Choose this option if you have an Intel FPGA Arria 10 system > + and above with an Intel Display Port IP. This does not support > + legacy Intel FPGA Cyclone V display port. Currently only single > + frame buffer is supported. Note that ACPI and X_86 architecture > + is not supported for Arria10. If M is selected the module will be > + called ivip. > diff --git a/drivers/gpu/drm/ivip/Makefile b/drivers/gpu/drm/ivip/Makefile > new file mode 100644 > index 0000000..cc55b04 > --- /dev/null > +++ b/drivers/gpu/drm/ivip/Makefile > @@ -0,0 +1,9 @@ > +# > +# Makefile for the drm device driver. This driver provides support for the > +# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. > + > +ccflags-y := -Iinclude/drm This shouldn't be necessary AFAIK. > + > +obj-$(CONFIG_DRM_IVIP) += ivip.o > +ivip-objs := intel_vip_of.o intel_vip_core.o \ > + intel_vip_conn.o > diff --git a/drivers/gpu/drm/ivip/intel_vip_conn.c b/drivers/gpu/drm/ivip/intel_vip_conn.c > new file mode 100644 > index 0000000..46bb04c > --- /dev/null > +++ b/drivers/gpu/drm/ivip/intel_vip_conn.c > @@ -0,0 +1,95 @@ Please add an SPDX indentifier at the top of your files and you can drop the license text. Header files use this: /* SPDX-License-Identifier: GPL-2.0 */ C-files uses c++ comment due to reasons: // SPDX-License-Identifier: GPL-2.0 > +/* > + * intel_vip_conn.c -- Intel Video and Image Processing(VIP) > + * Frame Buffer II driver > + * > + * This driver supports the Intel VIP Frame Reader component. > + * More info on the hardware can be found in the Intel Video > + * and Image Processing Suite User Guide at this address > + * http://www.altera.com/literature/ug/ug_vip.pdf. > + * > + * This program is free software; you can redistribute it and/or modify it > + * under the terms and conditions of the GNU General Public License, > + * version 2, as published by the Free Software Foundation. > + * > + * This program is distributed in the hope it will be useful, but WITHOUT > + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or > + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for > + * more details. > + * > + * Authors: > + * Ong, Hean-Loong <hean.loong.ong@intel.com> > + * > + */ > + > +#include <linux/init.h> > +#include <linux/kernel.h> > +#include <drm/drm_atomic_helper.h> > +#include <drm/drm_crtc_helper.h> > +#include <drm/drm_encoder_slave.h> > +#include <drm/drm_plane_helper.h> > + > +static enum drm_connector_status > +intelvipfb_drm_connector_detect(struct drm_connector *connector, bool force) > +{ > + return connector_status_connected; > +} > + > +static void intelvipfb_drm_connector_destroy(struct drm_connector *connector) > +{ > + drm_connector_unregister(connector); > + drm_connector_cleanup(connector); > +} > + > +static const struct drm_connector_funcs intelvipfb_drm_connector_funcs = { > + .reset = drm_atomic_helper_connector_reset, > + .detect = intelvipfb_drm_connector_detect, > + .fill_modes = drm_helper_probe_single_connector_modes, > + .destroy = intelvipfb_drm_connector_destroy, > + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, > +}; > + > +static int intelvipfb_drm_connector_get_modes(struct drm_connector *connector) > +{ > + struct drm_device *drm = connector->dev; > + int count; > + > + count = drm_add_modes_noedid(connector, drm->mode_config.max_width, > + drm->mode_config.max_height); > + drm_set_preferred_mode(connector, drm->mode_config.max_width, > + drm->mode_config.max_height); > + return count; > +} > + > +static const struct drm_connector_helper_funcs > +intelvipfb_drm_connector_helper_funcs = { > + .get_modes = intelvipfb_drm_connector_get_modes, > +}; > + > +struct drm_connector * > +intelvipfb_conn_setup(struct drm_device *drm) > +{ > + struct drm_connector *conn; > + int ret; > + > + conn = devm_kzalloc(drm->dev, sizeof(*conn), GFP_KERNEL); > + if (IS_ERR(conn)) > + return NULL; > + > + ret = drm_connector_init(drm, conn, &intelvipfb_drm_connector_funcs, > + DRM_MODE_CONNECTOR_DisplayPort); > + if (ret < 0) { > + dev_err(drm->dev, "failed to initialize drm connector\n"); > + ret = -ENOMEM; > + goto error_connector_cleanup; > + } > + > + conn->polled = 0; No need to set this, it is already zero from the allocation. > + drm_connector_helper_add(conn, &intelvipfb_drm_connector_helper_funcs); > + > + return conn; > + > +error_connector_cleanup: > + drm_connector_cleanup(conn); > + > + return NULL; > +} > diff --git a/drivers/gpu/drm/ivip/intel_vip_core.c b/drivers/gpu/drm/ivip/intel_vip_core.c > new file mode 100644 > index 0000000..b601bb4 > --- /dev/null > +++ b/drivers/gpu/drm/ivip/intel_vip_core.c > @@ -0,0 +1,160 @@ > +/* > + * intel_vip_core.c -- Intel Video and Image Processing(VIP) > + * Frame Buffer II driver > + * > + * This driver supports the Intel VIP Frame Reader component. > + * More info on the hardware can be found in the Intel Video > + * and Image Processing Suite User Guide at this address > + * http://www.altera.com/literature/ug/ug_vip.pdf. > + * > + * This program is free software; you can redistribute it and/or modify it > + * under the terms and conditions of the GNU General Public License, > + * version 2, as published by the Free Software Foundation. > + * > + * This program is distributed in the hope it will be useful, but WITHOUT > + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or > + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for > + * more details. > + * > + * Authors: > + * Ong, Hean-Loong <hean.loong.ong@intel.com> > + * > + */ > + > +#include <drm/drmP.h> > +#include <drm/drm_atomic.h> > +#include <drm/drm_atomic_helper.h> > +#include <drm/drm_crtc_helper.h> > +#include <drm/drm_fb_helper.h> > +#include <drm/drm_fb_cma_helper.h> > +#include <drm/drm_gem_cma_helper.h> > +#include <drm/drm_plane_helper.h> > +#include <drm/drm_simple_kms_helper.h> > +#include <drm/drm_gem_framebuffer_helper.h> > + > +#include <linux/init.h> > +#include <linux/kernel.h> > +#include <linux/module.h> > + > +#include "intel_vip_drv.h" > + > +static void intelvipfb_enable(struct drm_simple_display_pipe *pipe, > + struct drm_crtc_state *crtc_state, struct drm_plane_state *plane_state) > +{ > + /* > + * The frameinfo variable has to correspond to the size of the VIP Suite > + * Frame Reader register 7 which will determine the maximum size used > + * in this frameinfo > + */ > + > + u32 frameinfo; > + struct intelvipfb_priv *priv = pipe->plane.dev->dev_private; > + void __iomem *base = priv->base; > + struct drm_plane_state *state = pipe->plane.state; > + dma_addr_t addr; > + > + addr = drm_fb_cma_get_gem_addr(state->fb, state, 0); > + > + frameinfo = > + readl(base + INTELVIPFB_FRAME_READER) & 0x00ffffff; > + writel(frameinfo, base + INTELVIPFB_FRAME_INFO); > + writel(addr, base + INTELVIPFB_FRAME_START); > + /* Finally set the control register to 1 to start streaming */ > + writel(1, base + INTELVIPFB_CONTROL); > +} > + > +static void intelvipfb_disable(struct drm_simple_display_pipe *pipe) > +{ > + struct intelvipfb_priv *priv = pipe->plane.dev->dev_private; > + void __iomem *base = priv->base; > + /* set the control register to 0 to stop streaming */ > + writel(0, base + INTELVIPFB_CONTROL); > +} > + > +static const struct drm_mode_config_funcs intelvipfb_mode_config_funcs = { > + .fb_create = drm_gem_fb_create, > + .atomic_check = drm_atomic_helper_check, > + .atomic_commit = drm_atomic_helper_commit, > +}; > + > +static void intelvipfb_setup_mode_config(struct drm_device *drm) > +{ > + drm_mode_config_init(drm); > + drm->mode_config.funcs = &intelvipfb_mode_config_funcs; > +} > + > +static int intelvipfb_pipe_prepare_fb(struct drm_simple_display_pipe *pipe, > + struct drm_plane_state *plane_state) > +{ > + return drm_gem_fb_prepare_fb(&pipe->plane, plane_state); > +} > + > +static struct drm_simple_display_pipe_funcs fbpriv_funcs = { > + .prepare_fb = intelvipfb_pipe_prepare_fb, You can use drm_gem_fb_simple_display_pipe_prepare_fb(), no need to roll your own. > + .enable = intelvipfb_enable, > + .disable = intelvipfb_disable > +}; > + > +int intelvipfb_probe(struct device *dev) > +{ > + int retval; > + struct drm_device *drm; > + struct intelvipfb_priv *fbpriv = dev_get_drvdata(dev); > + struct drm_connector *connector; > + u32 formats[] = {DRM_FORMAT_XRGB8888}; > + > + drm = fbpriv->drm; > + > + drm->dev_private = fbpriv; > + > + intelvipfb_setup_mode_config(drm); > + > + connector = intelvipfb_conn_setup(drm); > + if (!connector) { > + dev_err(drm->dev, "Connector setup failed\n"); > + goto err_mode_config; > + } > + > + retval = drm_simple_display_pipe_init(drm, &fbpriv->pipe, > + &fbpriv_funcs, formats, > + ARRAY_SIZE(formats), NULL, connector); > + if (retval < 0) { > + dev_err(drm->dev, "Cannot setup simple display pipe\n"); > + goto err_mode_config; > + } > + > + fbpriv->fbcma = drm_fbdev_cma_init(drm, > + drm->mode_config.preferred_depth, > + drm->mode_config.num_connector); Please use drm_fbdev_generic_setup() for fbdev emulation. It tears down automatically on drm_dev_unregister() and you don't need the drm_driver->lastclose hook. All drivers that use drm_fbdev_cma_init() will move to this shortly. Noralf. > + > + drm_mode_config_reset(drm); > + > + drm_dev_register(drm, 0); > + > + return retval; > + > +err_mode_config: > + > + drm_mode_config_cleanup(drm); > + return -ENODEV; > +} > + > +int intelvipfb_remove(struct device *dev) > +{ > + struct intelvipfb_priv *fbpriv = dev_get_drvdata(dev); > + struct drm_device *drm = fbpriv->drm; > + > + drm_dev_unregister(drm); > + > + if (fbpriv->fbcma) > + drm_fbdev_cma_fini(fbpriv->fbcma); > + > + drm_mode_config_cleanup(drm); > + drm_dev_unref(drm); > + > + return 0; > +} > + > +MODULE_AUTHOR("Ong, Hean-Loong <hean.loong.ong@intel.com>"); > +MODULE_DESCRIPTION("Intel VIP Frame Buffer II driver"); > +MODULE_LICENSE("GPL v2"); > diff --git a/drivers/gpu/drm/ivip/intel_vip_drv.h b/drivers/gpu/drm/ivip/intel_vip_drv.h > new file mode 100644 > index 0000000..0a3555d > --- /dev/null > +++ b/drivers/gpu/drm/ivip/intel_vip_drv.h > @@ -0,0 +1,52 @@ > +/* > + * Copyright (C) 2017 Intel Corporation. > + * > + * Intel Video and Image Processing(VIP) Frame Buffer II driver. > + * > + * This program is free software; you can redistribute it and/or modify it > + * under the terms and conditions of the GNU General Public License, > + * version 2, as published by the Free Software Foundation. > + * > + * This program is distributed in the hope it will be useful, but WITHOUT > + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or > + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for > + * more details. > + * > + * You should have received a copy of the GNU General Public License along with > + * this program. If not, see <http://www.gnu.org/licenses/>. > + * > + * Authors: > + * Ong, Hean-Loong <hean.loong.ong@intel.com> > + * > + */ > +#ifndef _INTEL_VIP_DRV_H > +#define _INTEL_VIP_DRV_H > + > +#define DRIVER_NAME "intelvipfb" > +#define BYTES_PER_PIXEL 4 > +#define CRTC_NUM 1 > +#define CONN_NUM 1 > + > +/* control registers */ > +#define INTELVIPFB_CONTROL 0 > +#define INTELVIPFB_STATUS 0x4 > +#define INTELVIPFB_INTERRUPT 0x8 > +#define INTELVIPFB_FRAME_COUNTER 0xC > +#define INTELVIPFB_FRAME_DROP 0x10 > +#define INTELVIPFB_FRAME_INFO 0x14 > +#define INTELVIPFB_FRAME_START 0x18 > +#define INTELVIPFB_FRAME_READER 0x1C > + > +int intelvipfb_probe(struct device *dev); > +int intelvipfb_remove(struct device *dev); > +int intelvipfb_setup_crtc(struct drm_device *drm); > +struct drm_connector *intelvipfb_conn_setup(struct drm_device *drm); > + > +struct intelvipfb_priv { > + struct drm_simple_display_pipe pipe; > + struct drm_fbdev_cma *fbcma; > + struct drm_device *drm; > + void __iomem *base; > +}; > + > +#endif > diff --git a/drivers/gpu/drm/ivip/intel_vip_of.c b/drivers/gpu/drm/ivip/intel_vip_of.c > new file mode 100644 > index 0000000..47302f9 > --- /dev/null > +++ b/drivers/gpu/drm/ivip/intel_vip_of.c > @@ -0,0 +1,193 @@ > +/* > + * intel_vip_of.c -- Intel Video and Image Processing(VIP) > + * Frame Buffer II driver > + * > + * This driver supports the Intel VIP Frame Reader component. > + * More info on the hardware can be found in the Intel Video > + * and Image Processing Suite User Guide at this address > + * http://www.altera.com/literature/ug/ug_vip.pdf. > + * > + * This program is free software; you can redistribute it and/or modify it > + * under the terms and conditions of the GNU General Public License, > + * version 2, as published by the Free Software Foundation. > + * > + * This program is distributed in the hope it will be useful, but WITHOUT > + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or > + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for > + * more details. > + * > + * Authors: > + * Ong, Hean-Loong <hean.loong.ong@intel.com> > + * > + */ > +#include <drm/drm_fb_helper.h> > +#include <drm/drm_fb_cma_helper.h> > +#include <drm/drm_gem_cma_helper.h> > +#include <drm/drm_of.h> > +#include <drm/drm_simple_kms_helper.h> > + > +#include <linux/component.h> > +#include <linux/init.h> > +#include <linux/kernel.h> > +#include <linux/module.h> > +#include <linux/platform_device.h> > + > +#include "intel_vip_drv.h" > + > +DEFINE_DRM_GEM_CMA_FOPS(drm_fops); > + > +static void intelvipfb_lastclose(struct drm_device *drm) > +{ > + struct intelvipfb_priv *priv = drm->dev_private; > + > + drm_fbdev_cma_restore_mode(priv->fbcma); > +} > + > +static struct drm_driver intelvipfb_drm = { > + .driver_features = > + DRIVER_MODESET | DRIVER_GEM | > + DRIVER_PRIME | DRIVER_ATOMIC, > + .gem_free_object_unlocked = drm_gem_cma_free_object, > + .gem_vm_ops = &drm_gem_cma_vm_ops, > + .dumb_create = drm_gem_cma_dumb_create, > + .dumb_destroy = drm_gem_dumb_destroy, > + .prime_handle_to_fd = drm_gem_prime_handle_to_fd, > + .prime_fd_to_handle = drm_gem_prime_fd_to_handle, > + .gem_prime_export = drm_gem_prime_export, > + .gem_prime_import = drm_gem_prime_import, > + .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table, > + .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, > + .gem_prime_vmap = drm_gem_cma_prime_vmap, > + .gem_prime_vunmap = drm_gem_cma_prime_vunmap, > + .gem_prime_mmap = drm_gem_cma_prime_mmap, > + .lastclose = intelvipfb_lastclose, > + .name = DRIVER_NAME, > + .date = "20170729", > + .desc = "Intel FPGA VIP SUITE", > + .major = 1, > + .minor = 0, > + .ioctls = NULL, > + .patchlevel = 0, > + .fops = &drm_fops, > +}; > + > +/* > + * Setting up information derived from OF Device Tree Nodes > + * max-width, max-height, bits per pixel, memory port width > + */ > + > +static int intelvipfb_drm_setup(struct device *dev, > + struct intelvipfb_priv *fbpriv) > +{ > + struct drm_device *drm = fbpriv->drm; > + struct device_node *np = dev->of_node; > + int mem_word_width; > + int max_h, max_w; > + int ret; > + > + ret = of_property_read_u32(np, "altr,max-width", &max_w); > + if (ret) { > + dev_err(dev, > + "Missing required parameter 'altr,max-width'"); > + return ret; > + } > + > + ret = of_property_read_u32(np, "altr,max-height", &max_h); > + if (ret) { > + dev_err(dev, > + "Missing required parameter 'altr,max-height'"); > + return ret; > + } > + > + ret = of_property_read_u32(np, "altr,mem-port-width", &mem_word_width); > + if (ret) { > + dev_err(dev, "Missing required parameter 'altr,mem-port-width '"); > + return ret; > + } > + > + if (!(mem_word_width >= 32 && mem_word_width % 32 == 0)) { > + dev_err(dev, > + "mem-word-width is set to %i. must be >= 32 and multiple of 32.", > + mem_word_width); > + return -ENODEV; > + } > + > + drm->mode_config.min_width = 640; > + drm->mode_config.min_height = 480; > + drm->mode_config.max_width = max_w; > + drm->mode_config.max_height = max_h; > + drm->mode_config.preferred_depth = 32; > + > + return 0; > +} > + > +static int intelvipfb_of_probe(struct platform_device *pdev) > +{ > + int retval; > + struct resource *reg_res; > + struct intelvipfb_priv *fbpriv; > + struct device *dev = &pdev->dev; > + struct drm_device *drm; > + > + fbpriv = devm_kzalloc(dev, sizeof(*fbpriv), GFP_KERNEL); > + if (!fbpriv) > + return -ENOMEM; > + > + /*setup DRM */ > + drm = drm_dev_alloc(&intelvipfb_drm, dev); > + if (IS_ERR(drm)) > + return PTR_ERR(drm); > + > + retval = dma_set_mask_and_coherent(drm->dev, DMA_BIT_MASK(32)); > + if (retval) > + return -ENODEV; > + > + fbpriv->drm = drm; > + > + reg_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + if (!reg_res) > + return -ENOMEM; > + > + fbpriv->base = devm_ioremap_resource(dev, reg_res); > + > + if (IS_ERR(fbpriv->base)) { > + dev_err(dev, "devm_ioremap_resource failed\n"); > + retval = PTR_ERR(fbpriv->base); > + return -ENOMEM; > + } > + > + intelvipfb_drm_setup(dev, fbpriv); > + > + dev_set_drvdata(dev, fbpriv); > + > + return intelvipfb_probe(dev); > +} > + > +static int intelvipfb_of_remove(struct platform_device *pdev) > +{ > + return intelvipfb_remove(&pdev->dev); > +} > + > +/* > + * The name vip-frame-buffer-2.0 is derived from > + * http://www.altera.com/literature/ug/ug_vip.pdf > + * frame buffer IP cores section 14 > + */ > + > +static const struct of_device_id intelvipfb_of_match[] = { > + { .compatible = "altr,vip-frame-buffer-2.0" }, > + {}, > +}; > + > +MODULE_DEVICE_TABLE(of, intelvipfb_of_match); > + > +static struct platform_driver intelvipfb_driver = { > + .probe = intelvipfb_of_probe, > + .remove = intelvipfb_of_remove, > + .driver = { > + .name = DRIVER_NAME, > + .of_match_table = intelvipfb_of_match, > + }, > +}; > + > +module_platform_driver(intelvipfb_driver); ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH10 3/3] ARM:drm ivip Intel FPGA Video and Image Processing Suite 2018-08-15 12:26 ` Noralf Trønnes @ 2018-08-16 8:33 ` Ong, Hean Loong 2018-08-16 9:10 ` Noralf Trønnes 0 siblings, 1 reply; 9+ messages in thread From: Ong, Hean Loong @ 2018-08-16 8:33 UTC (permalink / raw) To: linux-arm-kernel On Wed, 2018-08-15 at 14:26 +0200, Noralf Tr?nnes wrote: > Den 14.08.2018 10.57, skrev Hean-Loong, Ong: > > > > From: Ong Hean Loong <hean.loong.ong@intel.com> > > > > Driver for Intel FPGA Video and Image Processing Suite Frame Buffer > > II. > > The driver only supports the Intel Arria10 devkit and its variants. > > This driver can be either loaded staticlly or in modules. > > The OF device tree binding is located at: > > Documentation/devicetree/bindings/display/altr,vip-fb2.txt > > > > Signed-off-by: Ong Hean Loong <hean.loong.ong@intel.com> > > --- > > ? drivers/gpu/drm/Kconfig???????????????|????2 + > > ? drivers/gpu/drm/Makefile??????????????|????1 + > > ? drivers/gpu/drm/ivip/Kconfig??????????|???14 +++ > > ? drivers/gpu/drm/ivip/Makefile?????????|????9 ++ > > ? drivers/gpu/drm/ivip/intel_vip_conn.c |???95 ++++++++++++++++ > > ? drivers/gpu/drm/ivip/intel_vip_core.c |??161 > > +++++++++++++++++++++++++++ > > ? drivers/gpu/drm/ivip/intel_vip_drv.h??|???52 +++++++++ > > ? drivers/gpu/drm/ivip/intel_vip_of.c???|??193 > > +++++++++++++++++++++++++++++++++ > > ? 8 files changed, 527 insertions(+), 0 deletions(-) > > ? create mode 100644 drivers/gpu/drm/ivip/Kconfig > > ? create mode 100644 drivers/gpu/drm/ivip/Makefile > > ? create mode 100644 drivers/gpu/drm/ivip/intel_vip_conn.c > > ? create mode 100644 drivers/gpu/drm/ivip/intel_vip_core.c > > ? create mode 100644 drivers/gpu/drm/ivip/intel_vip_drv.h > > ? create mode 100644 drivers/gpu/drm/ivip/intel_vip_of.c > > > > diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig > > index cb88528..6b2845b 100644 > > --- a/drivers/gpu/drm/Kconfig > > +++ b/drivers/gpu/drm/Kconfig > > @@ -215,6 +215,8 @@ source "drivers/gpu/drm/nouveau/Kconfig" > > ?? > > ? source "drivers/gpu/drm/i915/Kconfig" > > ?? > > +source "drivers/gpu/drm/ivip/Kconfig" > > + > > ? config DRM_VGEM > > ?? tristate "Virtual GEM provider" > > ?? depends on DRM > > diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile > > index a6771ce..57205d8 100644 > > --- a/drivers/gpu/drm/Makefile > > +++ b/drivers/gpu/drm/Makefile > > @@ -61,6 +61,7 @@ obj-$(CONFIG_DRM_AMDGPU)+= amd/amdgpu/ > > ? obj-$(CONFIG_DRM_MGA) += mga/ > > ? obj-$(CONFIG_DRM_I810) += i810/ > > ? obj-$(CONFIG_DRM_I915) += i915/ > > +obj-$(CONFIG_DRM_IVIP) += ivip/ > > ? obj-$(CONFIG_DRM_MGAG200) += mgag200/ > > ? obj-$(CONFIG_DRM_V3D)??+= v3d/ > > ? obj-$(CONFIG_DRM_VC4)??+= vc4/ > > diff --git a/drivers/gpu/drm/ivip/Kconfig > > b/drivers/gpu/drm/ivip/Kconfig > > new file mode 100644 > > index 0000000..1d08b90 > > --- /dev/null > > +++ b/drivers/gpu/drm/ivip/Kconfig > > @@ -0,0 +1,14 @@ > > +config DRM_IVIP > > +????????tristate "Intel FGPA Video and Image Processing" > > +????????depends on DRM && OF > > +????????select DRM_GEM_CMA_HELPER > > +????????select DRM_KMS_HELPER > > +????????select DRM_KMS_FB_HELPER > > +????????select DRM_KMS_CMA_HELPER > > +????????help > > + ??Choose this option if you have an Intel FPGA > > Arria 10 system > > + ??and above with an Intel Display Port IP. This > > does not support > > + ??legacy Intel FPGA Cyclone V display port. > > Currently only single > > + ??frame buffer is supported. Note that ACPI and > > X_86 architecture > > + ??is not supported for Arria10. If M is selected > > the module will be > > + ??called ivip. > > diff --git a/drivers/gpu/drm/ivip/Makefile > > b/drivers/gpu/drm/ivip/Makefile > > new file mode 100644 > > index 0000000..cc55b04 > > --- /dev/null > > +++ b/drivers/gpu/drm/ivip/Makefile > > @@ -0,0 +1,9 @@ > > +# > > +# Makefile for the drm device driver.??This driver provides > > support for the > > +# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and > > higher. > > + > > +ccflags-y := -Iinclude/drm > This shouldn't be necessary AFAIK. > > > > > + > > +obj-$(CONFIG_DRM_IVIP) += ivip.o > > +ivip-objs := intel_vip_of.o intel_vip_core.o \ > > + intel_vip_conn.o > > diff --git a/drivers/gpu/drm/ivip/intel_vip_conn.c > > b/drivers/gpu/drm/ivip/intel_vip_conn.c > > new file mode 100644 > > index 0000000..46bb04c > > --- /dev/null > > +++ b/drivers/gpu/drm/ivip/intel_vip_conn.c > > @@ -0,0 +1,95 @@ > Please add an SPDX indentifier at the top of your files and you can > drop > the license text. > > Header files use this: > /* SPDX-License-Identifier: GPL-2.0 */ > > C-files uses c++ comment due to reasons: > // SPDX-License-Identifier: GPL-2.0 > > > > > +/* > > + * intel_vip_conn.c -- Intel Video and Image Processing(VIP) > > + * Frame Buffer II driver > > + * > > + * This driver supports the Intel VIP Frame Reader component. > > + * More info on the hardware can be found in the Intel Video > > + * and Image Processing Suite User Guide at this address > > + * http://www.altera.com/literature/ug/ug_vip.pdf. > > + * > > + * This program is free software; you can redistribute it and/or > > modify it > > + * under the terms and conditions of the GNU General Public > > License, > > + * version 2, as published by the Free Software Foundation. > > + * > > + * This program is distributed in the hope it will be useful, but > > WITHOUT > > + * ANY WARRANTY; without even the implied warranty of > > MERCHANTABILITY or > > + * FITNESS FOR A PARTICULAR PURPOSE.??See the GNU General Public > > License for > > + * more details. > > + * > > + * Authors: > > + * Ong, Hean-Loong <hean.loong.ong@intel.com> > > + * > > + */ > > + > > +#include <linux/init.h> > > +#include <linux/kernel.h> > > +#include <drm/drm_atomic_helper.h> > > +#include <drm/drm_crtc_helper.h> > > +#include <drm/drm_encoder_slave.h> > > +#include <drm/drm_plane_helper.h> > > + > > +static enum drm_connector_status > > +intelvipfb_drm_connector_detect(struct drm_connector *connector, > > bool force) > > +{ > > + return connector_status_connected; > > +} > > + > > +static void intelvipfb_drm_connector_destroy(struct drm_connector > > *connector) > > +{ > > + drm_connector_unregister(connector); > > + drm_connector_cleanup(connector); > > +} > > + > > +static const struct drm_connector_funcs > > intelvipfb_drm_connector_funcs = { > > + .reset = drm_atomic_helper_connector_reset, > > + .detect = intelvipfb_drm_connector_detect, > > + .fill_modes = drm_helper_probe_single_connector_modes, > > + .destroy = intelvipfb_drm_connector_destroy, > > + .atomic_destroy_state = > > drm_atomic_helper_connector_destroy_state, > > +}; > > + > > +static int intelvipfb_drm_connector_get_modes(struct drm_connector > > *connector) > > +{ > > + struct drm_device *drm = connector->dev; > > + int count; > > + > > + count = drm_add_modes_noedid(connector, drm- > > >mode_config.max_width, > > + ?????drm->mode_config.max_height); > > + drm_set_preferred_mode(connector, drm- > > >mode_config.max_width, > > + ???????drm->mode_config.max_height); > > + return count; > > +} > > + > > +static const struct drm_connector_helper_funcs > > +intelvipfb_drm_connector_helper_funcs = { > > + .get_modes = intelvipfb_drm_connector_get_modes, > > +}; > > + > > +struct drm_connector * > > +intelvipfb_conn_setup(struct drm_device *drm) > > +{ > > + struct drm_connector *conn; > > + int ret; > > + > > + conn = devm_kzalloc(drm->dev, sizeof(*conn), GFP_KERNEL); > > + if (IS_ERR(conn)) > > + return NULL; > > + > > + ret = drm_connector_init(drm, conn, > > &intelvipfb_drm_connector_funcs, > > + ?DRM_MODE_CONNECTOR_DisplayPort); > > + if (ret < 0) { > > + dev_err(drm->dev, "failed to initialize drm > > connector\n"); > > + ret = -ENOMEM; > > + goto error_connector_cleanup; > > + } > > + > > + conn->polled = 0; > No need to set this, it is already zero from the allocation. > > > > > + drm_connector_helper_add(conn, > > &intelvipfb_drm_connector_helper_funcs); > > + > > + return conn; > > + > > +error_connector_cleanup: > > + drm_connector_cleanup(conn); > > + > > + return NULL; > > +} > > diff --git a/drivers/gpu/drm/ivip/intel_vip_core.c > > b/drivers/gpu/drm/ivip/intel_vip_core.c > > new file mode 100644 > > index 0000000..b601bb4 > > --- /dev/null > > +++ b/drivers/gpu/drm/ivip/intel_vip_core.c > > @@ -0,0 +1,160 @@ > > +/* > > + * intel_vip_core.c -- Intel Video and Image Processing(VIP) > > + * Frame Buffer II driver > > + * > > + * This driver supports the Intel VIP Frame Reader component. > > + * More info on the hardware can be found in the Intel Video > > + * and Image Processing Suite User Guide at this address > > + * http://www.altera.com/literature/ug/ug_vip.pdf. > > + * > > + * This program is free software; you can redistribute it and/or > > modify it > > + * under the terms and conditions of the GNU General Public > > License, > > + * version 2, as published by the Free Software Foundation. > > + * > > + * This program is distributed in the hope it will be useful, but > > WITHOUT > > + * ANY WARRANTY; without even the implied warranty of > > MERCHANTABILITY or > > + * FITNESS FOR A PARTICULAR PURPOSE.??See the GNU General Public > > License for > > + * more details. > > + * > > + * Authors: > > + * Ong, Hean-Loong <hean.loong.ong@intel.com> > > + * > > + */ > > + > > +#include <drm/drmP.h> > > +#include <drm/drm_atomic.h> > > +#include <drm/drm_atomic_helper.h> > > +#include <drm/drm_crtc_helper.h> > > +#include <drm/drm_fb_helper.h> > > +#include <drm/drm_fb_cma_helper.h> > > +#include <drm/drm_gem_cma_helper.h> > > +#include <drm/drm_plane_helper.h> > > +#include <drm/drm_simple_kms_helper.h> > > +#include <drm/drm_gem_framebuffer_helper.h> > > + > > +#include <linux/init.h> > > +#include <linux/kernel.h> > > +#include <linux/module.h> > > + > > +#include "intel_vip_drv.h" > > + > > +static void intelvipfb_enable(struct drm_simple_display_pipe > > *pipe, > > + ??????struct drm_crtc_state *crtc_state, > > struct drm_plane_state *plane_state) > > +{ > > + /* > > + ?* The frameinfo variable has to correspond to the size of > > the VIP Suite > > + ?* Frame Reader register 7 which will determine the > > maximum size used > > + ?* in this frameinfo > > + ?*/ > > + > > + u32 frameinfo; > > + struct intelvipfb_priv *priv = pipe->plane.dev- > > >dev_private; > > + void __iomem *base = priv->base; > > + struct drm_plane_state *state = pipe->plane.state; > > + dma_addr_t addr; > > + > > + addr = drm_fb_cma_get_gem_addr(state->fb, state, 0); > > + > > + frameinfo = > > + readl(base + INTELVIPFB_FRAME_READER) & > > 0x00ffffff; > > + writel(frameinfo, base + INTELVIPFB_FRAME_INFO); > > + writel(addr, base + INTELVIPFB_FRAME_START); > > + /* Finally set the control register to 1 to start > > streaming */ > > + writel(1, base + INTELVIPFB_CONTROL); > > +} > > + > > +static void intelvipfb_disable(struct drm_simple_display_pipe > > *pipe) > > +{ > > + struct intelvipfb_priv *priv = pipe->plane.dev- > > >dev_private; > > + void __iomem *base = priv->base; > > + /* set the control register to 0 to stop streaming */ > > + writel(0, base + INTELVIPFB_CONTROL); > > +} > > + > > +static const struct drm_mode_config_funcs > > intelvipfb_mode_config_funcs = { > > + .fb_create = drm_gem_fb_create, > > + .atomic_check = drm_atomic_helper_check, > > + .atomic_commit = drm_atomic_helper_commit, > > +}; > > + > > +static void intelvipfb_setup_mode_config(struct drm_device *drm) > > +{ > > + drm_mode_config_init(drm); > > + drm->mode_config.funcs = &intelvipfb_mode_config_funcs; > > +} > > + > > +static int intelvipfb_pipe_prepare_fb(struct > > drm_simple_display_pipe *pipe, > > + ??????struct drm_plane_state > > *plane_state) > > +{ > > + return drm_gem_fb_prepare_fb(&pipe->plane, plane_state); > > +} > > + > > +static struct drm_simple_display_pipe_funcs fbpriv_funcs = { > > + .prepare_fb = intelvipfb_pipe_prepare_fb, > You can use drm_gem_fb_simple_display_pipe_prepare_fb(), no need to > roll > your own. > > > > > + .enable = intelvipfb_enable, > > + .disable = intelvipfb_disable > > +}; > > + > > +int intelvipfb_probe(struct device *dev) > > +{ > > + int retval; > > + struct drm_device *drm; > > + struct intelvipfb_priv *fbpriv = dev_get_drvdata(dev); > > + struct drm_connector *connector; > > + u32 formats[] = {DRM_FORMAT_XRGB8888}; > > + > > + drm = fbpriv->drm; > > + > > + drm->dev_private = fbpriv; > > + > > + intelvipfb_setup_mode_config(drm); > > + > > + connector = intelvipfb_conn_setup(drm); > > + if (!connector) { > > + dev_err(drm->dev, "Connector setup failed\n"); > > + goto err_mode_config; > > + } > > + > > + retval = drm_simple_display_pipe_init(drm, &fbpriv->pipe, > > + ??????&fbpriv_funcs, > > formats, > > + ARRAY_SIZE(formats), NULL, connector); > > + if (retval < 0) { > > + dev_err(drm->dev, "Cannot setup simple display > > pipe\n"); > > + goto err_mode_config; > > + } > > + > > + fbpriv->fbcma = drm_fbdev_cma_init(drm, > > + drm->mode_config.preferred_depth, > > + drm->mode_config.num_connector); > Please use drm_fbdev_generic_setup() for fbdev emulation. It tears > down > automatically on drm_dev_unregister() and you don't need the > drm_driver->lastclose hook. > > All drivers that use drm_fbdev_cma_init() will move to this shortly. > > Noralf. > I could not find any examples that currently uses the?drm_fbdev_generic_setup (). Would you mind pointing me on where such examples are available that would allow me to replace the assignment of the fbcma pointer with?drm_fbdev_generic_setup() method Thanks. Hean Loong. > > > > + > > + drm_mode_config_reset(drm); > > + > > + drm_dev_register(drm, 0); > > + > > + return retval; > > + > > +err_mode_config: > > + > > + drm_mode_config_cleanup(drm); > > + return -ENODEV; > > +} > > + > > +int intelvipfb_remove(struct device *dev) > > +{ > > + struct intelvipfb_priv *fbpriv = dev_get_drvdata(dev); > > + struct drm_device *drm =??fbpriv->drm; > > + > > + drm_dev_unregister(drm); > > + > > + if (fbpriv->fbcma) > > + drm_fbdev_cma_fini(fbpriv->fbcma); > > + > > + drm_mode_config_cleanup(drm); > > + drm_dev_unref(drm); > > + > > + return 0; > > +} > > + > > +MODULE_AUTHOR("Ong, Hean-Loong <hean.loong.ong@intel.com>"); > > +MODULE_DESCRIPTION("Intel VIP Frame Buffer II driver"); > > +MODULE_LICENSE("GPL v2"); > > diff --git a/drivers/gpu/drm/ivip/intel_vip_drv.h > > b/drivers/gpu/drm/ivip/intel_vip_drv.h > > new file mode 100644 > > index 0000000..0a3555d > > --- /dev/null > > +++ b/drivers/gpu/drm/ivip/intel_vip_drv.h > > @@ -0,0 +1,52 @@ > > +/* > > + * Copyright (C) 2017 Intel Corporation. > > + * > > + * Intel Video and Image Processing(VIP) Frame Buffer II driver. > > + * > > + * This program is free software; you can redistribute it and/or > > modify it > > + * under the terms and conditions of the GNU General Public > > License, > > + * version 2, as published by the Free Software Foundation. > > + * > > + * This program is distributed in the hope it will be useful, but > > WITHOUT > > + * ANY WARRANTY; without even the implied warranty of > > MERCHANTABILITY or > > + * FITNESS FOR A PARTICULAR PURPOSE.??See the GNU General Public > > License for > > + * more details. > > + * > > + * You should have received a copy of the GNU General Public > > License along with > > + * this program.??If not, see <http://www.gnu.org/licenses/>. > > + * > > + * Authors: > > + * Ong, Hean-Loong <hean.loong.ong@intel.com> > > + * > > + */ > > +#ifndef _INTEL_VIP_DRV_H > > +#define _INTEL_VIP_DRV_H > > + > > +#define DRIVER_NAME????"intelvipfb" > > +#define BYTES_PER_PIXEL ?4 > > +#define CRTC_NUM ????????1 > > +#define CONN_NUM ????????1 > > + > > +/* control registers */ > > +#define INTELVIPFB_CONTROL ??????0 > > +#define INTELVIPFB_STATUS ???????0x4 > > +#define INTELVIPFB_INTERRUPT ????0x8 > > +#define INTELVIPFB_FRAME_COUNTER 0xC > > +#define INTELVIPFB_FRAME_DROP ???0x10 > > +#define INTELVIPFB_FRAME_INFO ???0x14 > > +#define INTELVIPFB_FRAME_START ??0x18 > > +#define INTELVIPFB_FRAME_READER ?????????0x1C > > + > > +int intelvipfb_probe(struct device *dev); > > +int intelvipfb_remove(struct device *dev); > > +int intelvipfb_setup_crtc(struct drm_device *drm); > > +struct drm_connector *intelvipfb_conn_setup(struct drm_device > > *drm); > > + > > +struct intelvipfb_priv { > > + struct drm_simple_display_pipe pipe; > > + struct drm_fbdev_cma *fbcma; > > + struct drm_device *drm; > > + void????__iomem *base; > > +}; > > + > > +#endif > > diff --git a/drivers/gpu/drm/ivip/intel_vip_of.c > > b/drivers/gpu/drm/ivip/intel_vip_of.c > > new file mode 100644 > > index 0000000..47302f9 > > --- /dev/null > > +++ b/drivers/gpu/drm/ivip/intel_vip_of.c > > @@ -0,0 +1,193 @@ > > +/* > > + * intel_vip_of.c -- Intel Video and Image Processing(VIP) > > + * Frame Buffer II driver > > + * > > + * This driver supports the Intel VIP Frame Reader component. > > + * More info on the hardware can be found in the Intel Video > > + * and Image Processing Suite User Guide at this address > > + * http://www.altera.com/literature/ug/ug_vip.pdf. > > + * > > + * This program is free software; you can redistribute it and/or > > modify it > > + * under the terms and conditions of the GNU General Public > > License, > > + * version 2, as published by the Free Software Foundation. > > + * > > + * This program is distributed in the hope it will be useful, but > > WITHOUT > > + * ANY WARRANTY; without even the implied warranty of > > MERCHANTABILITY or > > + * FITNESS FOR A PARTICULAR PURPOSE.??See the GNU General Public > > License for > > + * more details. > > + * > > + * Authors: > > + * Ong, Hean-Loong <hean.loong.ong@intel.com> > > + * > > + */ > > +#include <drm/drm_fb_helper.h> > > +#include <drm/drm_fb_cma_helper.h> > > +#include <drm/drm_gem_cma_helper.h> > > +#include <drm/drm_of.h> > > +#include <drm/drm_simple_kms_helper.h> > > + > > +#include <linux/component.h> > > +#include <linux/init.h> > > +#include <linux/kernel.h> > > +#include <linux/module.h> > > +#include <linux/platform_device.h> > > + > > +#include "intel_vip_drv.h" > > + > > +DEFINE_DRM_GEM_CMA_FOPS(drm_fops); > > + > > +static void intelvipfb_lastclose(struct drm_device *drm) > > +{ > > + struct intelvipfb_priv *priv = drm->dev_private; > > + > > + drm_fbdev_cma_restore_mode(priv->fbcma); > > +} > > + > > +static struct drm_driver intelvipfb_drm = { > > + .driver_features = > > + DRIVER_MODESET | DRIVER_GEM | > > + DRIVER_PRIME | DRIVER_ATOMIC, > > + .gem_free_object_unlocked = drm_gem_cma_free_object, > > + .gem_vm_ops = &drm_gem_cma_vm_ops, > > + .dumb_create = drm_gem_cma_dumb_create, > > + .dumb_destroy = drm_gem_dumb_destroy, > > + .prime_handle_to_fd = drm_gem_prime_handle_to_fd, > > + .prime_fd_to_handle = drm_gem_prime_fd_to_handle, > > + .gem_prime_export = drm_gem_prime_export, > > + .gem_prime_import = drm_gem_prime_import, > > + .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table, > > + .gem_prime_import_sg_table = > > drm_gem_cma_prime_import_sg_table, > > + .gem_prime_vmap = drm_gem_cma_prime_vmap, > > + .gem_prime_vunmap = drm_gem_cma_prime_vunmap, > > + .gem_prime_mmap = drm_gem_cma_prime_mmap, > > + .lastclose = intelvipfb_lastclose, > > + .name = DRIVER_NAME, > > + .date = "20170729", > > + .desc = "Intel FPGA VIP SUITE", > > + .major = 1, > > + .minor = 0, > > + .ioctls = NULL, > > + .patchlevel = 0, > > + .fops = &drm_fops, > > +}; > > + > > +/* > > + * Setting up information derived from OF Device Tree Nodes > > + * max-width, max-height, bits per pixel, memory port width > > + */ > > + > > +static int intelvipfb_drm_setup(struct device *dev, > > + struct intelvipfb_priv *fbpriv) > > +{ > > + struct drm_device *drm = fbpriv->drm; > > + struct device_node *np = dev->of_node; > > + int mem_word_width; > > + int max_h, max_w; > > + int ret; > > + > > + ret = of_property_read_u32(np, "altr,max-width", &max_w); > > + if (ret) { > > + dev_err(dev, > > + "Missing required parameter 'altr,max- > > width'"); > > + return ret; > > + } > > + > > + ret = of_property_read_u32(np, "altr,max-height", &max_h); > > + if (ret) { > > + dev_err(dev, > > + "Missing required parameter 'altr,max- > > height'"); > > + return ret; > > + } > > + > > + ret = of_property_read_u32(np, "altr,mem-port-width", > > &mem_word_width); > > + if (ret) { > > + dev_err(dev, "Missing required parameter > > 'altr,mem-port-width '"); > > + return ret; > > + } > > + > > + if (!(mem_word_width >= 32 && mem_word_width % 32 == 0)) { > > + dev_err(dev, > > + "mem-word-width is set to %i. must be >= > > 32 and multiple of 32.", > > + ?mem_word_width); > > + return -ENODEV; > > + } > > + > > + drm->mode_config.min_width = 640; > > + drm->mode_config.min_height = 480; > > + drm->mode_config.max_width = max_w; > > + drm->mode_config.max_height = max_h; > > + drm->mode_config.preferred_depth = 32; > > + > > + return 0; > > +} > > + > > +static int intelvipfb_of_probe(struct platform_device *pdev) > > +{ > > + int retval; > > + struct resource *reg_res; > > + struct intelvipfb_priv *fbpriv; > > + struct device *dev = &pdev->dev; > > + struct drm_device *drm; > > + > > + fbpriv = devm_kzalloc(dev, sizeof(*fbpriv), GFP_KERNEL); > > + if (!fbpriv) > > + return -ENOMEM; > > + > > + /*setup DRM */ > > + drm = drm_dev_alloc(&intelvipfb_drm, dev); > > + if (IS_ERR(drm)) > > + return PTR_ERR(drm); > > + > > + retval = dma_set_mask_and_coherent(drm->dev, > > DMA_BIT_MASK(32)); > > + if (retval) > > + return -ENODEV; > > + > > + fbpriv->drm = drm; > > + > > + reg_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > > + if (!reg_res) > > + return -ENOMEM; > > + > > + fbpriv->base = devm_ioremap_resource(dev, reg_res); > > + > > + if (IS_ERR(fbpriv->base)) { > > + dev_err(dev, "devm_ioremap_resource failed\n"); > > + retval = PTR_ERR(fbpriv->base); > > + return -ENOMEM; > > + } > > + > > + intelvipfb_drm_setup(dev, fbpriv); > > + > > + dev_set_drvdata(dev, fbpriv); > > + > > + return intelvipfb_probe(dev); > > +} > > + > > +static int intelvipfb_of_remove(struct platform_device *pdev) > > +{ > > + return intelvipfb_remove(&pdev->dev); > > +} > > + > > +/* > > + * The name vip-frame-buffer-2.0 is derived from > > + * http://www.altera.com/literature/ug/ug_vip.pdf > > + * frame buffer IP cores section 14 > > + */ > > + > > +static const struct of_device_id intelvipfb_of_match[] = { > > + { .compatible = "altr,vip-frame-buffer-2.0" }, > > + {}, > > +}; > > + > > +MODULE_DEVICE_TABLE(of, intelvipfb_of_match); > > + > > +static struct platform_driver intelvipfb_driver = { > > + .probe = intelvipfb_of_probe, > > + .remove = intelvipfb_of_remove, > > + .driver = { > > + .name = DRIVER_NAME, > > + .of_match_table = intelvipfb_of_match, > > + }, > > +}; > > + > > +module_platform_driver(intelvipfb_driver); ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH10 3/3] ARM:drm ivip Intel FPGA Video and Image Processing Suite 2018-08-16 8:33 ` Ong, Hean Loong @ 2018-08-16 9:10 ` Noralf Trønnes 0 siblings, 0 replies; 9+ messages in thread From: Noralf Trønnes @ 2018-08-16 9:10 UTC (permalink / raw) To: linux-arm-kernel Den 16.08.2018 10.33, skrev Ong, Hean Loong: > On Wed, 2018-08-15 at 14:26 +0200, Noralf Tr?nnes wrote: >> Den 14.08.2018 10.57, skrev Hean-Loong, Ong: >>> From: Ong Hean Loong <hean.loong.ong@intel.com> >>> >>> Driver for Intel FPGA Video and Image Processing Suite Frame Buffer >>> II. >>> The driver only supports the Intel Arria10 devkit and its variants. >>> This driver can be either loaded staticlly or in modules. >>> The OF device tree binding is located at: >>> Documentation/devicetree/bindings/display/altr,vip-fb2.txt >>> >>> Signed-off-by: Ong Hean Loong <hean.loong.ong@intel.com> >>> --- <snip> >>> +int intelvipfb_probe(struct device *dev) >>> +{ >>> + int retval; >>> + struct drm_device *drm; >>> + struct intelvipfb_priv *fbpriv = dev_get_drvdata(dev); >>> + struct drm_connector *connector; >>> + u32 formats[] = {DRM_FORMAT_XRGB8888}; >>> + >>> + drm = fbpriv->drm; >>> + >>> + drm->dev_private = fbpriv; >>> + >>> + intelvipfb_setup_mode_config(drm); >>> + >>> + connector = intelvipfb_conn_setup(drm); >>> + if (!connector) { >>> + dev_err(drm->dev, "Connector setup failed\n"); >>> + goto err_mode_config; >>> + } >>> + >>> + retval = drm_simple_display_pipe_init(drm, &fbpriv->pipe, >>> + ??????&fbpriv_funcs, >>> formats, >>> + ARRAY_SIZE(formats), NULL, connector); >>> + if (retval < 0) { >>> + dev_err(drm->dev, "Cannot setup simple display >>> pipe\n"); >>> + goto err_mode_config; >>> + } >>> + >>> + fbpriv->fbcma = drm_fbdev_cma_init(drm, >>> + drm->mode_config.preferred_depth, >>> + drm->mode_config.num_connector); >> Please use drm_fbdev_generic_setup() for fbdev emulation. It tears >> down >> automatically on drm_dev_unregister() and you don't need the >> drm_driver->lastclose hook. >> >> All drivers that use drm_fbdev_cma_init() will move to this shortly. >> >> Noralf. >> > I could not find any examples that currently uses > the?drm_fbdev_generic_setup (). Would you mind pointing me on where > such examples are available that would allow me to replace the > assignment of the fbcma pointer with?drm_fbdev_generic_setup() method This is the only one converted so far: Commit: dff1c7032ffea20cca2ad3973ed4c69c8182683d drm/tinydrm: Use drm_fbdev_generic_setup() Noralf. ^ permalink raw reply [flat|nested] 9+ messages in thread
[parent not found: <1534237029-2648-2-git-send-email-hean.loong.ong@intel.com>]
* [PATCH10 1/3] ARM:dt-bindings:display Intel FPGA Video and Image Processing Suite [not found] ` <1534237029-2648-2-git-send-email-hean.loong.ong@intel.com> @ 2018-08-14 14:43 ` Rob Herring 0 siblings, 0 replies; 9+ messages in thread From: Rob Herring @ 2018-08-14 14:43 UTC (permalink / raw) To: linux-arm-kernel On Tue, Aug 14, 2018 at 04:57:07PM +0800, Hean-Loong, Ong wrote: > From: Ong, Hean Loong <hean.loong.ong@intel.com> > > Device tree binding for Intel FPGA Video and Image Processing Suite. The binding involved would be generated from the Altera (Intel) Qsys system. The bindings would set the max width, max height, buts per pixel and memory port width. The device tree binding only supports the Intel > Arria10 devkit and its variants. Vendor name retained as altr. Again, wrap your lines. > > V8: > *Add port to Display port decoder > > V7: > *Fix OF graph for better description > *Add description for encoder > > V6: > *Description have not describe DT device in general > > V5: > *remove bindings for bits per symbol as it has only one value which is 8 > > V4: > *fix properties that does not describe the values > > V3: > *OF graph not in accordance to graph.txt > > V2: > *Remove Linux driver description > > V1: > *Missing vendor prefix > > Signed-off-by: Ong, Hean Loong <hean.loong.ong@intel.com> > --- > .../devicetree/bindings/display/altr,vip-fb2.txt | 63 ++++++++++++++++++++ > 1 files changed, 63 insertions(+), 0 deletions(-) > create mode 100644 Documentation/devicetree/bindings/display/altr,vip-fb2.txt > > diff --git a/Documentation/devicetree/bindings/display/altr,vip-fb2.txt b/Documentation/devicetree/bindings/display/altr,vip-fb2.txt > new file mode 100644 > index 0000000..89a3b9e > --- /dev/null > +++ b/Documentation/devicetree/bindings/display/altr,vip-fb2.txt > @@ -0,0 +1,63 @@ > +Intel Video and Image Processing(VIP) Frame Buffer II bindings > + > +Supported hardware: Intel FPGA SoC Arria10 and above with display port IP > + > +The Video Frame Buffer II in Video Image Processing (VIP) suite is an IP core > +that interfaces between system memory and Avalon-ST video ports. The IP core > +can be configured to support the memory reader (from memory to Avalon-ST) > +and/or memory writer (from Avalon-ST to memory) interfaces. > + > +More information the FPGA video IP component can be acquired from > +https://www.altera.com/content/dam/altera-www/global/en_US/pdfs\ > +/literature/ug/ug_vip.pdf > + > +DT-Bindings: > +============= > +Required properties: > +---------------------------- > +- compatible: "altr,vip-frame-buffer-2.0" > +- reg: Physical base address and length of the framebuffer controller's > + registers. > +- altr,max-width: The maximum width of the framebuffer in pixels. > +- altr,max-height: The maximum height of the framebuffer in pixels. > +- altr,mem-port-width = the bus width of the avalon master port > + on the frame reader > + > +Optional sub-nodes: > +- ports: The connection to the encoder > + > +Connections between the Frame Buffer II and other video IP cores in the system > +are modelled using the OF graph DT bindings. The Frame Buffer II node has up > +to two OF graph ports. When the memory writer interface is enabled, port 0 > +maps to the Avalon-ST Input (din) port. When the memory reader interface is > +enabled, port 1 maps to the Avalon-ST Output (dout) port. > + > +The encoder is built into the FPGA HW design and therefore would not > +be accessible from the DDR. > + > + Port 0 Port1 > +--------------------------------------------------------- > +ARRIA10 AVALON_ST (DIN) AVALON_ST (DOUT) > + > +Required Properties Example: > +---------------------------- > + > +framebuffer at 100000280 { > + compatible = "altr,vip-frame-buffer-2.0"; > + reg = <0x00000001 0x00000280 0x00000040>; > + altr,max-width = <1280>; > + altr,max-height = <720>; > + altr,mem-port-width = <128>; > + > + ports { > + #address-cells = <1>; > + #size-cells = <0>; > + > + port at 1 { > + reg = <1>; > + fb_output: endpoint { > + remote-endpoint = <&dp_encoder_input>; > + }; > + }; > + }; > +}; > -- > 1.7.1 > ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH10 0/3] Intel FPGA Video and Image Processing Suite [not found] <1534237029-2648-1-git-send-email-hean.loong.ong@intel.com> 2018-08-14 8:57 ` [PATCH10 3/3] ARM:drm ivip Intel FPGA Video and Image Processing Suite Hean-Loong, Ong [not found] ` <1534237029-2648-2-git-send-email-hean.loong.ong@intel.com> @ 2018-08-14 15:48 ` Dinh Nguyen 2018-08-15 1:42 ` Ong, Hean Loong 2 siblings, 1 reply; 9+ messages in thread From: Dinh Nguyen @ 2018-08-14 15:48 UTC (permalink / raw) To: linux-arm-kernel On 08/14/2018 03:57 AM, Hean-Loong, Ong wrote: > From: Ong, Hean Loong <hean.loong.ong@intel.com> > > The FPGA FrameBuffer Soft IP could be seen as the GPU and the DRM driver patch > here is allocating memory for information to be streamed from the ARM/Linux > to the display port. Basically the driver just wraps the information such as > the pixels to be drawn by the FPGA FrameBuffer 2. > > The piece of hardware in discussion is the SoC FPGA where Linux runs on the > ARM chip and the FGPA is driven by its NIOS soft core with its own proprietary firmware. This driver doesn't have to ARM specific does it? > > For example the application from the ARM Linux would have to write information > on the /dev/fb0 with the information stored in the SDRAM to be fetched by the > FPGA framebuffer IP and displayed on the Display Port Monitor. > > > Ong Hean Loong (2): > ARM:socfpga-defconfig Intel FPGA Video and Image Processing Suite > ARM:drm ivip Intel FPGA Video and Image Processing Suite > > Ong, Hean Loong (1): > ARM:dt-bindings:display Intel FPGA Video and Image Processing Suite > > .../devicetree/bindings/display/altr,vip-fb2.txt | 63 +++++++ > arch/arm/configs/socfpga_defconfig | 5 + > drivers/gpu/drm/Kconfig | 2 + > drivers/gpu/drm/Makefile | 1 + > drivers/gpu/drm/ivip/Kconfig | 14 ++ > drivers/gpu/drm/ivip/Makefile | 9 + > drivers/gpu/drm/ivip/intel_vip_conn.c | 95 ++++++++++ > drivers/gpu/drm/ivip/intel_vip_core.c | 161 ++++++++++++++++ > drivers/gpu/drm/ivip/intel_vip_drv.h | 52 ++++++ > drivers/gpu/drm/ivip/intel_vip_of.c | 193 ++++++++++++++++++++ > 10 files changed, 595 insertions(+), 0 deletions(-) > create mode 100644 Documentation/devicetree/bindings/display/altr,vip-fb2.txt > create mode 100644 drivers/gpu/drm/ivip/Kconfig > create mode 100644 drivers/gpu/drm/ivip/Makefile > create mode 100644 drivers/gpu/drm/ivip/intel_vip_conn.c > create mode 100644 drivers/gpu/drm/ivip/intel_vip_core.c > create mode 100644 drivers/gpu/drm/ivip/intel_vip_drv.h > create mode 100644 drivers/gpu/drm/ivip/intel_vip_of.c > Can you clarify your commit header? What is "PATCH10", is it version 10? If so, it should be "PATCHv10". You're also missing a few other maintainers in your CC list, the "DRM DRIVERS AND MISC GPU PATCHES" people. Dinh ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH10 0/3] Intel FPGA Video and Image Processing Suite 2018-08-14 15:48 ` [PATCH10 0/3] " Dinh Nguyen @ 2018-08-15 1:42 ` Ong, Hean Loong 0 siblings, 0 replies; 9+ messages in thread From: Ong, Hean Loong @ 2018-08-15 1:42 UTC (permalink / raw) To: linux-arm-kernel On Tue, 2018-08-14 at 10:48 -0500, Dinh Nguyen wrote: > > On 08/14/2018 03:57 AM, Hean-Loong, Ong wrote: > > > > From: Ong, Hean Loong <hean.loong.ong@intel.com> > > > > The FPGA FrameBuffer Soft IP could be seen??as the GPU and the DRM > > driver patch? > > here is allocating memory for information to be streamed from the > > ARM/Linux? > > to the display port. Basically the driver just wraps the > > information such as? > > the pixels to be drawn by the FPGA FrameBuffer 2. > > > > The piece of hardware in discussion is the SoC FPGA where Linux > > runs on the? > > ARM chip and the FGPA is driven by its NIOS soft core with its own > > proprietary firmware. > This driver doesn't have to ARM specific does it? > > > > > > > For example the application from the ARM Linux would have to write > > information? > > on the /dev/fb0 with the information stored in the SDRAM to be > > fetched by the? > > FPGA framebuffer IP and displayed on the Display Port Monitor. > > > > > > Ong Hean Loong (2): > > ? ARM:socfpga-defconfig Intel FPGA Video and Image Processing Suite > > ? ARM:drm ivip Intel FPGA Video and Image Processing Suite > > > > Ong, Hean Loong (1): > > ? ARM:dt-bindings:display Intel FPGA Video and Image Processing > > Suite > > > > ?.../devicetree/bindings/display/altr,vip-fb2.txt???|???63 +++++++ > > ?arch/arm/configs/socfpga_defconfig?????????????????|????5 + > > ?drivers/gpu/drm/Kconfig????????????????????????????|????2 + > > ?drivers/gpu/drm/Makefile???????????????????????????|????1 + > > ?drivers/gpu/drm/ivip/Kconfig???????????????????????|???14 ++ > > ?drivers/gpu/drm/ivip/Makefile??????????????????????|????9 + > > ?drivers/gpu/drm/ivip/intel_vip_conn.c??????????????|???95 > > ++++++++++ > > ?drivers/gpu/drm/ivip/intel_vip_core.c??????????????|??161 > > ++++++++++++++++ > > ?drivers/gpu/drm/ivip/intel_vip_drv.h???????????????|???52 ++++++ > > ?drivers/gpu/drm/ivip/intel_vip_of.c????????????????|??193 > > ++++++++++++++++++++ > > ?10 files changed, 595 insertions(+), 0 deletions(-) > > ?create mode 100644 > > Documentation/devicetree/bindings/display/altr,vip-fb2.txt > > ?create mode 100644 drivers/gpu/drm/ivip/Kconfig > > ?create mode 100644 drivers/gpu/drm/ivip/Makefile > > ?create mode 100644 drivers/gpu/drm/ivip/intel_vip_conn.c > > ?create mode 100644 drivers/gpu/drm/ivip/intel_vip_core.c > > ?create mode 100644 drivers/gpu/drm/ivip/intel_vip_drv.h > > ?create mode 100644 drivers/gpu/drm/ivip/intel_vip_of.c > > > Can you clarify your commit header? What is "PATCH10", is it version > 10? > If so, it should be "PATCHv10". > > You're also missing a few other maintainers in your CC list, the "DRM > DRIVERS AND MISC GPU PATCHES" people. > Noted > Dinh ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2018-08-16 9:10 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1534237029-2648-1-git-send-email-hean.loong.ong@intel.com>
2018-08-14 8:57 ` [PATCH10 3/3] ARM:drm ivip Intel FPGA Video and Image Processing Suite Hean-Loong, Ong
2018-08-14 15:46 ` Dinh Nguyen
2018-08-15 1:44 ` Ong, Hean Loong
2018-08-15 12:26 ` Noralf Trønnes
2018-08-16 8:33 ` Ong, Hean Loong
2018-08-16 9:10 ` Noralf Trønnes
[not found] ` <1534237029-2648-2-git-send-email-hean.loong.ong@intel.com>
2018-08-14 14:43 ` [PATCH10 1/3] ARM:dt-bindings:display " Rob Herring
2018-08-14 15:48 ` [PATCH10 0/3] " Dinh Nguyen
2018-08-15 1:42 ` Ong, Hean Loong
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).