* [RFC 0/1] drm: Add Grain Media GM12U320 kms driver @ 2017-06-01 11:59 Hans de Goede 2017-06-01 11:59 ` [RFC] " Hans de Goede 2017-06-01 22:46 ` [RFC 0/1] " Marco Diego Aurélio Mesquita 0 siblings, 2 replies; 23+ messages in thread From: Hans de Goede @ 2017-06-01 11:59 UTC (permalink / raw) To: Daniel Vetter, Jani Nikula, Sean Paul, David Airlie Cc: Marco Diego Aurélio Mesquita, Hans de Goede, dri-devel Hi All, This is a resend of a patch I send out a while back, rebased on top of 4.12-rc3. Back then the main comment was can you try to make this driver use the drm_simple_kms_helper stuff? Unfortunately I have not had time yet to look into this. Recently I've been contacted by Marco Diego Aurélio Mesquita (in the Cc) who wants to work on getting this driver ready for mainline. He has has some questions / ideas about how to do this, so the main reason for reposting this is to give him a thread to reply to which provides context for his questions / ideas. Regards, Hans _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 23+ messages in thread
* [RFC] drm: Add Grain Media GM12U320 kms driver 2017-06-01 11:59 [RFC 0/1] drm: Add Grain Media GM12U320 kms driver Hans de Goede @ 2017-06-01 11:59 ` Hans de Goede 2017-06-20 8:57 ` Daniel Vetter 2017-06-01 22:46 ` [RFC 0/1] " Marco Diego Aurélio Mesquita 1 sibling, 1 reply; 23+ messages in thread From: Hans de Goede @ 2017-06-01 11:59 UTC (permalink / raw) To: Daniel Vetter, Jani Nikula, Sean Paul, David Airlie Cc: Marco Diego Aurélio Mesquita, Hans de Goede, dri-devel Grain-media GM12U320 based devices are mini video projectors using USB for both power and video data transport. This commit adds a kms driver for these devices, including prime support. This driver is based on the existing udl kms driver, and the gm12u320 fb driver by Viacheslav Nurmekhamitov <slavrn@yandex.ru>. Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- MAINTAINERS | 6 + drivers/gpu/drm/Kconfig | 2 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/gm12u320/Kconfig | 11 + drivers/gpu/drm/gm12u320/Makefile | 7 + drivers/gpu/drm/gm12u320/gm12u320_connector.c | 148 ++++++++ drivers/gpu/drm/gm12u320/gm12u320_dmabuf.c | 283 ++++++++++++++ drivers/gpu/drm/gm12u320/gm12u320_drv.c | 157 ++++++++ drivers/gpu/drm/gm12u320/gm12u320_drv.h | 129 +++++++ drivers/gpu/drm/gm12u320/gm12u320_encoder.c | 75 ++++ drivers/gpu/drm/gm12u320/gm12u320_fb.c | 343 +++++++++++++++++ drivers/gpu/drm/gm12u320/gm12u320_gem.c | 237 ++++++++++++ drivers/gpu/drm/gm12u320/gm12u320_main.c | 506 ++++++++++++++++++++++++++ drivers/gpu/drm/gm12u320/gm12u320_modeset.c | 143 ++++++++ 14 files changed, 2048 insertions(+) create mode 100644 drivers/gpu/drm/gm12u320/Kconfig create mode 100644 drivers/gpu/drm/gm12u320/Makefile create mode 100644 drivers/gpu/drm/gm12u320/gm12u320_connector.c create mode 100644 drivers/gpu/drm/gm12u320/gm12u320_dmabuf.c create mode 100644 drivers/gpu/drm/gm12u320/gm12u320_drv.c create mode 100644 drivers/gpu/drm/gm12u320/gm12u320_drv.h create mode 100644 drivers/gpu/drm/gm12u320/gm12u320_encoder.c create mode 100644 drivers/gpu/drm/gm12u320/gm12u320_fb.c create mode 100644 drivers/gpu/drm/gm12u320/gm12u320_gem.c create mode 100644 drivers/gpu/drm/gm12u320/gm12u320_main.c create mode 100644 drivers/gpu/drm/gm12u320/gm12u320_modeset.c diff --git a/MAINTAINERS b/MAINTAINERS index 053c3bdd1fe5..e1973afc428a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4423,6 +4423,12 @@ S: Supported F: drivers/gpu/drm/nouveau/ F: include/uapi/drm/nouveau_drm.h +DRM DRIVERS FOR GRAIN-MEDIA GM12U320 +M: Hans de Goede <hdegoede@redhat.com> +L: dri-devel@lists.freedesktop.org +S: Supported +F: drivers/gpu/drm/gm12u320/ + DRM DRIVERS FOR NVIDIA TEGRA M: Thierry Reding <thierry.reding@gmail.com> L: dri-devel@lists.freedesktop.org diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index 78d7fc0ebb57..46898c4dd0d6 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -274,6 +274,8 @@ source "drivers/gpu/drm/meson/Kconfig" source "drivers/gpu/drm/tinydrm/Kconfig" +source "drivers/gpu/drm/gm12u320/Kconfig" + # Keep legacy drivers last menuconfig DRM_LEGACY diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index 59f0f9b696eb..cdec41c52e91 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -96,3 +96,4 @@ obj-y += hisilicon/ obj-$(CONFIG_DRM_ZTE) += zte/ obj-$(CONFIG_DRM_MXSFB) += mxsfb/ obj-$(CONFIG_DRM_TINYDRM) += tinydrm/ +obj-$(CONFIG_DRM_GM12U320) += gm12u320/ diff --git a/drivers/gpu/drm/gm12u320/Kconfig b/drivers/gpu/drm/gm12u320/Kconfig new file mode 100644 index 000000000000..67274cb291ed --- /dev/null +++ b/drivers/gpu/drm/gm12u320/Kconfig @@ -0,0 +1,11 @@ +config DRM_GM12U320 + tristate "Grain Media GM12U320 based mini projectors" + depends on DRM + depends on USB_SUPPORT + depends on USB_ARCH_HAS_HCD + select USB + select DRM_KMS_HELPER + help + This is a KMS driver for Grain Media GM12U320 based usb mini video + projectors, such as the Acer C120. + Say M/Y to add support for these devices via drm/kms interfaces. diff --git a/drivers/gpu/drm/gm12u320/Makefile b/drivers/gpu/drm/gm12u320/Makefile new file mode 100644 index 000000000000..6234473967b2 --- /dev/null +++ b/drivers/gpu/drm/gm12u320/Makefile @@ -0,0 +1,7 @@ +ccflags-y := -Iinclude/drm + +gm12u320-y := gm12u320_drv.o gm12u320_modeset.o gm12u320_connector.o \ + gm12u320_encoder.o gm12u320_main.o gm12u320_fb.o \ + gm12u320_gem.o gm12u320_dmabuf.o + +obj-$(CONFIG_DRM_GM12U320) += gm12u320.o diff --git a/drivers/gpu/drm/gm12u320/gm12u320_connector.c b/drivers/gpu/drm/gm12u320/gm12u320_connector.c new file mode 100644 index 000000000000..042da07c16c2 --- /dev/null +++ b/drivers/gpu/drm/gm12u320/gm12u320_connector.c @@ -0,0 +1,148 @@ +/* + * Copyright (C) 2012-2016 Red Hat Inc. + * + * Based in parts on the udl code. Based in parts on the gm12u320 fb driver: + * Copyright (C) 2013 Viacheslav Nurmekhamitov <slavrn@yandex.ru> + * Copyright (C) 2009 Roberto De Ioris <roberto@unbit.it> + * Copyright (C) 2009 Jaya Kumar <jayakumar.lkml@gmail.com> + * Copyright (C) 2009 Bernie Thompson <bernie@plugable.com> + * + * This file is subject to the terms and conditions of the GNU General Public + * License v2. See the file COPYING in the main directory of this archive for + * more details. + */ + +#include <drm/drmP.h> +#include <drm/drm_crtc.h> +#include <drm/drm_edid.h> +#include <drm/drm_crtc_helper.h> +#include "gm12u320_drv.h" + +/* + * Note this assumes this driver is only ever used with the Acer C120, if we + * add support for other devices the vendor and model should be parameterized. + */ +static struct edid gm12u320_edid = { + .header = { 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00 }, + .mfg_id = { 0x04, 0x72 }, /* "ACR" */ + .prod_code = { 0x20, 0xc1 }, /* C120h */ + .mfg_week = 1, + .mfg_year = 1, + .version = 1, /* EDID 1.3 */ + .revision = 3, /* EDID 1.3 */ + .input = 0x80, /* Digital input */ + .features = 0x02, /* Pref timing in DTD 1 */ + .standard_timings = { { 1, 1 }, { 1, 1 }, { 1, 1 }, { 1, 1 }, + { 1, 1 }, { 1, 1 }, { 1, 1 }, { 1, 1 } }, + .detailed_timings = { { + .pixel_clock = 3383, + /* hactive = 852, hblank = 256 */ + .data.pixel_data.hactive_lo = 0x54, + .data.pixel_data.hblank_lo = 0x00, + .data.pixel_data.hactive_hblank_hi = 0x31, + /* vactive = 480, vblank = 28 */ + .data.pixel_data.vactive_lo = 0xe0, + .data.pixel_data.vblank_lo = 0x1c, + .data.pixel_data.vactive_vblank_hi = 0x10, + /* hsync offset 40 pw 128, vsync offset 1 pw 4 */ + .data.pixel_data.hsync_offset_lo = 0x28, + .data.pixel_data.hsync_pulse_width_lo = 0x80, + .data.pixel_data.vsync_offset_pulse_width_lo = 0x14, + .data.pixel_data.hsync_vsync_offset_pulse_width_hi = 0x00, + /* Digital separate syncs, hsync+, vsync+ */ + .data.pixel_data.misc = 0x1e, + }, { + .pixel_clock = 0, + .data.other_data.type = 0xfd, /* Monitor ranges */ + .data.other_data.data.range.min_vfreq = 59, + .data.other_data.data.range.max_vfreq = 61, + .data.other_data.data.range.min_hfreq_khz = 29, + .data.other_data.data.range.max_hfreq_khz = 32, + .data.other_data.data.range.pixel_clock_mhz = 4, /* 40 MHz */ + .data.other_data.data.range.flags = 0, + .data.other_data.data.range.formula.cvt = { + 0xa0, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20 }, + }, { + .pixel_clock = 0, + .data.other_data.type = 0xfc, /* Model string */ + .data.other_data.data.str.str = { + 'C', '1', '2', '0', 'P', 'r', 'o', 'j', 'e', 'c', + 't', 'o', 'r' }, + }, { + .pixel_clock = 0, + .data.other_data.type = 0xfe, /* Unspecified text / padding */ + .data.other_data.data.str.str = { + '\n', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', + ' ', ' ', ' ' }, + } }, + .checksum = 0x40, +}; + +static int gm12u320_get_modes(struct drm_connector *connector) +{ + drm_mode_connector_update_edid_property(connector, &gm12u320_edid); + return drm_add_edid_modes(connector, &gm12u320_edid); +} + +static enum drm_connector_status +gm12u320_detect(struct drm_connector *connector, bool force) +{ + if (drm_device_is_unplugged(connector->dev)) + return connector_status_disconnected; + + return connector_status_connected; +} + +static struct drm_encoder* +gm12u320_best_single_encoder(struct drm_connector *connector) +{ + int enc_id = connector->encoder_ids[0]; + + return drm_encoder_find(connector->dev, enc_id); +} + +static int gm12u320_connector_set_property(struct drm_connector *connector, + struct drm_property *property, + uint64_t val) +{ + return 0; +} + +static void gm12u320_connector_destroy(struct drm_connector *connector) +{ + drm_connector_unregister(connector); + drm_connector_cleanup(connector); + kfree(connector); +} + +static const struct drm_connector_helper_funcs gm12u320_helper_funcs = { + .get_modes = gm12u320_get_modes, + .best_encoder = gm12u320_best_single_encoder, +}; + +static const struct drm_connector_funcs gm12u320_connector_funcs = { + .dpms = drm_helper_connector_dpms, + .detect = gm12u320_detect, + .fill_modes = drm_helper_probe_single_connector_modes, + .destroy = gm12u320_connector_destroy, + .set_property = gm12u320_connector_set_property, +}; + +int gm12u320_connector_init(struct drm_device *dev, + struct drm_encoder *encoder) +{ + struct drm_connector *connector; + + connector = kzalloc(sizeof(struct drm_connector), GFP_KERNEL); + if (!connector) + return -ENOMEM; + + drm_connector_init(dev, connector, &gm12u320_connector_funcs, + DRM_MODE_CONNECTOR_Unknown); + drm_connector_helper_add(connector, &gm12u320_helper_funcs); + + drm_connector_register(connector); + drm_mode_connector_attach_encoder(connector, encoder); + + return 0; +} diff --git a/drivers/gpu/drm/gm12u320/gm12u320_dmabuf.c b/drivers/gpu/drm/gm12u320/gm12u320_dmabuf.c new file mode 100644 index 000000000000..b55861e8323c --- /dev/null +++ b/drivers/gpu/drm/gm12u320/gm12u320_dmabuf.c @@ -0,0 +1,283 @@ +/* + * Based on the udl dmabuf code: + * + * Copyright (c) 2014 The Chromium OS Authors + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that 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/>. + */ + +#include <drm/drmP.h> +#include "gm12u320_drv.h" +#include <linux/shmem_fs.h> +#include <linux/dma-buf.h> + +struct gm12u320_drm_dmabuf_attachment { + struct sg_table sgt; + enum dma_data_direction dir; + bool is_mapped; +}; + +static int gm12u320_attach_dma_buf(struct dma_buf *dmabuf, + struct device *dev, + struct dma_buf_attachment *attach) +{ + struct gm12u320_drm_dmabuf_attachment *gm12u320_attach; + + DRM_DEBUG_PRIME("[DEV:%s] size:%zd\n", dev_name(attach->dev), + attach->dmabuf->size); + + gm12u320_attach = kzalloc(sizeof(*gm12u320_attach), GFP_KERNEL); + if (!gm12u320_attach) + return -ENOMEM; + + gm12u320_attach->dir = DMA_NONE; + attach->priv = gm12u320_attach; + + return 0; +} + +static void gm12u320_detach_dma_buf(struct dma_buf *dmabuf, + struct dma_buf_attachment *attach) +{ + struct gm12u320_drm_dmabuf_attachment *gm12u320_attach = attach->priv; + struct sg_table *sgt; + + if (!gm12u320_attach) + return; + + DRM_DEBUG_PRIME("[DEV:%s] size:%zd\n", dev_name(attach->dev), + attach->dmabuf->size); + + sgt = &gm12u320_attach->sgt; + + if (gm12u320_attach->dir != DMA_NONE) + dma_unmap_sg(attach->dev, sgt->sgl, sgt->nents, + gm12u320_attach->dir); + + sg_free_table(sgt); + kfree(gm12u320_attach); + attach->priv = NULL; +} + +static struct sg_table *gm12u320_map_dma_buf(struct dma_buf_attachment *attach, + enum dma_data_direction dir) +{ + struct gm12u320_drm_dmabuf_attachment *gm12u320_attach = attach->priv; + struct gm12u320_gem_object *obj = to_gm12u320_bo(attach->dmabuf->priv); + struct drm_device *dev = obj->base.dev; + struct scatterlist *rd, *wr; + struct sg_table *sgt = NULL; + unsigned int i; + int page_count; + int nents, ret; + + DRM_DEBUG_PRIME("[DEV:%s] size:%zd dir=%d\n", dev_name(attach->dev), + attach->dmabuf->size, dir); + + /* just return current sgt if already requested. */ + if (gm12u320_attach->dir == dir && gm12u320_attach->is_mapped) + return &gm12u320_attach->sgt; + + if (!obj->pages) { + ret = gm12u320_gem_get_pages(obj); + if (ret) { + DRM_ERROR("failed to map pages.\n"); + return ERR_PTR(ret); + } + } + + page_count = obj->base.size / PAGE_SIZE; + obj->sg = drm_prime_pages_to_sg(obj->pages, page_count); + if (IS_ERR(obj->sg)) { + DRM_ERROR("failed to allocate sgt.\n"); + return ERR_CAST(obj->sg); + } + + sgt = &gm12u320_attach->sgt; + + ret = sg_alloc_table(sgt, obj->sg->orig_nents, GFP_KERNEL); + if (ret) { + DRM_ERROR("failed to alloc sgt.\n"); + return ERR_PTR(-ENOMEM); + } + + mutex_lock(&dev->struct_mutex); + + rd = obj->sg->sgl; + wr = sgt->sgl; + for (i = 0; i < sgt->orig_nents; ++i) { + sg_set_page(wr, sg_page(rd), rd->length, rd->offset); + rd = sg_next(rd); + wr = sg_next(wr); + } + + if (dir != DMA_NONE) { + nents = dma_map_sg(attach->dev, sgt->sgl, sgt->orig_nents, dir); + if (!nents) { + DRM_ERROR("failed to map sgl with iommu.\n"); + sg_free_table(sgt); + sgt = ERR_PTR(-EIO); + goto err_unlock; + } + } + + gm12u320_attach->is_mapped = true; + gm12u320_attach->dir = dir; + attach->priv = gm12u320_attach; + +err_unlock: + mutex_unlock(&dev->struct_mutex); + return sgt; +} + +static void gm12u320_unmap_dma_buf(struct dma_buf_attachment *attach, + struct sg_table *sgt, + enum dma_data_direction dir) +{ + /* Nothing to do. */ + DRM_DEBUG_PRIME("[DEV:%s] size:%zd dir:%d\n", dev_name(attach->dev), + attach->dmabuf->size, dir); +} + +static void *gm12u320_dmabuf_kmap(struct dma_buf *dma_buf, + unsigned long page_num) +{ + /* TODO */ + + return NULL; +} + +static void *gm12u320_dmabuf_kmap_atomic(struct dma_buf *dma_buf, + unsigned long page_num) +{ + /* TODO */ + + return NULL; +} + +static void gm12u320_dmabuf_kunmap(struct dma_buf *dma_buf, + unsigned long page_num, void *addr) +{ + /* TODO */ +} + +static void gm12u320_dmabuf_kunmap_atomic(struct dma_buf *dma_buf, + unsigned long page_num, + void *addr) +{ + /* TODO */ +} + +static int gm12u320_dmabuf_mmap(struct dma_buf *dma_buf, + struct vm_area_struct *vma) +{ + /* TODO */ + + return -EINVAL; +} + +static struct dma_buf_ops gm12u320_dmabuf_ops = { + .attach = gm12u320_attach_dma_buf, + .detach = gm12u320_detach_dma_buf, + .map_dma_buf = gm12u320_map_dma_buf, + .unmap_dma_buf = gm12u320_unmap_dma_buf, + .map = gm12u320_dmabuf_kmap, + .map_atomic = gm12u320_dmabuf_kmap_atomic, + .unmap = gm12u320_dmabuf_kunmap, + .unmap_atomic = gm12u320_dmabuf_kunmap_atomic, + .mmap = gm12u320_dmabuf_mmap, + .release = drm_gem_dmabuf_release, +}; + +struct dma_buf *gm12u320_gem_prime_export(struct drm_device *dev, + struct drm_gem_object *obj, int flags) +{ + DEFINE_DMA_BUF_EXPORT_INFO(exp_info); + + exp_info.ops = &gm12u320_dmabuf_ops; + exp_info.size = obj->size; + exp_info.flags = flags; + exp_info.priv = obj; + + return drm_gem_dmabuf_export(dev, &exp_info); +} + +static int gm12u320_prime_create(struct drm_device *dev, + size_t size, struct sg_table *sg, + struct gm12u320_gem_object **obj_p) +{ + struct gm12u320_gem_object *obj; + int npages; + + npages = size / PAGE_SIZE; + + *obj_p = NULL; + obj = gm12u320_gem_alloc_object(dev, npages * PAGE_SIZE); + if (!obj) + return -ENOMEM; + + obj->sg = sg; + obj->pages = drm_malloc_ab(npages, sizeof(struct page *)); + if (obj->pages == NULL) { + DRM_ERROR("obj pages is NULL %d\n", npages); + return -ENOMEM; + } + + drm_prime_sg_to_page_addr_arrays(sg, obj->pages, NULL, npages); + + *obj_p = obj; + return 0; +} + +struct drm_gem_object *gm12u320_gem_prime_import(struct drm_device *dev, + struct dma_buf *dma_buf) +{ + struct dma_buf_attachment *attach; + struct sg_table *sg; + struct gm12u320_gem_object *uobj; + int ret; + + /* need to attach */ + get_device(dev->dev); + attach = dma_buf_attach(dma_buf, dev->dev); + if (IS_ERR(attach)) { + put_device(dev->dev); + return ERR_CAST(attach); + } + + get_dma_buf(dma_buf); + + sg = dma_buf_map_attachment(attach, DMA_BIDIRECTIONAL); + if (IS_ERR(sg)) { + ret = PTR_ERR(sg); + goto fail_detach; + } + + ret = gm12u320_prime_create(dev, dma_buf->size, sg, &uobj); + if (ret) + goto fail_unmap; + + uobj->base.import_attach = attach; + uobj->flags = GM12U320_BO_WC; + + return &uobj->base; + +fail_unmap: + dma_buf_unmap_attachment(attach, sg, DMA_BIDIRECTIONAL); +fail_detach: + dma_buf_detach(dma_buf, attach); + dma_buf_put(dma_buf); + put_device(dev->dev); + return ERR_PTR(ret); +} diff --git a/drivers/gpu/drm/gm12u320/gm12u320_drv.c b/drivers/gpu/drm/gm12u320/gm12u320_drv.c new file mode 100644 index 000000000000..eb1e52a9b485 --- /dev/null +++ b/drivers/gpu/drm/gm12u320/gm12u320_drv.c @@ -0,0 +1,157 @@ +/* + * Copyright (C) 2012-2016 Red Hat Inc. + * + * This file is subject to the terms and conditions of the GNU General Public + * License v2. See the file COPYING in the main directory of this archive for + * more details. + */ + +#include <linux/module.h> +#include <drm/drmP.h> +#include <drm/drm_crtc_helper.h> +#include "gm12u320_drv.h" + +static int gm12u320_driver_set_busid(struct drm_device *d, struct drm_master *m) +{ + return 0; +} + +static const struct vm_operations_struct gm12u320_gem_vm_ops = { + .fault = gm12u320_gem_fault, + .open = drm_gem_vm_open, + .close = drm_gem_vm_close, +}; + +static const struct file_operations gm12u320_driver_fops = { + .owner = THIS_MODULE, + .open = drm_open, + .mmap = gm12u320_drm_gem_mmap, + .poll = drm_poll, + .read = drm_read, + .unlocked_ioctl = drm_ioctl, + .release = drm_release, + .compat_ioctl = drm_compat_ioctl, + .llseek = noop_llseek, +}; + +static struct drm_driver driver = { + .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME, + .load = gm12u320_driver_load, + .unload = gm12u320_driver_unload, + .set_busid = gm12u320_driver_set_busid, + + /* gem hooks */ + .gem_free_object = gm12u320_gem_free_object, + .gem_vm_ops = &gm12u320_gem_vm_ops, + + .dumb_create = gm12u320_dumb_create, + .dumb_map_offset = gm12u320_gem_mmap, + .dumb_destroy = drm_gem_dumb_destroy, + .fops = &gm12u320_driver_fops, + + .prime_handle_to_fd = drm_gem_prime_handle_to_fd, + .prime_fd_to_handle = drm_gem_prime_fd_to_handle, + .gem_prime_export = gm12u320_gem_prime_export, + .gem_prime_import = gm12u320_gem_prime_import, + + .name = DRIVER_NAME, + .desc = DRIVER_DESC, + .date = DRIVER_DATE, + .major = DRIVER_MAJOR, + .minor = DRIVER_MINOR, + .patchlevel = DRIVER_PATCHLEVEL, +}; + +static int gm12u320_usb_probe(struct usb_interface *interface, + const struct usb_device_id *id) +{ + struct usb_device *udev = interface_to_usbdev(interface); + struct drm_device *dev; + int r; + + /* + * The gm12u320 presents itself to the system as 2 usb mass-storage + * interfaces, for the second one we proceed successully with binding, + * but otherwise ignore it. + */ + if (interface->cur_altsetting->desc.bInterfaceNumber != 0) + return 0; + + dev = drm_dev_alloc(&driver, &interface->dev); + if (IS_ERR(dev)) + return PTR_ERR(dev); + + r = drm_dev_register(dev, (unsigned long)udev); + if (r) + goto err_free; + + usb_set_intfdata(interface, dev); + DRM_INFO("Initialized gm12u320 on minor %d\n", dev->primary->index); + + return 0; + +err_free: + drm_dev_unref(dev); + return r; +} + +static void gm12u320_usb_disconnect(struct usb_interface *interface) +{ + struct drm_device *dev = usb_get_intfdata(interface); + + if (!dev) + return; + + drm_kms_helper_poll_disable(dev); + gm12u320_fbdev_unplug(dev); + gm12u320_stop_fb_update(dev); + drm_unplug_dev(dev); +} + +#ifdef CONFIG_PM + +int gm12u320_suspend(struct usb_interface *interface, pm_message_t message) +{ + struct drm_device *dev = usb_get_intfdata(interface); + + if (!dev) + return 0; + + gm12u320_stop_fb_update(dev); + return 0; +} + +int gm12u320_resume(struct usb_interface *interface) +{ + struct drm_device *dev = usb_get_intfdata(interface); + + if (!dev) + return 0; + + gm12u320_set_ecomode(dev); + gm12u320_start_fb_update(dev); + return 0; +} +#endif + +static struct usb_device_id id_table[] = { + { USB_DEVICE(0x1de1, 0xc102) }, + {}, +}; +MODULE_DEVICE_TABLE(usb, id_table); + +static struct usb_driver gm12u320_driver = { + .name = "gm12u320", + .probe = gm12u320_usb_probe, + .disconnect = gm12u320_usb_disconnect, + .id_table = id_table, +#ifdef CONFIG_PM + .suspend = gm12u320_suspend, + .resume = gm12u320_resume, + .reset_resume = gm12u320_resume, +#endif +}; + +module_usb_driver(gm12u320_driver); +MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>"); +MODULE_LICENSE("GPL"); diff --git a/drivers/gpu/drm/gm12u320/gm12u320_drv.h b/drivers/gpu/drm/gm12u320/gm12u320_drv.h new file mode 100644 index 000000000000..8955a2ad753a --- /dev/null +++ b/drivers/gpu/drm/gm12u320/gm12u320_drv.h @@ -0,0 +1,129 @@ +/* + * Copyright (C) 2012-2016 Red Hat Inc. + * + * Based in parts on the udl code. Based in parts on the gm12u320 fb driver: + * Copyright (C) 2013 Viacheslav Nurmekhamitov <slavrn@yandex.ru> + * Copyright (C) 2009 Roberto De Ioris <roberto@unbit.it> + * Copyright (C) 2009 Jaya Kumar <jayakumar.lkml@gmail.com> + * Copyright (C) 2009 Bernie Thompson <bernie@plugable.com> + * + * This file is subject to the terms and conditions of the GNU General Public + * License v2. See the file COPYING in the main directory of this archive for + * more details. + */ + +#ifndef GM12U320_DRV_H +#define GM12U320_DRV_H + +#include <linux/usb.h> +#include <linux/spinlock.h> +#include <drm/drm_gem.h> + +#define DRIVER_NAME "gm12u320" +#define DRIVER_DESC "Grain Media GM12U320 USB projector display" +#define DRIVER_DATE "20150107" + +#define DRIVER_MAJOR 0 +#define DRIVER_MINOR 0 +#define DRIVER_PATCHLEVEL 1 + +#define GM12U320_BO_CACHEABLE (1 << 0) +#define GM12U320_BO_WC (1 << 1) + +/* + * The DLP has an actual width of 854 pixels, but that is not a multiple + * of 4, breaking things left and right, so we export a width of 852. + */ +#define GM12U320_USER_WIDTH 852 +#define GM12U320_REAL_WIDTH 854 +#define GM12U320_HEIGHT 480 + +#define GM12U320_BLOCK_COUNT 20 + +struct gm12u320_device; + +struct gm12u320_fbdev; + +struct gm12u320_device { + struct device *dev; + struct usb_device *udev; + struct drm_device *ddev; + struct gm12u320_fbdev *fbdev; + unsigned char *cmd_buf; + unsigned char *data_buf[GM12U320_BLOCK_COUNT]; + struct { + bool run; + struct workqueue_struct *workq; + struct work_struct work; + wait_queue_head_t waitq; + struct mutex lock; + struct gm12u320_framebuffer *fb; + int x1; + int x2; + int y1; + int y2; + } fb_update; +}; + +struct gm12u320_gem_object { + struct drm_gem_object base; + struct page **pages; + void *vmapping; + struct sg_table *sg; + unsigned int flags; +}; + +#define to_gm12u320_bo(x) container_of(x, struct gm12u320_gem_object, base) + +struct gm12u320_framebuffer { + struct drm_framebuffer base; + struct gm12u320_gem_object *obj; +}; + +#define to_gm12u320_fb(x) container_of(x, struct gm12u320_framebuffer, base) + +/* modeset */ +int gm12u320_modeset_init(struct drm_device *dev); +void gm12u320_modeset_cleanup(struct drm_device *dev); +int gm12u320_connector_init(struct drm_device *dev, + struct drm_encoder *encoder); + +struct drm_encoder *gm12u320_encoder_init(struct drm_device *dev); + +int gm12u320_driver_load(struct drm_device *dev, unsigned long flags); +void gm12u320_driver_unload(struct drm_device *dev); + +int gm12u320_fbdev_init(struct drm_device *dev); +void gm12u320_fbdev_cleanup(struct drm_device *dev); +void gm12u320_fbdev_unplug(struct drm_device *dev); +struct drm_framebuffer * +gm12u320_fb_user_fb_create(struct drm_device *dev, struct drm_file *file, + const struct drm_mode_fb_cmd2 *mode_cmd); + +int gm12u320_dumb_create(struct drm_file *file_priv, struct drm_device *dev, + struct drm_mode_create_dumb *args); +int gm12u320_gem_mmap(struct drm_file *file_priv, struct drm_device *dev, + uint32_t handle, uint64_t *offset); + +struct gm12u320_gem_object * +gm12u320_gem_alloc_object(struct drm_device *dev, size_t size); +void gm12u320_gem_free_object(struct drm_gem_object *gem_obj); +struct dma_buf *gm12u320_gem_prime_export(struct drm_device *dev, + struct drm_gem_object *obj, int flags); +struct drm_gem_object *gm12u320_gem_prime_import(struct drm_device *dev, + struct dma_buf *dma_buf); + +int gm12u320_gem_get_pages(struct gm12u320_gem_object *obj); +void gm12u320_gem_put_pages(struct gm12u320_gem_object *obj); +int gm12u320_gem_vmap(struct gm12u320_gem_object *obj); +void gm12u320_gem_vunmap(struct gm12u320_gem_object *obj); +int gm12u320_drm_gem_mmap(struct file *filp, struct vm_area_struct *vma); +int gm12u320_gem_fault(struct vm_fault *vmf); + +void gm12u320_fb_mark_dirty(struct gm12u320_framebuffer *fb, + int x1, int x2, int y1, int y2); +void gm12u320_start_fb_update(struct drm_device *dev); +void gm12u320_stop_fb_update(struct drm_device *dev); +int gm12u320_set_ecomode(struct drm_device *dev); + +#endif diff --git a/drivers/gpu/drm/gm12u320/gm12u320_encoder.c b/drivers/gpu/drm/gm12u320/gm12u320_encoder.c new file mode 100644 index 000000000000..085f05b06674 --- /dev/null +++ b/drivers/gpu/drm/gm12u320/gm12u320_encoder.c @@ -0,0 +1,75 @@ +/* + * Copyright (C) 2012-2016 Red Hat Inc. + * + * Based in parts on the udl code. Based in parts on the gm12u320 fb driver: + * Copyright (C) 2013 Viacheslav Nurmekhamitov <slavrn@yandex.ru> + * Copyright (C) 2009 Roberto De Ioris <roberto@unbit.it> + * Copyright (C) 2009 Jaya Kumar <jayakumar.lkml@gmail.com> + * Copyright (C) 2009 Bernie Thompson <bernie@plugable.com> + * + * This file is subject to the terms and conditions of the GNU General Public + * License v2. See the file COPYING in the main directory of this archive for + * more details. + */ + +#include <drm/drmP.h> +#include <drm/drm_crtc.h> +#include <drm/drm_crtc_helper.h> +#include "gm12u320_drv.h" + +/* dummy encoder */ +static void gm12u320_enc_destroy(struct drm_encoder *encoder) +{ + drm_encoder_cleanup(encoder); + kfree(encoder); +} + +static void gm12u320_encoder_disable(struct drm_encoder *encoder) +{ +} + +static void gm12u320_encoder_prepare(struct drm_encoder *encoder) +{ +} + +static void gm12u320_encoder_commit(struct drm_encoder *encoder) +{ +} + +static void gm12u320_encoder_mode_set(struct drm_encoder *encoder, + struct drm_display_mode *mode, + struct drm_display_mode *adjusted_mode) +{ +} + +static void +gm12u320_encoder_dpms(struct drm_encoder *encoder, int mode) +{ +} + +static const struct drm_encoder_helper_funcs gm12u320_helper_funcs = { + .dpms = gm12u320_encoder_dpms, + .prepare = gm12u320_encoder_prepare, + .mode_set = gm12u320_encoder_mode_set, + .commit = gm12u320_encoder_commit, + .disable = gm12u320_encoder_disable, +}; + +static const struct drm_encoder_funcs gm12u320_enc_funcs = { + .destroy = gm12u320_enc_destroy, +}; + +struct drm_encoder *gm12u320_encoder_init(struct drm_device *dev) +{ + struct drm_encoder *encoder; + + encoder = kzalloc(sizeof(struct drm_encoder), GFP_KERNEL); + if (!encoder) + return NULL; + + drm_encoder_init(dev, encoder, &gm12u320_enc_funcs, + DRM_MODE_ENCODER_TMDS, NULL); + drm_encoder_helper_add(encoder, &gm12u320_helper_funcs); + encoder->possible_crtcs = 1; + return encoder; +} diff --git a/drivers/gpu/drm/gm12u320/gm12u320_fb.c b/drivers/gpu/drm/gm12u320/gm12u320_fb.c new file mode 100644 index 000000000000..8b7605f76af9 --- /dev/null +++ b/drivers/gpu/drm/gm12u320/gm12u320_fb.c @@ -0,0 +1,343 @@ +/* + * Copyright (C) 2012-2016 Red Hat Inc. + * + * Based in parts on the udl code. Based in parts on the gm12u320 fb driver: + * Copyright (C) 2013 Viacheslav Nurmekhamitov <slavrn@yandex.ru> + * Copyright (C) 2009 Roberto De Ioris <roberto@unbit.it> + * Copyright (C) 2009 Jaya Kumar <jayakumar.lkml@gmail.com> + * Copyright (C) 2009 Bernie Thompson <bernie@plugable.com> + * + * This file is subject to the terms and conditions of the GNU General Public + * License v2. See the file COPYING in the main directory of this archive for + * more details. + */ +#include <linux/module.h> +#include <linux/slab.h> +#include <linux/fb.h> + +#include <drm/drmP.h> +#include <drm/drm_crtc.h> +#include <drm/drm_crtc_helper.h> +#include "gm12u320_drv.h" + +#include <drm/drm_fb_helper.h> + +struct gm12u320_fbdev { + struct drm_fb_helper helper; + struct gm12u320_framebuffer fb; +}; + +void gm12u320_fb_mark_dirty(struct gm12u320_framebuffer *fb, + int x1, int x2, int y1, int y2) +{ + struct drm_device *dev = fb->base.dev; + struct gm12u320_device *gm12u320 = dev->dev_private; + struct gm12u320_framebuffer *old_fb = NULL; + bool wakeup = false; + + mutex_lock(&gm12u320->fb_update.lock); + + if (gm12u320->fb_update.fb != fb) { + gm12u320->fb_update.x1 = x1; + gm12u320->fb_update.x2 = x2; + gm12u320->fb_update.y1 = y1; + gm12u320->fb_update.y2 = y2; + old_fb = gm12u320->fb_update.fb; + gm12u320->fb_update.fb = fb; + drm_framebuffer_reference(&gm12u320->fb_update.fb->base); + wakeup = true; + } else { + gm12u320->fb_update.x1 = min(gm12u320->fb_update.x1, x1); + gm12u320->fb_update.x2 = max(gm12u320->fb_update.x2, x2); + gm12u320->fb_update.y1 = min(gm12u320->fb_update.y1, y1); + gm12u320->fb_update.y2 = max(gm12u320->fb_update.y2, y2); + } + + mutex_unlock(&gm12u320->fb_update.lock); + + if (wakeup) + wake_up(&gm12u320->fb_update.waitq); + + if (old_fb) + drm_framebuffer_unreference(&old_fb->base); +} + +static int gm12u320_fb_open(struct fb_info *info, int user) +{ + struct gm12u320_fbdev *fbdev = info->par; + struct drm_device *ddev = fbdev->fb.base.dev; + + /* If the USB device is gone, we don't accept new opens */ + if (drm_device_is_unplugged(ddev)) + return -ENODEV; + + return 0; +} + +static struct fb_ops gm12u320_fb_ops = { + .owner = THIS_MODULE, + DRM_FB_HELPER_DEFAULT_OPS, + .fb_fillrect = drm_fb_helper_sys_fillrect, + .fb_copyarea = drm_fb_helper_sys_copyarea, + .fb_imageblit = drm_fb_helper_sys_imageblit, + .fb_open = gm12u320_fb_open, +}; + +#ifdef CONFIG_DRM_FBDEV_EMULATION +static struct fb_deferred_io gm12u320_fb_defio = { + .delay = HZ / 30, + .deferred_io = drm_fb_helper_deferred_io, +}; +#endif + +static int gm12u320_user_framebuffer_dirty(struct drm_framebuffer *drm_fb, + struct drm_file *file, + unsigned flags, unsigned color, + struct drm_clip_rect *clips, + unsigned num_clips) +{ + struct gm12u320_framebuffer *fb = to_gm12u320_fb(drm_fb); + int x1, x2, y1, y2; + + if (num_clips == 0) + return 0; + + x1 = clips->x1; + x2 = clips->x2; + y1 = clips->y1; + y2 = clips->y2; + + while (--num_clips) { + clips++; + x1 = min_t(int, x1, (int)clips->x1); + x2 = max_t(int, x2, (int)clips->x2); + y1 = min_t(int, y1, (int)clips->y1); + y2 = max_t(int, y2, (int)clips->y2); + } + + gm12u320_fb_mark_dirty(fb, x1, x2, y1, y2); + + return 0; +} + +static void gm12u320_user_framebuffer_destroy(struct drm_framebuffer *drm_fb) +{ + struct gm12u320_framebuffer *fb = to_gm12u320_fb(drm_fb); + + if (fb->obj) + drm_gem_object_unreference_unlocked(&fb->obj->base); + + drm_framebuffer_cleanup(drm_fb); + kfree(fb); +} + +static const struct drm_framebuffer_funcs gm12u320fb_funcs = { + .destroy = gm12u320_user_framebuffer_destroy, + .dirty = gm12u320_user_framebuffer_dirty, +}; + +static int +gm12u320_framebuffer_init(struct drm_device *dev, + struct gm12u320_framebuffer *fb, + const struct drm_mode_fb_cmd2 *mode_cmd, + struct gm12u320_gem_object *obj) +{ + int ret; + + fb->obj = obj; + drm_helper_mode_fill_fb_struct(dev, &fb->base, mode_cmd); + ret = drm_framebuffer_init(dev, &fb->base, &gm12u320fb_funcs); + return ret; +} + +static int gm12u320fb_create(struct drm_fb_helper *helper, + struct drm_fb_helper_surface_size *sizes) +{ + struct gm12u320_fbdev *fbdev = + container_of(helper, struct gm12u320_fbdev, helper); + struct drm_device *dev = fbdev->helper.dev; + struct fb_info *info; + struct drm_framebuffer *drm_fb; + struct drm_mode_fb_cmd2 mode_cmd; + struct gm12u320_gem_object *obj; + uint32_t size; + int ret = 0; + + if (sizes->surface_bpp == 24) + sizes->surface_bpp = 32; + + mode_cmd.width = sizes->surface_width; + mode_cmd.height = sizes->surface_height; + mode_cmd.pitches[0] = mode_cmd.width * ((sizes->surface_bpp + 7) / 8); + + mode_cmd.pixel_format = drm_mode_legacy_fb_format(sizes->surface_bpp, + sizes->surface_depth); + + size = mode_cmd.pitches[0] * mode_cmd.height; + size = ALIGN(size, PAGE_SIZE); + + obj = gm12u320_gem_alloc_object(dev, size); + if (!obj) + goto out; + + ret = gm12u320_gem_vmap(obj); + if (ret) { + DRM_ERROR("failed to vmap fb\n"); + goto out_gfree; + } + + info = drm_fb_helper_alloc_fbi(helper); + if (IS_ERR(info)) { + ret = PTR_ERR(info); + goto out_gfree; + } + info->par = fbdev; + + ret = gm12u320_framebuffer_init(dev, &fbdev->fb, &mode_cmd, obj); + if (ret) + goto out_gfree; + + drm_fb = &fbdev->fb.base; + + fbdev->helper.fb = drm_fb; + + strcpy(info->fix.id, "gm12u320drmfb"); + + info->screen_base = fbdev->fb.obj->vmapping; + info->fix.smem_len = size; + info->fix.smem_start = (unsigned long)fbdev->fb.obj->vmapping; + + info->flags = FBINFO_DEFAULT | FBINFO_CAN_FORCE_OUTPUT; + info->fbops = &gm12u320_fb_ops; + drm_fb_helper_fill_fix(info, drm_fb->pitches[0], drm_fb->format->depth); + drm_fb_helper_fill_var(info, &fbdev->helper, + sizes->fb_width, sizes->fb_height); +#ifdef CONFIG_DRM_FBDEV_EMULATION + info->fbdefio = &gm12u320_fb_defio; + fb_deferred_io_init(info); +#endif + + DRM_DEBUG_KMS("allocated %dx%d vmal %p\n", + drm_fb->width, drm_fb->height, + fbdev->fb.obj->vmapping); + + return ret; + +out_gfree: + drm_gem_object_unreference_unlocked(&fbdev->fb.obj->base); +out: + return ret; +} + +static const struct drm_fb_helper_funcs gm12u320_fb_helper_funcs = { + .fb_probe = gm12u320fb_create, +}; + +static void gm12u320_fbdev_destroy(struct drm_device *dev, + struct gm12u320_fbdev *fbdev) +{ +#ifdef CONFIG_DRM_FBDEV_EMULATION + fb_deferred_io_cleanup(fbdev->helper.fbdev); +#endif + drm_fb_helper_unregister_fbi(&fbdev->helper); + drm_fb_helper_fini(&fbdev->helper); + drm_framebuffer_unregister_private(&fbdev->fb.base); + drm_framebuffer_cleanup(&fbdev->fb.base); + drm_gem_object_unreference_unlocked(&fbdev->fb.obj->base); +} + +int gm12u320_fbdev_init(struct drm_device *dev) +{ + struct gm12u320_device *gm12u320 = dev->dev_private; + struct gm12u320_fbdev *fbdev; + int ret; + + fbdev = kzalloc(sizeof(struct gm12u320_fbdev), GFP_KERNEL); + if (!fbdev) + return -ENOMEM; + + gm12u320->fbdev = fbdev; + + drm_fb_helper_prepare(dev, &fbdev->helper, &gm12u320_fb_helper_funcs); + + ret = drm_fb_helper_init(dev, &fbdev->helper, 1); + if (ret) + goto free; + + ret = drm_fb_helper_single_add_all_connectors(&fbdev->helper); + if (ret) + goto fini; + + /* disable all the possible outputs/crtcs before entering KMS mode */ + drm_helper_disable_unused_functions(dev); + + ret = drm_fb_helper_initial_config(&fbdev->helper, 32); + if (ret) + goto fini; + + return 0; + +fini: + drm_fb_helper_fini(&fbdev->helper); +free: + kfree(fbdev); + return ret; +} + +void gm12u320_fbdev_cleanup(struct drm_device *dev) +{ + struct gm12u320_device *gm12u320 = dev->dev_private; + + if (!gm12u320->fbdev) + return; + + gm12u320_fbdev_destroy(dev, gm12u320->fbdev); + kfree(gm12u320->fbdev); + gm12u320->fbdev = NULL; +} + +void gm12u320_fbdev_unplug(struct drm_device *dev) +{ + struct gm12u320_device *gm12u320 = dev->dev_private; + + if (!gm12u320->fbdev) + return; + + drm_fb_helper_unlink_fbi(&gm12u320->fbdev->helper); +} + +struct drm_framebuffer * +gm12u320_fb_user_fb_create(struct drm_device *dev, + struct drm_file *file, + const struct drm_mode_fb_cmd2 *mode_cmd) +{ + struct drm_gem_object *obj; + struct gm12u320_framebuffer *fb; + int ret; + uint32_t size; + + obj = drm_gem_object_lookup(file, mode_cmd->handles[0]); + if (obj == NULL) + return ERR_PTR(-ENOENT); + + size = mode_cmd->pitches[0] * mode_cmd->height; + size = ALIGN(size, PAGE_SIZE); + + if (size > obj->size) { + DRM_ERROR("object size not sufficient for fb %d %zu %d %d\n", + size, obj->size, mode_cmd->pitches[0], + mode_cmd->height); + return ERR_PTR(-ENOMEM); + } + + fb = kzalloc(sizeof(*fb), GFP_KERNEL); + if (fb == NULL) + return ERR_PTR(-ENOMEM); + + ret = gm12u320_framebuffer_init(dev, fb, mode_cmd, to_gm12u320_bo(obj)); + if (ret) { + kfree(fb); + return ERR_PTR(-EINVAL); + } + return &fb->base; +} diff --git a/drivers/gpu/drm/gm12u320/gm12u320_gem.c b/drivers/gpu/drm/gm12u320/gm12u320_gem.c new file mode 100644 index 000000000000..7bc576fae177 --- /dev/null +++ b/drivers/gpu/drm/gm12u320/gm12u320_gem.c @@ -0,0 +1,237 @@ +/* + * Copyright (C) 2012-2016 Red Hat Inc. + * + * This file is subject to the terms and conditions of the GNU General Public + * License v2. See the file COPYING in the main directory of this archive for + * more details. + */ + +#include <drm/drmP.h> +#include "gm12u320_drv.h" +#include <linux/shmem_fs.h> +#include <linux/dma-buf.h> + +struct gm12u320_gem_object * +gm12u320_gem_alloc_object(struct drm_device *dev, size_t size) +{ + struct gm12u320_gem_object *obj; + + obj = kzalloc(sizeof(*obj), GFP_KERNEL); + if (obj == NULL) + return NULL; + + if (drm_gem_object_init(dev, &obj->base, size) != 0) { + kfree(obj); + return NULL; + } + + obj->flags = GM12U320_BO_CACHEABLE; + return obj; +} + +static int gm12u320_gem_create(struct drm_file *file, struct drm_device *dev, + uint64_t size, uint32_t *handle_p) +{ + struct gm12u320_gem_object *obj; + int ret; + u32 handle; + + size = roundup(size, PAGE_SIZE); + + obj = gm12u320_gem_alloc_object(dev, size); + if (obj == NULL) + return -ENOMEM; + + ret = drm_gem_handle_create(file, &obj->base, &handle); + if (ret) { + drm_gem_object_release(&obj->base); + kfree(obj); + return ret; + } + + drm_gem_object_unreference_unlocked(&obj->base); + *handle_p = handle; + return 0; +} + +static void update_vm_cache_attr(struct gm12u320_gem_object *obj, + struct vm_area_struct *vma) +{ + DRM_DEBUG_KMS("flags = 0x%x\n", obj->flags); + + /* non-cacheable as default. */ + if (obj->flags & GM12U320_BO_CACHEABLE) { + vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); + } else if (obj->flags & GM12U320_BO_WC) { + vma->vm_page_prot = + pgprot_writecombine(vm_get_page_prot(vma->vm_flags)); + } else { + vma->vm_page_prot = + pgprot_noncached(vm_get_page_prot(vma->vm_flags)); + } +} + +int gm12u320_dumb_create(struct drm_file *file, struct drm_device *dev, + struct drm_mode_create_dumb *args) +{ + args->pitch = args->width * DIV_ROUND_UP(args->bpp, 8); + args->size = args->pitch * args->height; + return gm12u320_gem_create(file, dev, + args->size, &args->handle); +} + +int gm12u320_drm_gem_mmap(struct file *filp, struct vm_area_struct *vma) +{ + int ret; + + ret = drm_gem_mmap(filp, vma); + if (ret) + return ret; + + vma->vm_flags &= ~VM_PFNMAP; + vma->vm_flags |= VM_MIXEDMAP; + + update_vm_cache_attr(to_gm12u320_bo(vma->vm_private_data), vma); + + return ret; +} + +int gm12u320_gem_fault(struct vm_fault *vmf) +{ + struct vm_area_struct *vma = vmf->vma; + struct gm12u320_gem_object *obj = to_gm12u320_bo(vma->vm_private_data); + unsigned int page_offset; + struct page *page; + int ret = 0; + + page_offset = (vmf->address - vma->vm_start) >> PAGE_SHIFT; + + if (!obj->pages) + return VM_FAULT_SIGBUS; + + page = obj->pages[page_offset]; + ret = vm_insert_page(vma, vmf->address, page); + switch (ret) { + case -EAGAIN: + case 0: + case -ERESTARTSYS: + return VM_FAULT_NOPAGE; + case -ENOMEM: + return VM_FAULT_OOM; + default: + return VM_FAULT_SIGBUS; + } +} + +int gm12u320_gem_get_pages(struct gm12u320_gem_object *obj) +{ + struct page **pages; + + if (obj->pages) + return 0; + + pages = drm_gem_get_pages(&obj->base); + if (IS_ERR(pages)) + return PTR_ERR(pages); + + obj->pages = pages; + + return 0; +} + +void gm12u320_gem_put_pages(struct gm12u320_gem_object *obj) +{ + if (obj->base.import_attach) { + drm_free_large(obj->pages); + obj->pages = NULL; + return; + } + + drm_gem_put_pages(&obj->base, obj->pages, false, false); + obj->pages = NULL; +} + +int gm12u320_gem_vmap(struct gm12u320_gem_object *obj) +{ + int page_count = obj->base.size / PAGE_SIZE; + int ret; + + if (obj->base.import_attach) { + obj->vmapping = dma_buf_vmap(obj->base.import_attach->dmabuf); + if (!obj->vmapping) + return -ENOMEM; + return 0; + } + + ret = gm12u320_gem_get_pages(obj); + if (ret) + return ret; + + obj->vmapping = vmap(obj->pages, page_count, 0, PAGE_KERNEL); + if (!obj->vmapping) + return -ENOMEM; + return 0; +} + +void gm12u320_gem_vunmap(struct gm12u320_gem_object *obj) +{ + if (obj->base.import_attach) { + dma_buf_vunmap(obj->base.import_attach->dmabuf, obj->vmapping); + return; + } + + vunmap(obj->vmapping); + + gm12u320_gem_put_pages(obj); +} + +void gm12u320_gem_free_object(struct drm_gem_object *gem_obj) +{ + struct gm12u320_gem_object *obj = to_gm12u320_bo(gem_obj); + + if (obj->vmapping) + gm12u320_gem_vunmap(obj); + + if (gem_obj->import_attach) { + drm_prime_gem_destroy(gem_obj, obj->sg); + put_device(gem_obj->dev->dev); + } + + if (obj->pages) + gm12u320_gem_put_pages(obj); + + drm_gem_free_mmap_offset(gem_obj); +} + +/* the dumb interface doesn't work with the GEM straight MMAP + interface, it expects to do MMAP on the drm fd, like normal */ +int gm12u320_gem_mmap(struct drm_file *file, struct drm_device *dev, + uint32_t handle, uint64_t *offset) +{ + struct gm12u320_gem_object *gobj; + struct drm_gem_object *obj; + int ret = 0; + + mutex_lock(&dev->struct_mutex); + obj = drm_gem_object_lookup(file, handle); + if (obj == NULL) { + ret = -ENOENT; + goto unlock; + } + gobj = to_gm12u320_bo(obj); + + ret = gm12u320_gem_get_pages(gobj); + if (ret) + goto out; + ret = drm_gem_create_mmap_offset(obj); + if (ret) + goto out; + + *offset = drm_vma_node_offset_addr(&gobj->base.vma_node); + +out: + drm_gem_object_unreference(&gobj->base); +unlock: + mutex_unlock(&dev->struct_mutex); + return ret; +} diff --git a/drivers/gpu/drm/gm12u320/gm12u320_main.c b/drivers/gpu/drm/gm12u320/gm12u320_main.c new file mode 100644 index 000000000000..6b9ab9d6d15b --- /dev/null +++ b/drivers/gpu/drm/gm12u320/gm12u320_main.c @@ -0,0 +1,506 @@ +/* + * Copyright (C) 2012-2016 Red Hat Inc. + * + * Based in parts on the udl code. Based in parts on the gm12u320 fb driver: + * Copyright (C) 2013 Viacheslav Nurmekhamitov <slavrn@yandex.ru> + * Copyright (C) 2009 Roberto De Ioris <roberto@unbit.it> + * Copyright (C) 2009 Jaya Kumar <jayakumar.lkml@gmail.com> + * Copyright (C) 2009 Bernie Thompson <bernie@plugable.com> + * + * This file is subject to the terms and conditions of the GNU General Public + * License v2. See the file COPYING in the main directory of this archive for + * more details. + */ +#include <drm/drmP.h> +#include <linux/dma-buf.h> +#include "gm12u320_drv.h" + +static bool eco_mode; +module_param(eco_mode, bool, 0644); +MODULE_PARM_DESC(eco_mode, "Turn on Eco mode (less bright, more silent)"); + +#define MISC_RCV_EPT 1 +#define DATA_RCV_EPT 2 +#define DATA_SND_EPT 3 +#define MISC_SND_EPT 4 + +#define DATA_BLOCK_HEADER_SIZE 84 +#define DATA_BLOCK_CONTENT_SIZE 64512 +#define DATA_BLOCK_FOOTER_SIZE 20 +#define DATA_BLOCK_SIZE (DATA_BLOCK_HEADER_SIZE + \ + DATA_BLOCK_CONTENT_SIZE + \ + DATA_BLOCK_FOOTER_SIZE) +#define DATA_LAST_BLOCK_CONTENT_SIZE 4032 +#define DATA_LAST_BLOCK_SIZE (DATA_BLOCK_HEADER_SIZE + \ + DATA_LAST_BLOCK_CONTENT_SIZE + \ + DATA_BLOCK_FOOTER_SIZE) + +#define CMD_SIZE 31 +#define READ_STATUS_SIZE 13 +#define MISC_VALUE_SIZE 4 + +#define CMD_TIMEOUT 200 +#define DATA_TIMEOUT 1000 +#define IDLE_TIMEOUT 2000 +#define FIRST_FRAME_TIMEOUT 2000 + +#define MISC_REQ_GET_SET_ECO_A 0xff +#define MISC_REQ_GET_SET_ECO_B 0x35 +/* Windows driver does once evert second, with with arg d = 1, others 0 */ +#define MISC_REQ_UNKNOWN1_A 0xff +#define MISC_REQ_UNKNOWN1_B 0x38 +/* Windows driver does this on init, with arg a, b = 0, c = 0xa0, d = 4 */ +#define MISC_REQ_UNKNOWN2_A 0xa5 +#define MISC_REQ_UNKNOWN2_B 0x00 + +static const char cmd_data[CMD_SIZE] = { + 0x55, 0x53, 0x42, 0x43, 0x00, 0x00, 0x00, 0x00, + 0x68, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x10, 0xff, + 0x00, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x80, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +}; + +static const char cmd_draw[CMD_SIZE] = { + 0x55, 0x53, 0x42, 0x43, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xfe, + 0x00, 0x00, 0x00, 0xc0, 0xd1, 0x05, 0x00, 0x40, + 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 +}; + +static const char cmd_misc[CMD_SIZE] = { + 0x55, 0x53, 0x42, 0x43, 0x00, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x80, 0x01, 0x10, 0xfd, + 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +}; + +static const char data_block_header[DATA_BLOCK_HEADER_SIZE] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xfb, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x04, 0x15, 0x00, 0x00, 0xfc, 0x00, 0x00, + 0x01, 0x00, 0x00, 0xdb +}; + +static const char data_last_block_header[DATA_BLOCK_HEADER_SIZE] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xfb, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x2a, 0x00, 0x20, 0x00, 0xc0, 0x0f, 0x00, 0x00, + 0x01, 0x00, 0x00, 0xd7 +}; + +static const char data_block_footer[DATA_BLOCK_FOOTER_SIZE] = { + 0xfb, 0x14, 0x02, 0x20, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x80, 0x00, 0x00, 0x4f +}; + +static int gm12u320_usb_alloc(struct gm12u320_device *gm12u320) +{ + int i, block_size; + const char *hdr; + + gm12u320->cmd_buf = kmalloc(CMD_SIZE, GFP_KERNEL); + if (!gm12u320->cmd_buf) + return -ENOMEM; + + for (i = 0; i < GM12U320_BLOCK_COUNT; i++) { + if (i == GM12U320_BLOCK_COUNT - 1) { + block_size = DATA_LAST_BLOCK_SIZE; + hdr = data_last_block_header; + } else { + block_size = DATA_BLOCK_SIZE; + hdr = data_block_header; + } + + gm12u320->data_buf[i] = kzalloc(block_size, GFP_KERNEL); + if (!gm12u320->data_buf[i]) + return -ENOMEM; + + memcpy(gm12u320->data_buf[i], hdr, DATA_BLOCK_HEADER_SIZE); + memcpy(gm12u320->data_buf[i] + + (block_size - DATA_BLOCK_FOOTER_SIZE), + data_block_footer, DATA_BLOCK_FOOTER_SIZE); + } + + return 0; +} + +static void gm12u320_usb_free(struct gm12u320_device *gm12u320) +{ + int i; + + for (i = 0; i < GM12U320_BLOCK_COUNT; i++) + kfree(gm12u320->data_buf[i]); + + kfree(gm12u320->cmd_buf); +} + +static int gm12u320_misc_request(struct gm12u320_device *gm12u320, + u8 req_a, u8 req_b, + u8 arg_a, u8 arg_b, u8 arg_c, u8 arg_d) +{ + int ret, len; + u8 *buf, val; + + buf = kmalloc(CMD_SIZE, GFP_KERNEL); + if (!buf) + return -ENOMEM; + + memcpy(buf, &cmd_misc, CMD_SIZE); + buf[20] = req_a; + buf[21] = req_b; + buf[22] = arg_a; + buf[23] = arg_b; + buf[24] = arg_c; + buf[25] = arg_d; + + /* Send request */ + ret = usb_bulk_msg(gm12u320->udev, + usb_sndbulkpipe(gm12u320->udev, MISC_SND_EPT), + buf, CMD_SIZE, &len, CMD_TIMEOUT); + if (ret || len != CMD_SIZE) { + dev_err(&gm12u320->udev->dev, "Misc. req. error %d\n", ret); + ret = -EIO; + goto leave; + } + + /* Read value */ + ret = usb_bulk_msg(gm12u320->udev, + usb_rcvbulkpipe(gm12u320->udev, MISC_RCV_EPT), + buf, MISC_VALUE_SIZE, &len, DATA_TIMEOUT); + if (ret || len != MISC_VALUE_SIZE) { + dev_err(&gm12u320->udev->dev, "Misc. value error %d\n", ret); + ret = -EIO; + goto leave; + } + val = buf[0]; + + /* Read status */ + ret = usb_bulk_msg(gm12u320->udev, + usb_rcvbulkpipe(gm12u320->udev, MISC_RCV_EPT), + buf, READ_STATUS_SIZE, &len, CMD_TIMEOUT); + if (ret || len != READ_STATUS_SIZE) { + dev_err(&gm12u320->udev->dev, "Misc. status error %d\n", ret); + ret = -EIO; + goto leave; + } + + ret = val; +leave: + kfree(buf); + return ret; +} + +void gm12u320_32bpp_to_24bpp_packed(u8 *dst, u8 *src, int len) +{ + while (len--) { + *dst++ = *src++; + *dst++ = *src++; + *dst++ = *src++; + src++; + } +} + +static void gm12u320_copy_fb_to_blocks(struct gm12u320_framebuffer *fb, + int x1, int x2, int y1, int y2) +{ + struct drm_device *dev = fb->base.dev; + struct gm12u320_device *gm12u320 = dev->dev_private; + int block, dst_offset, len, remain, ret; + u8 *src; + + if (fb->obj->base.import_attach) { + ret = dma_buf_begin_cpu_access( + fb->obj->base.import_attach->dmabuf, DMA_FROM_DEVICE); + if (ret) { + DRM_ERROR("dma_buf_begin_cpu_access err: %d\n", ret); + return; + } + } + + if (!fb->obj->vmapping) { + ret = gm12u320_gem_vmap(fb->obj); + if (ret) { + DRM_ERROR("failed to vmap fb: %d\n", ret); + goto end_cpu_access; + } + } + + src = fb->obj->vmapping + y1 * fb->base.pitches[0] + x1 * 4; + + x1 += (GM12U320_REAL_WIDTH - GM12U320_USER_WIDTH) / 2; + x2 += (GM12U320_REAL_WIDTH - GM12U320_USER_WIDTH) / 2; + + for (; y1 < y2; y1++) { + remain = 0; + len = (x2 - x1) * 3; + dst_offset = (y1 * GM12U320_REAL_WIDTH + x1) * 3; + block = dst_offset / DATA_BLOCK_CONTENT_SIZE; + dst_offset %= DATA_BLOCK_CONTENT_SIZE; + + if ((dst_offset + len) > DATA_BLOCK_CONTENT_SIZE) { + remain = dst_offset + len - DATA_BLOCK_CONTENT_SIZE; + len = DATA_BLOCK_CONTENT_SIZE - dst_offset; + } + + dst_offset += DATA_BLOCK_HEADER_SIZE; + len /= 3; + + gm12u320_32bpp_to_24bpp_packed( + gm12u320->data_buf[block] + dst_offset, + src, len); + + if (remain) { + block++; + dst_offset = DATA_BLOCK_HEADER_SIZE; + gm12u320_32bpp_to_24bpp_packed( + gm12u320->data_buf[block] + dst_offset, + src + len * 4, remain / 3); + } + src += fb->base.pitches[0]; + } + +end_cpu_access: + if (fb->obj->base.import_attach) { + ret = dma_buf_end_cpu_access( + fb->obj->base.import_attach->dmabuf, DMA_FROM_DEVICE); + if (ret) + DRM_ERROR("dma_buf_end_cpu_access err: %d\n", ret); + } +} + +static int gm12u320_fb_update_ready(struct gm12u320_device *gm12u320) +{ + int ret; + + mutex_lock(&gm12u320->fb_update.lock); + ret = !gm12u320->fb_update.run || gm12u320->fb_update.fb != NULL; + mutex_unlock(&gm12u320->fb_update.lock); + + return ret; +} + +static void gm12u320_fb_update_work(struct work_struct *work) +{ + struct gm12u320_device *gm12u320 = + container_of(work, struct gm12u320_device, fb_update.work); + int draw_status_timeout = FIRST_FRAME_TIMEOUT; + int block, block_size, len, x1, x2, y1, y2; + struct gm12u320_framebuffer *fb; + int frame = 0; + int ret = 0; + + while (gm12u320->fb_update.run) { + mutex_lock(&gm12u320->fb_update.lock); + fb = gm12u320->fb_update.fb; + x1 = gm12u320->fb_update.x1; + x2 = gm12u320->fb_update.x2; + y1 = gm12u320->fb_update.y1; + y2 = gm12u320->fb_update.y2; + gm12u320->fb_update.fb = NULL; + mutex_unlock(&gm12u320->fb_update.lock); + + if (fb) { + gm12u320_copy_fb_to_blocks(fb, x1, x2, y1, y2); + drm_framebuffer_unreference(&fb->base); + } + + for (block = 0; block < GM12U320_BLOCK_COUNT; block++) { + if (block == GM12U320_BLOCK_COUNT - 1) + block_size = DATA_LAST_BLOCK_SIZE; + else + block_size = DATA_BLOCK_SIZE; + + /* Send data command to device */ + memcpy(gm12u320->cmd_buf, cmd_data, CMD_SIZE); + gm12u320->cmd_buf[8] = block_size & 0xff; + gm12u320->cmd_buf[9] = block_size >> 8; + gm12u320->cmd_buf[20] = 0xfc - block * 4; + gm12u320->cmd_buf[21] = block | (frame << 7); + + ret = usb_bulk_msg(gm12u320->udev, + usb_sndbulkpipe(gm12u320->udev, DATA_SND_EPT), + gm12u320->cmd_buf, CMD_SIZE, &len, + CMD_TIMEOUT); + if (ret || len != CMD_SIZE) + goto err; + + /* Send data block to device */ + ret = usb_bulk_msg(gm12u320->udev, + usb_sndbulkpipe(gm12u320->udev, DATA_SND_EPT), + gm12u320->data_buf[block], block_size, + &len, DATA_TIMEOUT); + if (ret || len != block_size) + goto err; + + /* Read status */ + ret = usb_bulk_msg(gm12u320->udev, + usb_rcvbulkpipe(gm12u320->udev, DATA_RCV_EPT), + gm12u320->cmd_buf, READ_STATUS_SIZE, &len, + CMD_TIMEOUT); + if (ret || len != READ_STATUS_SIZE) + goto err; + } + + /* Send draw command to device */ + memcpy(gm12u320->cmd_buf, cmd_draw, CMD_SIZE); + ret = usb_bulk_msg(gm12u320->udev, + usb_sndbulkpipe(gm12u320->udev, DATA_SND_EPT), + gm12u320->cmd_buf, CMD_SIZE, &len, CMD_TIMEOUT); + if (ret || len != CMD_SIZE) + goto err; + + /* Read status */ + ret = usb_bulk_msg(gm12u320->udev, + usb_rcvbulkpipe(gm12u320->udev, DATA_RCV_EPT), + gm12u320->cmd_buf, READ_STATUS_SIZE, &len, + draw_status_timeout); + if (ret || len != READ_STATUS_SIZE) + goto err; + + draw_status_timeout = CMD_TIMEOUT; + frame = !frame; + + /* + * We must draw a frame every 2s otherwise the projector + * switches back to showing its logo. + */ + wait_event_timeout(gm12u320->fb_update.waitq, + gm12u320_fb_update_ready(gm12u320), + msecs_to_jiffies(IDLE_TIMEOUT)); + } + return; +err: + /* Do not log errors caused by module unload or device unplug */ + if (ret != -ECONNRESET && ret != -ESHUTDOWN) + dev_err(&gm12u320->udev->dev, "Frame update error: %d\n", ret); +} + +void gm12u320_start_fb_update(struct drm_device *dev) +{ + struct gm12u320_device *gm12u320 = dev->dev_private; + + mutex_lock(&gm12u320->fb_update.lock); + gm12u320->fb_update.run = true; + mutex_unlock(&gm12u320->fb_update.lock); + + queue_work(gm12u320->fb_update.workq, &gm12u320->fb_update.work); +} + +void gm12u320_stop_fb_update(struct drm_device *dev) +{ + struct gm12u320_device *gm12u320 = dev->dev_private; + + mutex_lock(&gm12u320->fb_update.lock); + gm12u320->fb_update.run = false; + mutex_unlock(&gm12u320->fb_update.lock); + + wake_up(&gm12u320->fb_update.waitq); + cancel_work_sync(&gm12u320->fb_update.work); + + mutex_lock(&gm12u320->fb_update.lock); + if (gm12u320->fb_update.fb) { + drm_framebuffer_unreference(&gm12u320->fb_update.fb->base); + gm12u320->fb_update.fb = NULL; + } + mutex_unlock(&gm12u320->fb_update.lock); +} + +int gm12u320_driver_load(struct drm_device *dev, unsigned long flags) +{ + struct usb_device *udev = (void *)flags; + struct gm12u320_device *gm12u320; + int ret = -ENOMEM; + + DRM_DEBUG("\n"); + gm12u320 = kzalloc(sizeof(struct gm12u320_device), GFP_KERNEL); + if (!gm12u320) + return -ENOMEM; + + gm12u320->udev = udev; + gm12u320->ddev = dev; + dev->dev_private = gm12u320; + + INIT_WORK(&gm12u320->fb_update.work, gm12u320_fb_update_work); + mutex_init(&gm12u320->fb_update.lock); + init_waitqueue_head(&gm12u320->fb_update.waitq); + + ret = gm12u320_set_ecomode(dev); + if (ret) + goto err; + + gm12u320->fb_update.workq = create_singlethread_workqueue(DRIVER_NAME); + if (!gm12u320->fb_update.workq) { + ret = -ENOMEM; + goto err; + } + + ret = gm12u320_usb_alloc(gm12u320); + if (ret) + goto err_wq; + + DRM_DEBUG("\n"); + ret = gm12u320_modeset_init(dev); + if (ret) + goto err_usb; + + ret = gm12u320_fbdev_init(dev); + if (ret) + goto err_modeset; + + ret = drm_vblank_init(dev, 1); + if (ret) + goto err_fb; + + gm12u320_start_fb_update(dev); + + return 0; + +err_fb: + gm12u320_fbdev_cleanup(dev); +err_modeset: + gm12u320_modeset_cleanup(dev); +err_usb: + gm12u320_usb_free(gm12u320); +err_wq: + destroy_workqueue(gm12u320->fb_update.workq); +err: + kfree(gm12u320); + DRM_ERROR("%d\n", ret); + return ret; +} + +void gm12u320_driver_unload(struct drm_device *dev) +{ + struct gm12u320_device *gm12u320 = dev->dev_private; + + drm_vblank_cleanup(dev); + gm12u320_fbdev_cleanup(dev); + gm12u320_modeset_cleanup(dev); + gm12u320_usb_free(gm12u320); + destroy_workqueue(gm12u320->fb_update.workq); + kfree(gm12u320); +} + +int gm12u320_set_ecomode(struct drm_device *dev) +{ + struct gm12u320_device *gm12u320 = dev->dev_private; + + return gm12u320_misc_request(gm12u320, MISC_REQ_GET_SET_ECO_A, + MISC_REQ_GET_SET_ECO_B, 0x01 /* set */, + eco_mode ? 0x01 : 0x00, 0x00, 0x01); +} diff --git a/drivers/gpu/drm/gm12u320/gm12u320_modeset.c b/drivers/gpu/drm/gm12u320/gm12u320_modeset.c new file mode 100644 index 000000000000..bb3122295d15 --- /dev/null +++ b/drivers/gpu/drm/gm12u320/gm12u320_modeset.c @@ -0,0 +1,143 @@ +/* + * Copyright (C) 2012-2016 Red Hat Inc. + * + * Based in parts on the udl code. Based in parts on the gm12u320 fb driver: + * Copyright (C) 2013 Viacheslav Nurmekhamitov <slavrn@yandex.ru> + * Copyright (C) 2009 Roberto De Ioris <roberto@unbit.it> + * Copyright (C) 2009 Jaya Kumar <jayakumar.lkml@gmail.com> + * Copyright (C) 2009 Bernie Thompson <bernie@plugable.com> + * + * This file is subject to the terms and conditions of the GNU General Public + * License v2. See the file COPYING in the main directory of this archive for + * more details. + */ + +#include <drm/drmP.h> +#include <drm/drm_crtc.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_plane_helper.h> +#include "gm12u320_drv.h" + +static void gm12u320_crtc_dpms(struct drm_crtc *crtc, int mode) +{ +} + +static int gm12u320_crtc_mode_set(struct drm_crtc *crtc, + struct drm_display_mode *mode, + struct drm_display_mode *adjusted_mode, + int x, int y, + struct drm_framebuffer *old_fb) + +{ + struct gm12u320_framebuffer *fb = to_gm12u320_fb(crtc->primary->fb); + + gm12u320_fb_mark_dirty(fb, 0, GM12U320_USER_WIDTH, 0, GM12U320_HEIGHT); + return 0; +} + + +static void gm12u320_crtc_disable(struct drm_crtc *crtc) +{ +} + +static void gm12u320_crtc_destroy(struct drm_crtc *crtc) +{ + drm_crtc_cleanup(crtc); + kfree(crtc); +} + +static int gm12u320_crtc_page_flip(struct drm_crtc *crtc, + struct drm_framebuffer *drm_fb, + struct drm_pending_vblank_event *event, + uint32_t page_flip_flags, + struct drm_modeset_acquire_ctx *ctx) +{ + struct gm12u320_framebuffer *fb = to_gm12u320_fb(drm_fb); + struct drm_device *dev = crtc->dev; + unsigned long flags; + + gm12u320_fb_mark_dirty(fb, 0, GM12U320_USER_WIDTH, 0, GM12U320_HEIGHT); + + spin_lock_irqsave(&dev->event_lock, flags); + if (event) + drm_crtc_send_vblank_event(crtc, event); + spin_unlock_irqrestore(&dev->event_lock, flags); + + crtc->primary->fb = drm_fb; + + return 0; +} + +static void gm12u320_crtc_prepare(struct drm_crtc *crtc) +{ +} + +static void gm12u320_crtc_commit(struct drm_crtc *crtc) +{ + gm12u320_crtc_dpms(crtc, DRM_MODE_DPMS_ON); +} + +static const struct drm_crtc_helper_funcs gm12u320_helper_funcs = { + .dpms = gm12u320_crtc_dpms, + .mode_set = gm12u320_crtc_mode_set, + .prepare = gm12u320_crtc_prepare, + .commit = gm12u320_crtc_commit, + .disable = gm12u320_crtc_disable, +}; + +static const struct drm_crtc_funcs gm12u320_crtc_funcs = { + .set_config = drm_crtc_helper_set_config, + .destroy = gm12u320_crtc_destroy, + .page_flip = gm12u320_crtc_page_flip, +}; + +static int gm12u320_crtc_init(struct drm_device *dev) +{ + struct drm_crtc *crtc; + + crtc = kzalloc(sizeof(struct drm_crtc) + + sizeof(struct drm_connector *), GFP_KERNEL); + if (crtc == NULL) + return -ENOMEM; + + drm_crtc_init(dev, crtc, &gm12u320_crtc_funcs); + drm_crtc_helper_add(crtc, &gm12u320_helper_funcs); + + return 0; +} + +static const struct drm_mode_config_funcs gm12u320_mode_funcs = { + .fb_create = gm12u320_fb_user_fb_create, + .output_poll_changed = NULL, +}; + +int gm12u320_modeset_init(struct drm_device *dev) +{ + struct drm_encoder *encoder; + + drm_mode_config_init(dev); + + dev->mode_config.min_width = GM12U320_USER_WIDTH; + dev->mode_config.min_height = GM12U320_HEIGHT; + + dev->mode_config.max_width = 2048; + dev->mode_config.max_height = 2048; + + dev->mode_config.prefer_shadow = 0; + dev->mode_config.preferred_depth = 24; + + dev->mode_config.funcs = &gm12u320_mode_funcs; + + gm12u320_crtc_init(dev); + + encoder = gm12u320_encoder_init(dev); + + gm12u320_connector_init(dev, encoder); + + return 0; +} + +void gm12u320_modeset_cleanup(struct drm_device *dev) +{ + drm_mode_config_cleanup(dev); +} -- 2.13.0 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply related [flat|nested] 23+ messages in thread
* Re: [RFC] drm: Add Grain Media GM12U320 kms driver 2017-06-01 11:59 ` [RFC] " Hans de Goede @ 2017-06-20 8:57 ` Daniel Vetter 0 siblings, 0 replies; 23+ messages in thread From: Daniel Vetter @ 2017-06-20 8:57 UTC (permalink / raw) To: Hans de Goede; +Cc: dri-devel, Marco Diego Aurélio Mesquita, Daniel Vetter On Thu, Jun 01, 2017 at 01:59:34PM +0200, Hans de Goede wrote: > Grain-media GM12U320 based devices are mini video projectors using USB for > both power and video data transport. > > This commit adds a kms driver for these devices, including prime support. > > This driver is based on the existing udl kms driver, and the gm12u320 > fb driver by Viacheslav Nurmekhamitov <slavrn@yandex.ru>. > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> Looks like something written yesterday (drm changes fast), bunch of comments below where you need to modernize your driver. Should result in piles of code removed. Cheers, Daniel > --- > MAINTAINERS | 6 + > drivers/gpu/drm/Kconfig | 2 + > drivers/gpu/drm/Makefile | 1 + > drivers/gpu/drm/gm12u320/Kconfig | 11 + > drivers/gpu/drm/gm12u320/Makefile | 7 + > drivers/gpu/drm/gm12u320/gm12u320_connector.c | 148 ++++++++ > drivers/gpu/drm/gm12u320/gm12u320_dmabuf.c | 283 ++++++++++++++ > drivers/gpu/drm/gm12u320/gm12u320_drv.c | 157 ++++++++ > drivers/gpu/drm/gm12u320/gm12u320_drv.h | 129 +++++++ > drivers/gpu/drm/gm12u320/gm12u320_encoder.c | 75 ++++ > drivers/gpu/drm/gm12u320/gm12u320_fb.c | 343 +++++++++++++++++ > drivers/gpu/drm/gm12u320/gm12u320_gem.c | 237 ++++++++++++ > drivers/gpu/drm/gm12u320/gm12u320_main.c | 506 ++++++++++++++++++++++++++ > drivers/gpu/drm/gm12u320/gm12u320_modeset.c | 143 ++++++++ > 14 files changed, 2048 insertions(+) > create mode 100644 drivers/gpu/drm/gm12u320/Kconfig > create mode 100644 drivers/gpu/drm/gm12u320/Makefile > create mode 100644 drivers/gpu/drm/gm12u320/gm12u320_connector.c > create mode 100644 drivers/gpu/drm/gm12u320/gm12u320_dmabuf.c > create mode 100644 drivers/gpu/drm/gm12u320/gm12u320_drv.c > create mode 100644 drivers/gpu/drm/gm12u320/gm12u320_drv.h > create mode 100644 drivers/gpu/drm/gm12u320/gm12u320_encoder.c > create mode 100644 drivers/gpu/drm/gm12u320/gm12u320_fb.c > create mode 100644 drivers/gpu/drm/gm12u320/gm12u320_gem.c > create mode 100644 drivers/gpu/drm/gm12u320/gm12u320_main.c > create mode 100644 drivers/gpu/drm/gm12u320/gm12u320_modeset.c > > diff --git a/MAINTAINERS b/MAINTAINERS > index 053c3bdd1fe5..e1973afc428a 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -4423,6 +4423,12 @@ S: Supported > F: drivers/gpu/drm/nouveau/ > F: include/uapi/drm/nouveau_drm.h > > +DRM DRIVERS FOR GRAIN-MEDIA GM12U320 > +M: Hans de Goede <hdegoede@redhat.com> > +L: dri-devel@lists.freedesktop.org > +S: Supported > +F: drivers/gpu/drm/gm12u320/ > + > DRM DRIVERS FOR NVIDIA TEGRA > M: Thierry Reding <thierry.reding@gmail.com> > L: dri-devel@lists.freedesktop.org > diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig > index 78d7fc0ebb57..46898c4dd0d6 100644 > --- a/drivers/gpu/drm/Kconfig > +++ b/drivers/gpu/drm/Kconfig > @@ -274,6 +274,8 @@ source "drivers/gpu/drm/meson/Kconfig" > > source "drivers/gpu/drm/tinydrm/Kconfig" > > +source "drivers/gpu/drm/gm12u320/Kconfig" > + > # Keep legacy drivers last > > menuconfig DRM_LEGACY > diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile > index 59f0f9b696eb..cdec41c52e91 100644 > --- a/drivers/gpu/drm/Makefile > +++ b/drivers/gpu/drm/Makefile > @@ -96,3 +96,4 @@ obj-y += hisilicon/ > obj-$(CONFIG_DRM_ZTE) += zte/ > obj-$(CONFIG_DRM_MXSFB) += mxsfb/ > obj-$(CONFIG_DRM_TINYDRM) += tinydrm/ > +obj-$(CONFIG_DRM_GM12U320) += gm12u320/ > diff --git a/drivers/gpu/drm/gm12u320/Kconfig b/drivers/gpu/drm/gm12u320/Kconfig > new file mode 100644 > index 000000000000..67274cb291ed > --- /dev/null > +++ b/drivers/gpu/drm/gm12u320/Kconfig > @@ -0,0 +1,11 @@ > +config DRM_GM12U320 > + tristate "Grain Media GM12U320 based mini projectors" > + depends on DRM > + depends on USB_SUPPORT > + depends on USB_ARCH_HAS_HCD > + select USB > + select DRM_KMS_HELPER > + help > + This is a KMS driver for Grain Media GM12U320 based usb mini video > + projectors, such as the Acer C120. > + Say M/Y to add support for these devices via drm/kms interfaces. > diff --git a/drivers/gpu/drm/gm12u320/Makefile b/drivers/gpu/drm/gm12u320/Makefile > new file mode 100644 > index 000000000000..6234473967b2 > --- /dev/null > +++ b/drivers/gpu/drm/gm12u320/Makefile > @@ -0,0 +1,7 @@ > +ccflags-y := -Iinclude/drm > + > +gm12u320-y := gm12u320_drv.o gm12u320_modeset.o gm12u320_connector.o \ > + gm12u320_encoder.o gm12u320_main.o gm12u320_fb.o \ > + gm12u320_gem.o gm12u320_dmabuf.o > + > +obj-$(CONFIG_DRM_GM12U320) += gm12u320.o > diff --git a/drivers/gpu/drm/gm12u320/gm12u320_connector.c b/drivers/gpu/drm/gm12u320/gm12u320_connector.c > new file mode 100644 > index 000000000000..042da07c16c2 > --- /dev/null > +++ b/drivers/gpu/drm/gm12u320/gm12u320_connector.c > @@ -0,0 +1,148 @@ > +/* > + * Copyright (C) 2012-2016 Red Hat Inc. > + * > + * Based in parts on the udl code. Based in parts on the gm12u320 fb driver: > + * Copyright (C) 2013 Viacheslav Nurmekhamitov <slavrn@yandex.ru> > + * Copyright (C) 2009 Roberto De Ioris <roberto@unbit.it> > + * Copyright (C) 2009 Jaya Kumar <jayakumar.lkml@gmail.com> > + * Copyright (C) 2009 Bernie Thompson <bernie@plugable.com> > + * > + * This file is subject to the terms and conditions of the GNU General Public > + * License v2. See the file COPYING in the main directory of this archive for > + * more details. > + */ > + > +#include <drm/drmP.h> > +#include <drm/drm_crtc.h> > +#include <drm/drm_edid.h> > +#include <drm/drm_crtc_helper.h> > +#include "gm12u320_drv.h" > + > +/* > + * Note this assumes this driver is only ever used with the Acer C120, if we > + * add support for other devices the vendor and model should be parameterized. > + */ > +static struct edid gm12u320_edid = { > + .header = { 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00 }, > + .mfg_id = { 0x04, 0x72 }, /* "ACR" */ > + .prod_code = { 0x20, 0xc1 }, /* C120h */ > + .mfg_week = 1, > + .mfg_year = 1, > + .version = 1, /* EDID 1.3 */ > + .revision = 3, /* EDID 1.3 */ > + .input = 0x80, /* Digital input */ > + .features = 0x02, /* Pref timing in DTD 1 */ > + .standard_timings = { { 1, 1 }, { 1, 1 }, { 1, 1 }, { 1, 1 }, > + { 1, 1 }, { 1, 1 }, { 1, 1 }, { 1, 1 } }, > + .detailed_timings = { { > + .pixel_clock = 3383, > + /* hactive = 852, hblank = 256 */ > + .data.pixel_data.hactive_lo = 0x54, > + .data.pixel_data.hblank_lo = 0x00, > + .data.pixel_data.hactive_hblank_hi = 0x31, > + /* vactive = 480, vblank = 28 */ > + .data.pixel_data.vactive_lo = 0xe0, > + .data.pixel_data.vblank_lo = 0x1c, > + .data.pixel_data.vactive_vblank_hi = 0x10, > + /* hsync offset 40 pw 128, vsync offset 1 pw 4 */ > + .data.pixel_data.hsync_offset_lo = 0x28, > + .data.pixel_data.hsync_pulse_width_lo = 0x80, > + .data.pixel_data.vsync_offset_pulse_width_lo = 0x14, > + .data.pixel_data.hsync_vsync_offset_pulse_width_hi = 0x00, > + /* Digital separate syncs, hsync+, vsync+ */ > + .data.pixel_data.misc = 0x1e, > + }, { > + .pixel_clock = 0, > + .data.other_data.type = 0xfd, /* Monitor ranges */ > + .data.other_data.data.range.min_vfreq = 59, > + .data.other_data.data.range.max_vfreq = 61, > + .data.other_data.data.range.min_hfreq_khz = 29, > + .data.other_data.data.range.max_hfreq_khz = 32, > + .data.other_data.data.range.pixel_clock_mhz = 4, /* 40 MHz */ > + .data.other_data.data.range.flags = 0, > + .data.other_data.data.range.formula.cvt = { > + 0xa0, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20 }, > + }, { > + .pixel_clock = 0, > + .data.other_data.type = 0xfc, /* Model string */ > + .data.other_data.data.str.str = { > + 'C', '1', '2', '0', 'P', 'r', 'o', 'j', 'e', 'c', > + 't', 'o', 'r' }, > + }, { > + .pixel_clock = 0, > + .data.other_data.type = 0xfe, /* Unspecified text / padding */ > + .data.other_data.data.str.str = { > + '\n', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', > + ' ', ' ', ' ' }, > + } }, > + .checksum = 0x40, > +}; > + > +static int gm12u320_get_modes(struct drm_connector *connector) > +{ > + drm_mode_connector_update_edid_property(connector, &gm12u320_edid); > + return drm_add_edid_modes(connector, &gm12u320_edid); > +} > + > +static enum drm_connector_status > +gm12u320_detect(struct drm_connector *connector, bool force) > +{ > + if (drm_device_is_unplugged(connector->dev)) > + return connector_status_disconnected; > + > + return connector_status_connected; > +} > + > +static struct drm_encoder* > +gm12u320_best_single_encoder(struct drm_connector *connector) > +{ > + int enc_id = connector->encoder_ids[0]; > + > + return drm_encoder_find(connector->dev, enc_id); > +} > + > +static int gm12u320_connector_set_property(struct drm_connector *connector, > + struct drm_property *property, > + uint64_t val) > +{ > + return 0; > +} > + > +static void gm12u320_connector_destroy(struct drm_connector *connector) > +{ > + drm_connector_unregister(connector); > + drm_connector_cleanup(connector); > + kfree(connector); > +} > + > +static const struct drm_connector_helper_funcs gm12u320_helper_funcs = { > + .get_modes = gm12u320_get_modes, > + .best_encoder = gm12u320_best_single_encoder, > +}; > + > +static const struct drm_connector_funcs gm12u320_connector_funcs = { > + .dpms = drm_helper_connector_dpms, > + .detect = gm12u320_detect, > + .fill_modes = drm_helper_probe_single_connector_modes, > + .destroy = gm12u320_connector_destroy, > + .set_property = gm12u320_connector_set_property, > +}; > + > +int gm12u320_connector_init(struct drm_device *dev, > + struct drm_encoder *encoder) > +{ > + struct drm_connector *connector; > + > + connector = kzalloc(sizeof(struct drm_connector), GFP_KERNEL); > + if (!connector) > + return -ENOMEM; > + > + drm_connector_init(dev, connector, &gm12u320_connector_funcs, > + DRM_MODE_CONNECTOR_Unknown); > + drm_connector_helper_add(connector, &gm12u320_helper_funcs); > + > + drm_connector_register(connector); > + drm_mode_connector_attach_encoder(connector, encoder); > + > + return 0; > +} > diff --git a/drivers/gpu/drm/gm12u320/gm12u320_dmabuf.c b/drivers/gpu/drm/gm12u320/gm12u320_dmabuf.c > new file mode 100644 > index 000000000000..b55861e8323c > --- /dev/null > +++ b/drivers/gpu/drm/gm12u320/gm12u320_dmabuf.c > @@ -0,0 +1,283 @@ > +/* > + * Based on the udl dmabuf code: > + * > + * Copyright (c) 2014 The Chromium OS Authors > + * > + * This program is free software; you can redistribute it and/or modify it > + * under the terms of the GNU General Public License as published by the > + * Free Software Foundation; either version 2 of the License, or (at your > + * option) any later version. > + * > + * This program is distributed in the hope that 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/>. > + */ > + > +#include <drm/drmP.h> > +#include "gm12u320_drv.h" > +#include <linux/shmem_fs.h> > +#include <linux/dma-buf.h> > + > +struct gm12u320_drm_dmabuf_attachment { > + struct sg_table sgt; > + enum dma_data_direction dir; > + bool is_mapped; > +}; > + > +static int gm12u320_attach_dma_buf(struct dma_buf *dmabuf, > + struct device *dev, > + struct dma_buf_attachment *attach) > +{ > + struct gm12u320_drm_dmabuf_attachment *gm12u320_attach; > + > + DRM_DEBUG_PRIME("[DEV:%s] size:%zd\n", dev_name(attach->dev), > + attach->dmabuf->size); > + > + gm12u320_attach = kzalloc(sizeof(*gm12u320_attach), GFP_KERNEL); > + if (!gm12u320_attach) > + return -ENOMEM; > + > + gm12u320_attach->dir = DMA_NONE; > + attach->priv = gm12u320_attach; > + > + return 0; > +} > + > +static void gm12u320_detach_dma_buf(struct dma_buf *dmabuf, > + struct dma_buf_attachment *attach) > +{ > + struct gm12u320_drm_dmabuf_attachment *gm12u320_attach = attach->priv; > + struct sg_table *sgt; > + > + if (!gm12u320_attach) > + return; > + > + DRM_DEBUG_PRIME("[DEV:%s] size:%zd\n", dev_name(attach->dev), > + attach->dmabuf->size); > + > + sgt = &gm12u320_attach->sgt; > + > + if (gm12u320_attach->dir != DMA_NONE) > + dma_unmap_sg(attach->dev, sgt->sgl, sgt->nents, > + gm12u320_attach->dir); > + > + sg_free_table(sgt); > + kfree(gm12u320_attach); > + attach->priv = NULL; > +} > + > +static struct sg_table *gm12u320_map_dma_buf(struct dma_buf_attachment *attach, > + enum dma_data_direction dir) > +{ > + struct gm12u320_drm_dmabuf_attachment *gm12u320_attach = attach->priv; > + struct gm12u320_gem_object *obj = to_gm12u320_bo(attach->dmabuf->priv); > + struct drm_device *dev = obj->base.dev; > + struct scatterlist *rd, *wr; > + struct sg_table *sgt = NULL; > + unsigned int i; > + int page_count; > + int nents, ret; > + > + DRM_DEBUG_PRIME("[DEV:%s] size:%zd dir=%d\n", dev_name(attach->dev), > + attach->dmabuf->size, dir); > + > + /* just return current sgt if already requested. */ > + if (gm12u320_attach->dir == dir && gm12u320_attach->is_mapped) > + return &gm12u320_attach->sgt; > + > + if (!obj->pages) { > + ret = gm12u320_gem_get_pages(obj); > + if (ret) { > + DRM_ERROR("failed to map pages.\n"); > + return ERR_PTR(ret); > + } > + } > + > + page_count = obj->base.size / PAGE_SIZE; > + obj->sg = drm_prime_pages_to_sg(obj->pages, page_count); > + if (IS_ERR(obj->sg)) { > + DRM_ERROR("failed to allocate sgt.\n"); > + return ERR_CAST(obj->sg); > + } > + > + sgt = &gm12u320_attach->sgt; > + > + ret = sg_alloc_table(sgt, obj->sg->orig_nents, GFP_KERNEL); > + if (ret) { > + DRM_ERROR("failed to alloc sgt.\n"); > + return ERR_PTR(-ENOMEM); > + } > + > + mutex_lock(&dev->struct_mutex); > + > + rd = obj->sg->sgl; > + wr = sgt->sgl; > + for (i = 0; i < sgt->orig_nents; ++i) { > + sg_set_page(wr, sg_page(rd), rd->length, rd->offset); > + rd = sg_next(rd); > + wr = sg_next(wr); > + } > + > + if (dir != DMA_NONE) { > + nents = dma_map_sg(attach->dev, sgt->sgl, sgt->orig_nents, dir); > + if (!nents) { > + DRM_ERROR("failed to map sgl with iommu.\n"); > + sg_free_table(sgt); > + sgt = ERR_PTR(-EIO); > + goto err_unlock; > + } > + } > + > + gm12u320_attach->is_mapped = true; > + gm12u320_attach->dir = dir; > + attach->priv = gm12u320_attach; > + > +err_unlock: > + mutex_unlock(&dev->struct_mutex); > + return sgt; > +} > + > +static void gm12u320_unmap_dma_buf(struct dma_buf_attachment *attach, > + struct sg_table *sgt, > + enum dma_data_direction dir) > +{ > + /* Nothing to do. */ > + DRM_DEBUG_PRIME("[DEV:%s] size:%zd dir:%d\n", dev_name(attach->dev), > + attach->dmabuf->size, dir); > +} > + > +static void *gm12u320_dmabuf_kmap(struct dma_buf *dma_buf, > + unsigned long page_num) > +{ > + /* TODO */ > + > + return NULL; > +} > + > +static void *gm12u320_dmabuf_kmap_atomic(struct dma_buf *dma_buf, > + unsigned long page_num) > +{ > + /* TODO */ > + > + return NULL; > +} > + > +static void gm12u320_dmabuf_kunmap(struct dma_buf *dma_buf, > + unsigned long page_num, void *addr) > +{ > + /* TODO */ > +} > + > +static void gm12u320_dmabuf_kunmap_atomic(struct dma_buf *dma_buf, > + unsigned long page_num, > + void *addr) > +{ > + /* TODO */ > +} > + > +static int gm12u320_dmabuf_mmap(struct dma_buf *dma_buf, > + struct vm_area_struct *vma) > +{ > + /* TODO */ > + > + return -EINVAL; > +} I'm not a friend of dummy functions and todos. The core should reject this all correctly for you, please remove these hooks. Or fix up the core to do that for you. > +static struct dma_buf_ops gm12u320_dmabuf_ops = { > + .attach = gm12u320_attach_dma_buf, > + .detach = gm12u320_detach_dma_buf, > + .map_dma_buf = gm12u320_map_dma_buf, > + .unmap_dma_buf = gm12u320_unmap_dma_buf, > + .map = gm12u320_dmabuf_kmap, > + .map_atomic = gm12u320_dmabuf_kmap_atomic, > + .unmap = gm12u320_dmabuf_kunmap, > + .unmap_atomic = gm12u320_dmabuf_kunmap_atomic, > + .mmap = gm12u320_dmabuf_mmap, > + .release = drm_gem_dmabuf_release, > +}; > + > +struct dma_buf *gm12u320_gem_prime_export(struct drm_device *dev, > + struct drm_gem_object *obj, int flags) > +{ > + DEFINE_DMA_BUF_EXPORT_INFO(exp_info); > + > + exp_info.ops = &gm12u320_dmabuf_ops; > + exp_info.size = obj->size; > + exp_info.flags = flags; > + exp_info.priv = obj; > + > + return drm_gem_dmabuf_export(dev, &exp_info); > +} > + > +static int gm12u320_prime_create(struct drm_device *dev, > + size_t size, struct sg_table *sg, > + struct gm12u320_gem_object **obj_p) > +{ > + struct gm12u320_gem_object *obj; > + int npages; > + > + npages = size / PAGE_SIZE; > + > + *obj_p = NULL; > + obj = gm12u320_gem_alloc_object(dev, npages * PAGE_SIZE); > + if (!obj) > + return -ENOMEM; > + > + obj->sg = sg; > + obj->pages = drm_malloc_ab(npages, sizeof(struct page *)); > + if (obj->pages == NULL) { > + DRM_ERROR("obj pages is NULL %d\n", npages); > + return -ENOMEM; > + } > + > + drm_prime_sg_to_page_addr_arrays(sg, obj->pages, NULL, npages); > + > + *obj_p = obj; > + return 0; > +} > + > +struct drm_gem_object *gm12u320_gem_prime_import(struct drm_device *dev, > + struct dma_buf *dma_buf) > +{ > + struct dma_buf_attachment *attach; > + struct sg_table *sg; > + struct gm12u320_gem_object *uobj; > + int ret; > + > + /* need to attach */ > + get_device(dev->dev); > + attach = dma_buf_attach(dma_buf, dev->dev); > + if (IS_ERR(attach)) { > + put_device(dev->dev); > + return ERR_CAST(attach); > + } > + > + get_dma_buf(dma_buf); > + > + sg = dma_buf_map_attachment(attach, DMA_BIDIRECTIONAL); > + if (IS_ERR(sg)) { > + ret = PTR_ERR(sg); > + goto fail_detach; > + } > + > + ret = gm12u320_prime_create(dev, dma_buf->size, sg, &uobj); > + if (ret) > + goto fail_unmap; > + > + uobj->base.import_attach = attach; > + uobj->flags = GM12U320_BO_WC; > + > + return &uobj->base; > + > +fail_unmap: > + dma_buf_unmap_attachment(attach, sg, DMA_BIDIRECTIONAL); > +fail_detach: > + dma_buf_detach(dma_buf, attach); > + dma_buf_put(dma_buf); > + put_device(dev->dev); > + return ERR_PTR(ret); > +} Not sure, but is there some room for more shared helpers for non-cma gem objects when using prime? For cma this is all dead easy, but we now also have a pile of simple shmem-gem drivers that would justify a bit more helpers here I think ... Can be a follow-up thing ofc. > diff --git a/drivers/gpu/drm/gm12u320/gm12u320_drv.c b/drivers/gpu/drm/gm12u320/gm12u320_drv.c > new file mode 100644 > index 000000000000..eb1e52a9b485 > --- /dev/null > +++ b/drivers/gpu/drm/gm12u320/gm12u320_drv.c > @@ -0,0 +1,157 @@ > +/* > + * Copyright (C) 2012-2016 Red Hat Inc. > + * > + * This file is subject to the terms and conditions of the GNU General Public > + * License v2. See the file COPYING in the main directory of this archive for > + * more details. > + */ > + > +#include <linux/module.h> > +#include <drm/drmP.h> > +#include <drm/drm_crtc_helper.h> > +#include "gm12u320_drv.h" > + > +static int gm12u320_driver_set_busid(struct drm_device *d, struct drm_master *m) > +{ > + return 0; > +} This just died. > + > +static const struct vm_operations_struct gm12u320_gem_vm_ops = { > + .fault = gm12u320_gem_fault, > + .open = drm_gem_vm_open, > + .close = drm_gem_vm_close, > +}; > + > +static const struct file_operations gm12u320_driver_fops = { > + .owner = THIS_MODULE, > + .open = drm_open, > + .mmap = gm12u320_drm_gem_mmap, > + .poll = drm_poll, > + .read = drm_read, > + .unlocked_ioctl = drm_ioctl, > + .release = drm_release, > + .compat_ioctl = drm_compat_ioctl, > + .llseek = noop_llseek, > +}; > + > +static struct drm_driver driver = { > + .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME, > + .load = gm12u320_driver_load, > + .unload = gm12u320_driver_unload, load/unload are deprecated, pls read the kerneldoc for how this should be done using drm_dev_init and friends. > + .set_busid = gm12u320_driver_set_busid, > + > + /* gem hooks */ > + .gem_free_object = gm12u320_gem_free_object, > + .gem_vm_ops = &gm12u320_gem_vm_ops, > + > + .dumb_create = gm12u320_dumb_create, > + .dumb_map_offset = gm12u320_gem_mmap, > + .dumb_destroy = drm_gem_dumb_destroy, > + .fops = &gm12u320_driver_fops, > + > + .prime_handle_to_fd = drm_gem_prime_handle_to_fd, > + .prime_fd_to_handle = drm_gem_prime_fd_to_handle, > + .gem_prime_export = gm12u320_gem_prime_export, > + .gem_prime_import = gm12u320_gem_prime_import, > + > + .name = DRIVER_NAME, > + .desc = DRIVER_DESC, > + .date = DRIVER_DATE, > + .major = DRIVER_MAJOR, > + .minor = DRIVER_MINOR, > + .patchlevel = DRIVER_PATCHLEVEL, > +}; > + > +static int gm12u320_usb_probe(struct usb_interface *interface, > + const struct usb_device_id *id) > +{ > + struct usb_device *udev = interface_to_usbdev(interface); > + struct drm_device *dev; > + int r; > + > + /* > + * The gm12u320 presents itself to the system as 2 usb mass-storage > + * interfaces, for the second one we proceed successully with binding, > + * but otherwise ignore it. > + */ > + if (interface->cur_altsetting->desc.bInterfaceNumber != 0) > + return 0; > + > + dev = drm_dev_alloc(&driver, &interface->dev); > + if (IS_ERR(dev)) > + return PTR_ERR(dev); > + > + r = drm_dev_register(dev, (unsigned long)udev); > + if (r) > + goto err_free; > + > + usb_set_intfdata(interface, dev); > + DRM_INFO("Initialized gm12u320 on minor %d\n", dev->primary->index); > + > + return 0; > + > +err_free: > + drm_dev_unref(dev); > + return r; > +} > + > +static void gm12u320_usb_disconnect(struct usb_interface *interface) > +{ > + struct drm_device *dev = usb_get_intfdata(interface); > + > + if (!dev) > + return; > + > + drm_kms_helper_poll_disable(dev); > + gm12u320_fbdev_unplug(dev); > + gm12u320_stop_fb_update(dev); > + drm_unplug_dev(dev); > +} > + > +#ifdef CONFIG_PM > + > +int gm12u320_suspend(struct usb_interface *interface, pm_message_t message) > +{ > + struct drm_device *dev = usb_get_intfdata(interface); > + > + if (!dev) > + return 0; > + > + gm12u320_stop_fb_update(dev); > + return 0; > +} > + > +int gm12u320_resume(struct usb_interface *interface) > +{ > + struct drm_device *dev = usb_get_intfdata(interface); > + > + if (!dev) > + return 0; > + > + gm12u320_set_ecomode(dev); > + gm12u320_start_fb_update(dev); > + return 0; > +} > +#endif > + > +static struct usb_device_id id_table[] = { > + { USB_DEVICE(0x1de1, 0xc102) }, > + {}, > +}; > +MODULE_DEVICE_TABLE(usb, id_table); > + > +static struct usb_driver gm12u320_driver = { > + .name = "gm12u320", > + .probe = gm12u320_usb_probe, > + .disconnect = gm12u320_usb_disconnect, > + .id_table = id_table, > +#ifdef CONFIG_PM > + .suspend = gm12u320_suspend, > + .resume = gm12u320_resume, > + .reset_resume = gm12u320_resume, > +#endif > +}; > + > +module_usb_driver(gm12u320_driver); > +MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>"); > +MODULE_LICENSE("GPL"); > diff --git a/drivers/gpu/drm/gm12u320/gm12u320_drv.h b/drivers/gpu/drm/gm12u320/gm12u320_drv.h > new file mode 100644 > index 000000000000..8955a2ad753a > --- /dev/null > +++ b/drivers/gpu/drm/gm12u320/gm12u320_drv.h > @@ -0,0 +1,129 @@ > +/* > + * Copyright (C) 2012-2016 Red Hat Inc. > + * > + * Based in parts on the udl code. Based in parts on the gm12u320 fb driver: > + * Copyright (C) 2013 Viacheslav Nurmekhamitov <slavrn@yandex.ru> > + * Copyright (C) 2009 Roberto De Ioris <roberto@unbit.it> > + * Copyright (C) 2009 Jaya Kumar <jayakumar.lkml@gmail.com> > + * Copyright (C) 2009 Bernie Thompson <bernie@plugable.com> > + * > + * This file is subject to the terms and conditions of the GNU General Public > + * License v2. See the file COPYING in the main directory of this archive for > + * more details. > + */ > + > +#ifndef GM12U320_DRV_H > +#define GM12U320_DRV_H > + > +#include <linux/usb.h> > +#include <linux/spinlock.h> > +#include <drm/drm_gem.h> > + > +#define DRIVER_NAME "gm12u320" > +#define DRIVER_DESC "Grain Media GM12U320 USB projector display" > +#define DRIVER_DATE "20150107" > + > +#define DRIVER_MAJOR 0 > +#define DRIVER_MINOR 0 > +#define DRIVER_PATCHLEVEL 1 > + > +#define GM12U320_BO_CACHEABLE (1 << 0) > +#define GM12U320_BO_WC (1 << 1) > + > +/* > + * The DLP has an actual width of 854 pixels, but that is not a multiple > + * of 4, breaking things left and right, so we export a width of 852. > + */ > +#define GM12U320_USER_WIDTH 852 > +#define GM12U320_REAL_WIDTH 854 > +#define GM12U320_HEIGHT 480 > + > +#define GM12U320_BLOCK_COUNT 20 > + > +struct gm12u320_device; > + > +struct gm12u320_fbdev; > + > +struct gm12u320_device { > + struct device *dev; > + struct usb_device *udev; > + struct drm_device *ddev; > + struct gm12u320_fbdev *fbdev; > + unsigned char *cmd_buf; > + unsigned char *data_buf[GM12U320_BLOCK_COUNT]; > + struct { > + bool run; > + struct workqueue_struct *workq; > + struct work_struct work; > + wait_queue_head_t waitq; > + struct mutex lock; > + struct gm12u320_framebuffer *fb; > + int x1; > + int x2; > + int y1; > + int y2; > + } fb_update; > +}; > + > +struct gm12u320_gem_object { > + struct drm_gem_object base; > + struct page **pages; > + void *vmapping; > + struct sg_table *sg; > + unsigned int flags; > +}; > + > +#define to_gm12u320_bo(x) container_of(x, struct gm12u320_gem_object, base) > + > +struct gm12u320_framebuffer { > + struct drm_framebuffer base; > + struct gm12u320_gem_object *obj; > +}; > + > +#define to_gm12u320_fb(x) container_of(x, struct gm12u320_framebuffer, base) > + > +/* modeset */ > +int gm12u320_modeset_init(struct drm_device *dev); > +void gm12u320_modeset_cleanup(struct drm_device *dev); > +int gm12u320_connector_init(struct drm_device *dev, > + struct drm_encoder *encoder); > + > +struct drm_encoder *gm12u320_encoder_init(struct drm_device *dev); > + > +int gm12u320_driver_load(struct drm_device *dev, unsigned long flags); > +void gm12u320_driver_unload(struct drm_device *dev); > + > +int gm12u320_fbdev_init(struct drm_device *dev); > +void gm12u320_fbdev_cleanup(struct drm_device *dev); > +void gm12u320_fbdev_unplug(struct drm_device *dev); > +struct drm_framebuffer * > +gm12u320_fb_user_fb_create(struct drm_device *dev, struct drm_file *file, > + const struct drm_mode_fb_cmd2 *mode_cmd); > + > +int gm12u320_dumb_create(struct drm_file *file_priv, struct drm_device *dev, > + struct drm_mode_create_dumb *args); > +int gm12u320_gem_mmap(struct drm_file *file_priv, struct drm_device *dev, > + uint32_t handle, uint64_t *offset); > + > +struct gm12u320_gem_object * > +gm12u320_gem_alloc_object(struct drm_device *dev, size_t size); > +void gm12u320_gem_free_object(struct drm_gem_object *gem_obj); > +struct dma_buf *gm12u320_gem_prime_export(struct drm_device *dev, > + struct drm_gem_object *obj, int flags); > +struct drm_gem_object *gm12u320_gem_prime_import(struct drm_device *dev, > + struct dma_buf *dma_buf); > + > +int gm12u320_gem_get_pages(struct gm12u320_gem_object *obj); > +void gm12u320_gem_put_pages(struct gm12u320_gem_object *obj); > +int gm12u320_gem_vmap(struct gm12u320_gem_object *obj); > +void gm12u320_gem_vunmap(struct gm12u320_gem_object *obj); > +int gm12u320_drm_gem_mmap(struct file *filp, struct vm_area_struct *vma); > +int gm12u320_gem_fault(struct vm_fault *vmf); > + > +void gm12u320_fb_mark_dirty(struct gm12u320_framebuffer *fb, > + int x1, int x2, int y1, int y2); > +void gm12u320_start_fb_update(struct drm_device *dev); > +void gm12u320_stop_fb_update(struct drm_device *dev); > +int gm12u320_set_ecomode(struct drm_device *dev); > + > +#endif > diff --git a/drivers/gpu/drm/gm12u320/gm12u320_encoder.c b/drivers/gpu/drm/gm12u320/gm12u320_encoder.c > new file mode 100644 > index 000000000000..085f05b06674 > --- /dev/null > +++ b/drivers/gpu/drm/gm12u320/gm12u320_encoder.c > @@ -0,0 +1,75 @@ > +/* > + * Copyright (C) 2012-2016 Red Hat Inc. > + * > + * Based in parts on the udl code. Based in parts on the gm12u320 fb driver: > + * Copyright (C) 2013 Viacheslav Nurmekhamitov <slavrn@yandex.ru> > + * Copyright (C) 2009 Roberto De Ioris <roberto@unbit.it> > + * Copyright (C) 2009 Jaya Kumar <jayakumar.lkml@gmail.com> > + * Copyright (C) 2009 Bernie Thompson <bernie@plugable.com> > + * > + * This file is subject to the terms and conditions of the GNU General Public > + * License v2. See the file COPYING in the main directory of this archive for > + * more details. > + */ > + > +#include <drm/drmP.h> > +#include <drm/drm_crtc.h> > +#include <drm/drm_crtc_helper.h> > +#include "gm12u320_drv.h" > + > +/* dummy encoder */ > +static void gm12u320_enc_destroy(struct drm_encoder *encoder) > +{ > + drm_encoder_cleanup(encoder); > + kfree(encoder); > +} > + > +static void gm12u320_encoder_disable(struct drm_encoder *encoder) > +{ > +} > + > +static void gm12u320_encoder_prepare(struct drm_encoder *encoder) > +{ > +} > + > +static void gm12u320_encoder_commit(struct drm_encoder *encoder) > +{ > +} > + > +static void gm12u320_encoder_mode_set(struct drm_encoder *encoder, > + struct drm_display_mode *mode, > + struct drm_display_mode *adjusted_mode) > +{ > +} > + > +static void > +gm12u320_encoder_dpms(struct drm_encoder *encoder, int mode) > +{ > +} > + > +static const struct drm_encoder_helper_funcs gm12u320_helper_funcs = { > + .dpms = gm12u320_encoder_dpms, > + .prepare = gm12u320_encoder_prepare, > + .mode_set = gm12u320_encoder_mode_set, > + .commit = gm12u320_encoder_commit, > + .disable = gm12u320_encoder_disable, > +}; > + > +static const struct drm_encoder_funcs gm12u320_enc_funcs = { > + .destroy = gm12u320_enc_destroy, > +}; > + > +struct drm_encoder *gm12u320_encoder_init(struct drm_device *dev) > +{ > + struct drm_encoder *encoder; > + > + encoder = kzalloc(sizeof(struct drm_encoder), GFP_KERNEL); > + if (!encoder) > + return NULL; > + > + drm_encoder_init(dev, encoder, &gm12u320_enc_funcs, > + DRM_MODE_ENCODER_TMDS, NULL); > + drm_encoder_helper_add(encoder, &gm12u320_helper_funcs); > + encoder->possible_crtcs = 1; > + return encoder; > +} > diff --git a/drivers/gpu/drm/gm12u320/gm12u320_fb.c b/drivers/gpu/drm/gm12u320/gm12u320_fb.c > new file mode 100644 > index 000000000000..8b7605f76af9 > --- /dev/null > +++ b/drivers/gpu/drm/gm12u320/gm12u320_fb.c > @@ -0,0 +1,343 @@ > +/* > + * Copyright (C) 2012-2016 Red Hat Inc. > + * > + * Based in parts on the udl code. Based in parts on the gm12u320 fb driver: > + * Copyright (C) 2013 Viacheslav Nurmekhamitov <slavrn@yandex.ru> > + * Copyright (C) 2009 Roberto De Ioris <roberto@unbit.it> > + * Copyright (C) 2009 Jaya Kumar <jayakumar.lkml@gmail.com> > + * Copyright (C) 2009 Bernie Thompson <bernie@plugable.com> > + * > + * This file is subject to the terms and conditions of the GNU General Public > + * License v2. See the file COPYING in the main directory of this archive for > + * more details. > + */ > +#include <linux/module.h> > +#include <linux/slab.h> > +#include <linux/fb.h> > + > +#include <drm/drmP.h> > +#include <drm/drm_crtc.h> > +#include <drm/drm_crtc_helper.h> > +#include "gm12u320_drv.h" > + > +#include <drm/drm_fb_helper.h> > + > +struct gm12u320_fbdev { > + struct drm_fb_helper helper; > + struct gm12u320_framebuffer fb; > +}; > + > +void gm12u320_fb_mark_dirty(struct gm12u320_framebuffer *fb, > + int x1, int x2, int y1, int y2) > +{ > + struct drm_device *dev = fb->base.dev; > + struct gm12u320_device *gm12u320 = dev->dev_private; > + struct gm12u320_framebuffer *old_fb = NULL; > + bool wakeup = false; > + > + mutex_lock(&gm12u320->fb_update.lock); > + > + if (gm12u320->fb_update.fb != fb) { > + gm12u320->fb_update.x1 = x1; > + gm12u320->fb_update.x2 = x2; > + gm12u320->fb_update.y1 = y1; > + gm12u320->fb_update.y2 = y2; > + old_fb = gm12u320->fb_update.fb; > + gm12u320->fb_update.fb = fb; > + drm_framebuffer_reference(&gm12u320->fb_update.fb->base); > + wakeup = true; > + } else { > + gm12u320->fb_update.x1 = min(gm12u320->fb_update.x1, x1); > + gm12u320->fb_update.x2 = max(gm12u320->fb_update.x2, x2); > + gm12u320->fb_update.y1 = min(gm12u320->fb_update.y1, y1); > + gm12u320->fb_update.y2 = max(gm12u320->fb_update.y2, y2); > + } > + > + mutex_unlock(&gm12u320->fb_update.lock); > + > + if (wakeup) > + wake_up(&gm12u320->fb_update.waitq); > + > + if (old_fb) > + drm_framebuffer_unreference(&old_fb->base); > +} > + > +static int gm12u320_fb_open(struct fb_info *info, int user) > +{ > + struct gm12u320_fbdev *fbdev = info->par; > + struct drm_device *ddev = fbdev->fb.base.dev; > + > + /* If the USB device is gone, we don't accept new opens */ > + if (drm_device_is_unplugged(ddev)) > + return -ENODEV; > + > + return 0; > +} > + > +static struct fb_ops gm12u320_fb_ops = { > + .owner = THIS_MODULE, > + DRM_FB_HELPER_DEFAULT_OPS, > + .fb_fillrect = drm_fb_helper_sys_fillrect, > + .fb_copyarea = drm_fb_helper_sys_copyarea, > + .fb_imageblit = drm_fb_helper_sys_imageblit, > + .fb_open = gm12u320_fb_open, > +}; > + > +#ifdef CONFIG_DRM_FBDEV_EMULATION > +static struct fb_deferred_io gm12u320_fb_defio = { > + .delay = HZ / 30, > + .deferred_io = drm_fb_helper_deferred_io, > +}; > +#endif > + > +static int gm12u320_user_framebuffer_dirty(struct drm_framebuffer *drm_fb, > + struct drm_file *file, > + unsigned flags, unsigned color, > + struct drm_clip_rect *clips, > + unsigned num_clips) > +{ > + struct gm12u320_framebuffer *fb = to_gm12u320_fb(drm_fb); > + int x1, x2, y1, y2; > + > + if (num_clips == 0) > + return 0; > + > + x1 = clips->x1; > + x2 = clips->x2; > + y1 = clips->y1; > + y2 = clips->y2; > + > + while (--num_clips) { > + clips++; > + x1 = min_t(int, x1, (int)clips->x1); > + x2 = max_t(int, x2, (int)clips->x2); > + y1 = min_t(int, y1, (int)clips->y1); > + y2 = max_t(int, y2, (int)clips->y2); > + } > + > + gm12u320_fb_mark_dirty(fb, x1, x2, y1, y2); > + > + return 0; > +} > + > +static void gm12u320_user_framebuffer_destroy(struct drm_framebuffer *drm_fb) > +{ > + struct gm12u320_framebuffer *fb = to_gm12u320_fb(drm_fb); > + > + if (fb->obj) > + drm_gem_object_unreference_unlocked(&fb->obj->base); > + > + drm_framebuffer_cleanup(drm_fb); > + kfree(fb); > +} > + > +static const struct drm_framebuffer_funcs gm12u320fb_funcs = { > + .destroy = gm12u320_user_framebuffer_destroy, > + .dirty = gm12u320_user_framebuffer_dirty, > +}; > + > +static int > +gm12u320_framebuffer_init(struct drm_device *dev, > + struct gm12u320_framebuffer *fb, > + const struct drm_mode_fb_cmd2 *mode_cmd, > + struct gm12u320_gem_object *obj) > +{ > + int ret; > + > + fb->obj = obj; > + drm_helper_mode_fill_fb_struct(dev, &fb->base, mode_cmd); > + ret = drm_framebuffer_init(dev, &fb->base, &gm12u320fb_funcs); > + return ret; > +} > + > +static int gm12u320fb_create(struct drm_fb_helper *helper, > + struct drm_fb_helper_surface_size *sizes) > +{ > + struct gm12u320_fbdev *fbdev = > + container_of(helper, struct gm12u320_fbdev, helper); > + struct drm_device *dev = fbdev->helper.dev; > + struct fb_info *info; > + struct drm_framebuffer *drm_fb; > + struct drm_mode_fb_cmd2 mode_cmd; > + struct gm12u320_gem_object *obj; > + uint32_t size; > + int ret = 0; > + > + if (sizes->surface_bpp == 24) > + sizes->surface_bpp = 32; > + > + mode_cmd.width = sizes->surface_width; > + mode_cmd.height = sizes->surface_height; > + mode_cmd.pitches[0] = mode_cmd.width * ((sizes->surface_bpp + 7) / 8); > + > + mode_cmd.pixel_format = drm_mode_legacy_fb_format(sizes->surface_bpp, > + sizes->surface_depth); > + > + size = mode_cmd.pitches[0] * mode_cmd.height; > + size = ALIGN(size, PAGE_SIZE); > + > + obj = gm12u320_gem_alloc_object(dev, size); > + if (!obj) > + goto out; > + > + ret = gm12u320_gem_vmap(obj); > + if (ret) { > + DRM_ERROR("failed to vmap fb\n"); > + goto out_gfree; > + } > + > + info = drm_fb_helper_alloc_fbi(helper); > + if (IS_ERR(info)) { > + ret = PTR_ERR(info); > + goto out_gfree; > + } > + info->par = fbdev; > + > + ret = gm12u320_framebuffer_init(dev, &fbdev->fb, &mode_cmd, obj); > + if (ret) > + goto out_gfree; > + > + drm_fb = &fbdev->fb.base; > + > + fbdev->helper.fb = drm_fb; > + > + strcpy(info->fix.id, "gm12u320drmfb"); > + > + info->screen_base = fbdev->fb.obj->vmapping; > + info->fix.smem_len = size; > + info->fix.smem_start = (unsigned long)fbdev->fb.obj->vmapping; > + > + info->flags = FBINFO_DEFAULT | FBINFO_CAN_FORCE_OUTPUT; > + info->fbops = &gm12u320_fb_ops; > + drm_fb_helper_fill_fix(info, drm_fb->pitches[0], drm_fb->format->depth); > + drm_fb_helper_fill_var(info, &fbdev->helper, > + sizes->fb_width, sizes->fb_height); > +#ifdef CONFIG_DRM_FBDEV_EMULATION > + info->fbdefio = &gm12u320_fb_defio; > + fb_deferred_io_init(info); > +#endif > + > + DRM_DEBUG_KMS("allocated %dx%d vmal %p\n", > + drm_fb->width, drm_fb->height, > + fbdev->fb.obj->vmapping); > + > + return ret; > + > +out_gfree: > + drm_gem_object_unreference_unlocked(&fbdev->fb.obj->base); > +out: > + return ret; > +} > + > +static const struct drm_fb_helper_funcs gm12u320_fb_helper_funcs = { > + .fb_probe = gm12u320fb_create, > +}; > + > +static void gm12u320_fbdev_destroy(struct drm_device *dev, > + struct gm12u320_fbdev *fbdev) > +{ > +#ifdef CONFIG_DRM_FBDEV_EMULATION > + fb_deferred_io_cleanup(fbdev->helper.fbdev); > +#endif > + drm_fb_helper_unregister_fbi(&fbdev->helper); > + drm_fb_helper_fini(&fbdev->helper); > + drm_framebuffer_unregister_private(&fbdev->fb.base); > + drm_framebuffer_cleanup(&fbdev->fb.base); > + drm_gem_object_unreference_unlocked(&fbdev->fb.obj->base); > +} > + > +int gm12u320_fbdev_init(struct drm_device *dev) > +{ > + struct gm12u320_device *gm12u320 = dev->dev_private; > + struct gm12u320_fbdev *fbdev; > + int ret; > + > + fbdev = kzalloc(sizeof(struct gm12u320_fbdev), GFP_KERNEL); > + if (!fbdev) > + return -ENOMEM; > + > + gm12u320->fbdev = fbdev; > + > + drm_fb_helper_prepare(dev, &fbdev->helper, &gm12u320_fb_helper_funcs); > + > + ret = drm_fb_helper_init(dev, &fbdev->helper, 1); > + if (ret) > + goto free; > + > + ret = drm_fb_helper_single_add_all_connectors(&fbdev->helper); > + if (ret) > + goto fini; > + > + /* disable all the possible outputs/crtcs before entering KMS mode */ > + drm_helper_disable_unused_functions(dev); > + > + ret = drm_fb_helper_initial_config(&fbdev->helper, 32); > + if (ret) > + goto fini; > + > + return 0; > + > +fini: > + drm_fb_helper_fini(&fbdev->helper); > +free: > + kfree(fbdev); > + return ret; > +} > + > +void gm12u320_fbdev_cleanup(struct drm_device *dev) > +{ > + struct gm12u320_device *gm12u320 = dev->dev_private; > + > + if (!gm12u320->fbdev) > + return; > + > + gm12u320_fbdev_destroy(dev, gm12u320->fbdev); > + kfree(gm12u320->fbdev); > + gm12u320->fbdev = NULL; > +} > + > +void gm12u320_fbdev_unplug(struct drm_device *dev) > +{ > + struct gm12u320_device *gm12u320 = dev->dev_private; > + > + if (!gm12u320->fbdev) > + return; > + > + drm_fb_helper_unlink_fbi(&gm12u320->fbdev->helper); > +} > + > +struct drm_framebuffer * > +gm12u320_fb_user_fb_create(struct drm_device *dev, > + struct drm_file *file, > + const struct drm_mode_fb_cmd2 *mode_cmd) > +{ > + struct drm_gem_object *obj; > + struct gm12u320_framebuffer *fb; > + int ret; > + uint32_t size; > + > + obj = drm_gem_object_lookup(file, mode_cmd->handles[0]); > + if (obj == NULL) > + return ERR_PTR(-ENOENT); > + > + size = mode_cmd->pitches[0] * mode_cmd->height; > + size = ALIGN(size, PAGE_SIZE); > + > + if (size > obj->size) { > + DRM_ERROR("object size not sufficient for fb %d %zu %d %d\n", > + size, obj->size, mode_cmd->pitches[0], > + mode_cmd->height); > + return ERR_PTR(-ENOMEM); > + } > + > + fb = kzalloc(sizeof(*fb), GFP_KERNEL); > + if (fb == NULL) > + return ERR_PTR(-ENOMEM); > + > + ret = gm12u320_framebuffer_init(dev, fb, mode_cmd, to_gm12u320_bo(obj)); > + if (ret) { > + kfree(fb); > + return ERR_PTR(-EINVAL); > + } > + return &fb->base; > +} > diff --git a/drivers/gpu/drm/gm12u320/gm12u320_gem.c b/drivers/gpu/drm/gm12u320/gm12u320_gem.c > new file mode 100644 > index 000000000000..7bc576fae177 > --- /dev/null > +++ b/drivers/gpu/drm/gm12u320/gm12u320_gem.c > @@ -0,0 +1,237 @@ > +/* > + * Copyright (C) 2012-2016 Red Hat Inc. > + * > + * This file is subject to the terms and conditions of the GNU General Public > + * License v2. See the file COPYING in the main directory of this archive for > + * more details. > + */ > + > +#include <drm/drmP.h> > +#include "gm12u320_drv.h" > +#include <linux/shmem_fs.h> > +#include <linux/dma-buf.h> > + > +struct gm12u320_gem_object * > +gm12u320_gem_alloc_object(struct drm_device *dev, size_t size) > +{ > + struct gm12u320_gem_object *obj; > + > + obj = kzalloc(sizeof(*obj), GFP_KERNEL); > + if (obj == NULL) > + return NULL; > + > + if (drm_gem_object_init(dev, &obj->base, size) != 0) { > + kfree(obj); > + return NULL; > + } > + > + obj->flags = GM12U320_BO_CACHEABLE; > + return obj; > +} > + > +static int gm12u320_gem_create(struct drm_file *file, struct drm_device *dev, > + uint64_t size, uint32_t *handle_p) > +{ > + struct gm12u320_gem_object *obj; > + int ret; > + u32 handle; > + > + size = roundup(size, PAGE_SIZE); > + > + obj = gm12u320_gem_alloc_object(dev, size); > + if (obj == NULL) > + return -ENOMEM; > + > + ret = drm_gem_handle_create(file, &obj->base, &handle); > + if (ret) { > + drm_gem_object_release(&obj->base); > + kfree(obj); > + return ret; > + } > + > + drm_gem_object_unreference_unlocked(&obj->base); > + *handle_p = handle; > + return 0; > +} > + > +static void update_vm_cache_attr(struct gm12u320_gem_object *obj, > + struct vm_area_struct *vma) > +{ > + DRM_DEBUG_KMS("flags = 0x%x\n", obj->flags); > + > + /* non-cacheable as default. */ > + if (obj->flags & GM12U320_BO_CACHEABLE) { > + vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); > + } else if (obj->flags & GM12U320_BO_WC) { > + vma->vm_page_prot = > + pgprot_writecombine(vm_get_page_prot(vma->vm_flags)); > + } else { > + vma->vm_page_prot = > + pgprot_noncached(vm_get_page_prot(vma->vm_flags)); > + } > +} > + > +int gm12u320_dumb_create(struct drm_file *file, struct drm_device *dev, > + struct drm_mode_create_dumb *args) > +{ > + args->pitch = args->width * DIV_ROUND_UP(args->bpp, 8); > + args->size = args->pitch * args->height; > + return gm12u320_gem_create(file, dev, > + args->size, &args->handle); > +} > + > +int gm12u320_drm_gem_mmap(struct file *filp, struct vm_area_struct *vma) > +{ > + int ret; > + > + ret = drm_gem_mmap(filp, vma); > + if (ret) > + return ret; > + > + vma->vm_flags &= ~VM_PFNMAP; > + vma->vm_flags |= VM_MIXEDMAP; > + > + update_vm_cache_attr(to_gm12u320_bo(vma->vm_private_data), vma); > + > + return ret; > +} > + > +int gm12u320_gem_fault(struct vm_fault *vmf) > +{ > + struct vm_area_struct *vma = vmf->vma; > + struct gm12u320_gem_object *obj = to_gm12u320_bo(vma->vm_private_data); > + unsigned int page_offset; > + struct page *page; > + int ret = 0; > + > + page_offset = (vmf->address - vma->vm_start) >> PAGE_SHIFT; > + > + if (!obj->pages) > + return VM_FAULT_SIGBUS; > + > + page = obj->pages[page_offset]; > + ret = vm_insert_page(vma, vmf->address, page); > + switch (ret) { > + case -EAGAIN: > + case 0: > + case -ERESTARTSYS: > + return VM_FAULT_NOPAGE; > + case -ENOMEM: > + return VM_FAULT_OOM; > + default: > + return VM_FAULT_SIGBUS; > + } > +} Same plea for some standard mmap shmem-gem helpers as for prime helpers? > +int gm12u320_gem_get_pages(struct gm12u320_gem_object *obj) > +{ > + struct page **pages; > + > + if (obj->pages) > + return 0; > + > + pages = drm_gem_get_pages(&obj->base); > + if (IS_ERR(pages)) > + return PTR_ERR(pages); > + > + obj->pages = pages; > + > + return 0; > +} > + > +void gm12u320_gem_put_pages(struct gm12u320_gem_object *obj) > +{ > + if (obj->base.import_attach) { > + drm_free_large(obj->pages); > + obj->pages = NULL; > + return; > + } > + > + drm_gem_put_pages(&obj->base, obj->pages, false, false); > + obj->pages = NULL; > +} > + > +int gm12u320_gem_vmap(struct gm12u320_gem_object *obj) > +{ > + int page_count = obj->base.size / PAGE_SIZE; > + int ret; > + > + if (obj->base.import_attach) { > + obj->vmapping = dma_buf_vmap(obj->base.import_attach->dmabuf); > + if (!obj->vmapping) > + return -ENOMEM; > + return 0; > + } > + > + ret = gm12u320_gem_get_pages(obj); > + if (ret) > + return ret; > + > + obj->vmapping = vmap(obj->pages, page_count, 0, PAGE_KERNEL); > + if (!obj->vmapping) > + return -ENOMEM; > + return 0; > +} > + > +void gm12u320_gem_vunmap(struct gm12u320_gem_object *obj) > +{ > + if (obj->base.import_attach) { > + dma_buf_vunmap(obj->base.import_attach->dmabuf, obj->vmapping); > + return; > + } > + > + vunmap(obj->vmapping); > + > + gm12u320_gem_put_pages(obj); > +} > + > +void gm12u320_gem_free_object(struct drm_gem_object *gem_obj) > +{ > + struct gm12u320_gem_object *obj = to_gm12u320_bo(gem_obj); > + > + if (obj->vmapping) > + gm12u320_gem_vunmap(obj); > + > + if (gem_obj->import_attach) { > + drm_prime_gem_destroy(gem_obj, obj->sg); > + put_device(gem_obj->dev->dev); > + } > + > + if (obj->pages) > + gm12u320_gem_put_pages(obj); > + > + drm_gem_free_mmap_offset(gem_obj); > +} > + > +/* the dumb interface doesn't work with the GEM straight MMAP > + interface, it expects to do MMAP on the drm fd, like normal */ > +int gm12u320_gem_mmap(struct drm_file *file, struct drm_device *dev, > + uint32_t handle, uint64_t *offset) > +{ > + struct gm12u320_gem_object *gobj; > + struct drm_gem_object *obj; > + int ret = 0; > + > + mutex_lock(&dev->struct_mutex); > + obj = drm_gem_object_lookup(file, handle); > + if (obj == NULL) { > + ret = -ENOENT; > + goto unlock; > + } > + gobj = to_gm12u320_bo(obj); > + > + ret = gm12u320_gem_get_pages(gobj); > + if (ret) > + goto out; > + ret = drm_gem_create_mmap_offset(obj); > + if (ret) > + goto out; > + > + *offset = drm_vma_node_offset_addr(&gobj->base.vma_node); > + > +out: > + drm_gem_object_unreference(&gobj->base); > +unlock: > + mutex_unlock(&dev->struct_mutex); > + return ret; > +} > diff --git a/drivers/gpu/drm/gm12u320/gm12u320_main.c b/drivers/gpu/drm/gm12u320/gm12u320_main.c > new file mode 100644 > index 000000000000..6b9ab9d6d15b > --- /dev/null > +++ b/drivers/gpu/drm/gm12u320/gm12u320_main.c > @@ -0,0 +1,506 @@ > +/* > + * Copyright (C) 2012-2016 Red Hat Inc. > + * > + * Based in parts on the udl code. Based in parts on the gm12u320 fb driver: > + * Copyright (C) 2013 Viacheslav Nurmekhamitov <slavrn@yandex.ru> > + * Copyright (C) 2009 Roberto De Ioris <roberto@unbit.it> > + * Copyright (C) 2009 Jaya Kumar <jayakumar.lkml@gmail.com> > + * Copyright (C) 2009 Bernie Thompson <bernie@plugable.com> > + * > + * This file is subject to the terms and conditions of the GNU General Public > + * License v2. See the file COPYING in the main directory of this archive for > + * more details. > + */ > +#include <drm/drmP.h> > +#include <linux/dma-buf.h> > +#include "gm12u320_drv.h" > + > +static bool eco_mode; > +module_param(eco_mode, bool, 0644); > +MODULE_PARM_DESC(eco_mode, "Turn on Eco mode (less bright, more silent)"); > + > +#define MISC_RCV_EPT 1 > +#define DATA_RCV_EPT 2 > +#define DATA_SND_EPT 3 > +#define MISC_SND_EPT 4 > + > +#define DATA_BLOCK_HEADER_SIZE 84 > +#define DATA_BLOCK_CONTENT_SIZE 64512 > +#define DATA_BLOCK_FOOTER_SIZE 20 > +#define DATA_BLOCK_SIZE (DATA_BLOCK_HEADER_SIZE + \ > + DATA_BLOCK_CONTENT_SIZE + \ > + DATA_BLOCK_FOOTER_SIZE) > +#define DATA_LAST_BLOCK_CONTENT_SIZE 4032 > +#define DATA_LAST_BLOCK_SIZE (DATA_BLOCK_HEADER_SIZE + \ > + DATA_LAST_BLOCK_CONTENT_SIZE + \ > + DATA_BLOCK_FOOTER_SIZE) > + > +#define CMD_SIZE 31 > +#define READ_STATUS_SIZE 13 > +#define MISC_VALUE_SIZE 4 > + > +#define CMD_TIMEOUT 200 > +#define DATA_TIMEOUT 1000 > +#define IDLE_TIMEOUT 2000 > +#define FIRST_FRAME_TIMEOUT 2000 > + > +#define MISC_REQ_GET_SET_ECO_A 0xff > +#define MISC_REQ_GET_SET_ECO_B 0x35 > +/* Windows driver does once evert second, with with arg d = 1, others 0 */ > +#define MISC_REQ_UNKNOWN1_A 0xff > +#define MISC_REQ_UNKNOWN1_B 0x38 > +/* Windows driver does this on init, with arg a, b = 0, c = 0xa0, d = 4 */ > +#define MISC_REQ_UNKNOWN2_A 0xa5 > +#define MISC_REQ_UNKNOWN2_B 0x00 > + > +static const char cmd_data[CMD_SIZE] = { > + 0x55, 0x53, 0x42, 0x43, 0x00, 0x00, 0x00, 0x00, > + 0x68, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x10, 0xff, > + 0x00, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x80, 0x00, > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 > +}; > + > +static const char cmd_draw[CMD_SIZE] = { > + 0x55, 0x53, 0x42, 0x43, 0x00, 0x00, 0x00, 0x00, > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xfe, > + 0x00, 0x00, 0x00, 0xc0, 0xd1, 0x05, 0x00, 0x40, > + 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 > +}; > + > +static const char cmd_misc[CMD_SIZE] = { > + 0x55, 0x53, 0x42, 0x43, 0x00, 0x00, 0x00, 0x00, > + 0x04, 0x00, 0x00, 0x00, 0x80, 0x01, 0x10, 0xfd, > + 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 > +}; > + > +static const char data_block_header[DATA_BLOCK_HEADER_SIZE] = { > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0xfb, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0x00, 0x04, 0x15, 0x00, 0x00, 0xfc, 0x00, 0x00, > + 0x01, 0x00, 0x00, 0xdb > +}; > + > +static const char data_last_block_header[DATA_BLOCK_HEADER_SIZE] = { > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0xfb, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0x2a, 0x00, 0x20, 0x00, 0xc0, 0x0f, 0x00, 0x00, > + 0x01, 0x00, 0x00, 0xd7 > +}; > + > +static const char data_block_footer[DATA_BLOCK_FOOTER_SIZE] = { > + 0xfb, 0x14, 0x02, 0x20, 0x00, 0x00, 0x00, 0x00, > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0x80, 0x00, 0x00, 0x4f > +}; > + > +static int gm12u320_usb_alloc(struct gm12u320_device *gm12u320) > +{ > + int i, block_size; > + const char *hdr; > + > + gm12u320->cmd_buf = kmalloc(CMD_SIZE, GFP_KERNEL); > + if (!gm12u320->cmd_buf) > + return -ENOMEM; > + > + for (i = 0; i < GM12U320_BLOCK_COUNT; i++) { > + if (i == GM12U320_BLOCK_COUNT - 1) { > + block_size = DATA_LAST_BLOCK_SIZE; > + hdr = data_last_block_header; > + } else { > + block_size = DATA_BLOCK_SIZE; > + hdr = data_block_header; > + } > + > + gm12u320->data_buf[i] = kzalloc(block_size, GFP_KERNEL); > + if (!gm12u320->data_buf[i]) > + return -ENOMEM; > + > + memcpy(gm12u320->data_buf[i], hdr, DATA_BLOCK_HEADER_SIZE); > + memcpy(gm12u320->data_buf[i] + > + (block_size - DATA_BLOCK_FOOTER_SIZE), > + data_block_footer, DATA_BLOCK_FOOTER_SIZE); > + } > + > + return 0; > +} > + > +static void gm12u320_usb_free(struct gm12u320_device *gm12u320) > +{ > + int i; > + > + for (i = 0; i < GM12U320_BLOCK_COUNT; i++) > + kfree(gm12u320->data_buf[i]); > + > + kfree(gm12u320->cmd_buf); > +} > + > +static int gm12u320_misc_request(struct gm12u320_device *gm12u320, > + u8 req_a, u8 req_b, > + u8 arg_a, u8 arg_b, u8 arg_c, u8 arg_d) > +{ > + int ret, len; > + u8 *buf, val; > + > + buf = kmalloc(CMD_SIZE, GFP_KERNEL); > + if (!buf) > + return -ENOMEM; > + > + memcpy(buf, &cmd_misc, CMD_SIZE); > + buf[20] = req_a; > + buf[21] = req_b; > + buf[22] = arg_a; > + buf[23] = arg_b; > + buf[24] = arg_c; > + buf[25] = arg_d; > + > + /* Send request */ > + ret = usb_bulk_msg(gm12u320->udev, > + usb_sndbulkpipe(gm12u320->udev, MISC_SND_EPT), > + buf, CMD_SIZE, &len, CMD_TIMEOUT); > + if (ret || len != CMD_SIZE) { > + dev_err(&gm12u320->udev->dev, "Misc. req. error %d\n", ret); > + ret = -EIO; > + goto leave; > + } > + > + /* Read value */ > + ret = usb_bulk_msg(gm12u320->udev, > + usb_rcvbulkpipe(gm12u320->udev, MISC_RCV_EPT), > + buf, MISC_VALUE_SIZE, &len, DATA_TIMEOUT); > + if (ret || len != MISC_VALUE_SIZE) { > + dev_err(&gm12u320->udev->dev, "Misc. value error %d\n", ret); > + ret = -EIO; > + goto leave; > + } > + val = buf[0]; > + > + /* Read status */ > + ret = usb_bulk_msg(gm12u320->udev, > + usb_rcvbulkpipe(gm12u320->udev, MISC_RCV_EPT), > + buf, READ_STATUS_SIZE, &len, CMD_TIMEOUT); > + if (ret || len != READ_STATUS_SIZE) { > + dev_err(&gm12u320->udev->dev, "Misc. status error %d\n", ret); > + ret = -EIO; > + goto leave; > + } > + > + ret = val; > +leave: > + kfree(buf); > + return ret; > +} > + > +void gm12u320_32bpp_to_24bpp_packed(u8 *dst, u8 *src, int len) > +{ > + while (len--) { > + *dst++ = *src++; > + *dst++ = *src++; > + *dst++ = *src++; > + src++; > + } > +} > + > +static void gm12u320_copy_fb_to_blocks(struct gm12u320_framebuffer *fb, > + int x1, int x2, int y1, int y2) > +{ > + struct drm_device *dev = fb->base.dev; > + struct gm12u320_device *gm12u320 = dev->dev_private; > + int block, dst_offset, len, remain, ret; > + u8 *src; > + > + if (fb->obj->base.import_attach) { > + ret = dma_buf_begin_cpu_access( > + fb->obj->base.import_attach->dmabuf, DMA_FROM_DEVICE); > + if (ret) { > + DRM_ERROR("dma_buf_begin_cpu_access err: %d\n", ret); > + return; > + } > + } > + > + if (!fb->obj->vmapping) { > + ret = gm12u320_gem_vmap(fb->obj); > + if (ret) { > + DRM_ERROR("failed to vmap fb: %d\n", ret); > + goto end_cpu_access; > + } > + } > + > + src = fb->obj->vmapping + y1 * fb->base.pitches[0] + x1 * 4; > + > + x1 += (GM12U320_REAL_WIDTH - GM12U320_USER_WIDTH) / 2; > + x2 += (GM12U320_REAL_WIDTH - GM12U320_USER_WIDTH) / 2; > + > + for (; y1 < y2; y1++) { > + remain = 0; > + len = (x2 - x1) * 3; > + dst_offset = (y1 * GM12U320_REAL_WIDTH + x1) * 3; > + block = dst_offset / DATA_BLOCK_CONTENT_SIZE; > + dst_offset %= DATA_BLOCK_CONTENT_SIZE; > + > + if ((dst_offset + len) > DATA_BLOCK_CONTENT_SIZE) { > + remain = dst_offset + len - DATA_BLOCK_CONTENT_SIZE; > + len = DATA_BLOCK_CONTENT_SIZE - dst_offset; > + } > + > + dst_offset += DATA_BLOCK_HEADER_SIZE; > + len /= 3; > + > + gm12u320_32bpp_to_24bpp_packed( > + gm12u320->data_buf[block] + dst_offset, > + src, len); > + > + if (remain) { > + block++; > + dst_offset = DATA_BLOCK_HEADER_SIZE; > + gm12u320_32bpp_to_24bpp_packed( > + gm12u320->data_buf[block] + dst_offset, > + src + len * 4, remain / 3); > + } > + src += fb->base.pitches[0]; > + } > + > +end_cpu_access: > + if (fb->obj->base.import_attach) { > + ret = dma_buf_end_cpu_access( > + fb->obj->base.import_attach->dmabuf, DMA_FROM_DEVICE); > + if (ret) > + DRM_ERROR("dma_buf_end_cpu_access err: %d\n", ret); > + } > +} > + > +static int gm12u320_fb_update_ready(struct gm12u320_device *gm12u320) > +{ > + int ret; > + > + mutex_lock(&gm12u320->fb_update.lock); > + ret = !gm12u320->fb_update.run || gm12u320->fb_update.fb != NULL; > + mutex_unlock(&gm12u320->fb_update.lock); > + > + return ret; > +} > + > +static void gm12u320_fb_update_work(struct work_struct *work) > +{ > + struct gm12u320_device *gm12u320 = > + container_of(work, struct gm12u320_device, fb_update.work); > + int draw_status_timeout = FIRST_FRAME_TIMEOUT; > + int block, block_size, len, x1, x2, y1, y2; > + struct gm12u320_framebuffer *fb; > + int frame = 0; > + int ret = 0; > + > + while (gm12u320->fb_update.run) { > + mutex_lock(&gm12u320->fb_update.lock); > + fb = gm12u320->fb_update.fb; > + x1 = gm12u320->fb_update.x1; > + x2 = gm12u320->fb_update.x2; > + y1 = gm12u320->fb_update.y1; > + y2 = gm12u320->fb_update.y2; > + gm12u320->fb_update.fb = NULL; > + mutex_unlock(&gm12u320->fb_update.lock); > + > + if (fb) { > + gm12u320_copy_fb_to_blocks(fb, x1, x2, y1, y2); > + drm_framebuffer_unreference(&fb->base); > + } > + > + for (block = 0; block < GM12U320_BLOCK_COUNT; block++) { > + if (block == GM12U320_BLOCK_COUNT - 1) > + block_size = DATA_LAST_BLOCK_SIZE; > + else > + block_size = DATA_BLOCK_SIZE; > + > + /* Send data command to device */ > + memcpy(gm12u320->cmd_buf, cmd_data, CMD_SIZE); > + gm12u320->cmd_buf[8] = block_size & 0xff; > + gm12u320->cmd_buf[9] = block_size >> 8; > + gm12u320->cmd_buf[20] = 0xfc - block * 4; > + gm12u320->cmd_buf[21] = block | (frame << 7); > + > + ret = usb_bulk_msg(gm12u320->udev, > + usb_sndbulkpipe(gm12u320->udev, DATA_SND_EPT), > + gm12u320->cmd_buf, CMD_SIZE, &len, > + CMD_TIMEOUT); > + if (ret || len != CMD_SIZE) > + goto err; > + > + /* Send data block to device */ > + ret = usb_bulk_msg(gm12u320->udev, > + usb_sndbulkpipe(gm12u320->udev, DATA_SND_EPT), > + gm12u320->data_buf[block], block_size, > + &len, DATA_TIMEOUT); > + if (ret || len != block_size) > + goto err; > + > + /* Read status */ > + ret = usb_bulk_msg(gm12u320->udev, > + usb_rcvbulkpipe(gm12u320->udev, DATA_RCV_EPT), > + gm12u320->cmd_buf, READ_STATUS_SIZE, &len, > + CMD_TIMEOUT); > + if (ret || len != READ_STATUS_SIZE) > + goto err; > + } > + > + /* Send draw command to device */ > + memcpy(gm12u320->cmd_buf, cmd_draw, CMD_SIZE); > + ret = usb_bulk_msg(gm12u320->udev, > + usb_sndbulkpipe(gm12u320->udev, DATA_SND_EPT), > + gm12u320->cmd_buf, CMD_SIZE, &len, CMD_TIMEOUT); > + if (ret || len != CMD_SIZE) > + goto err; > + > + /* Read status */ > + ret = usb_bulk_msg(gm12u320->udev, > + usb_rcvbulkpipe(gm12u320->udev, DATA_RCV_EPT), > + gm12u320->cmd_buf, READ_STATUS_SIZE, &len, > + draw_status_timeout); > + if (ret || len != READ_STATUS_SIZE) > + goto err; > + > + draw_status_timeout = CMD_TIMEOUT; > + frame = !frame; > + > + /* > + * We must draw a frame every 2s otherwise the projector > + * switches back to showing its logo. > + */ > + wait_event_timeout(gm12u320->fb_update.waitq, > + gm12u320_fb_update_ready(gm12u320), > + msecs_to_jiffies(IDLE_TIMEOUT)); > + } > + return; > +err: > + /* Do not log errors caused by module unload or device unplug */ > + if (ret != -ECONNRESET && ret != -ESHUTDOWN) > + dev_err(&gm12u320->udev->dev, "Frame update error: %d\n", ret); > +} > + > +void gm12u320_start_fb_update(struct drm_device *dev) > +{ > + struct gm12u320_device *gm12u320 = dev->dev_private; > + > + mutex_lock(&gm12u320->fb_update.lock); > + gm12u320->fb_update.run = true; > + mutex_unlock(&gm12u320->fb_update.lock); > + > + queue_work(gm12u320->fb_update.workq, &gm12u320->fb_update.work); > +} > + > +void gm12u320_stop_fb_update(struct drm_device *dev) > +{ > + struct gm12u320_device *gm12u320 = dev->dev_private; > + > + mutex_lock(&gm12u320->fb_update.lock); > + gm12u320->fb_update.run = false; > + mutex_unlock(&gm12u320->fb_update.lock); > + > + wake_up(&gm12u320->fb_update.waitq); > + cancel_work_sync(&gm12u320->fb_update.work); > + > + mutex_lock(&gm12u320->fb_update.lock); > + if (gm12u320->fb_update.fb) { > + drm_framebuffer_unreference(&gm12u320->fb_update.fb->base); > + gm12u320->fb_update.fb = NULL; > + } > + mutex_unlock(&gm12u320->fb_update.lock); > +} > + > +int gm12u320_driver_load(struct drm_device *dev, unsigned long flags) > +{ > + struct usb_device *udev = (void *)flags; > + struct gm12u320_device *gm12u320; > + int ret = -ENOMEM; > + > + DRM_DEBUG("\n"); > + gm12u320 = kzalloc(sizeof(struct gm12u320_device), GFP_KERNEL); > + if (!gm12u320) > + return -ENOMEM; > + > + gm12u320->udev = udev; > + gm12u320->ddev = dev; > + dev->dev_private = gm12u320; > + > + INIT_WORK(&gm12u320->fb_update.work, gm12u320_fb_update_work); > + mutex_init(&gm12u320->fb_update.lock); > + init_waitqueue_head(&gm12u320->fb_update.waitq); > + > + ret = gm12u320_set_ecomode(dev); > + if (ret) > + goto err; > + > + gm12u320->fb_update.workq = create_singlethread_workqueue(DRIVER_NAME); > + if (!gm12u320->fb_update.workq) { > + ret = -ENOMEM; > + goto err; > + } > + > + ret = gm12u320_usb_alloc(gm12u320); > + if (ret) > + goto err_wq; > + > + DRM_DEBUG("\n"); > + ret = gm12u320_modeset_init(dev); > + if (ret) > + goto err_usb; > + > + ret = gm12u320_fbdev_init(dev); > + if (ret) > + goto err_modeset; > + > + ret = drm_vblank_init(dev, 1); > + if (ret) > + goto err_fb; > + > + gm12u320_start_fb_update(dev); > + > + return 0; > + > +err_fb: > + gm12u320_fbdev_cleanup(dev); > +err_modeset: > + gm12u320_modeset_cleanup(dev); > +err_usb: > + gm12u320_usb_free(gm12u320); > +err_wq: > + destroy_workqueue(gm12u320->fb_update.workq); > +err: > + kfree(gm12u320); > + DRM_ERROR("%d\n", ret); > + return ret; > +} > + > +void gm12u320_driver_unload(struct drm_device *dev) > +{ > + struct gm12u320_device *gm12u320 = dev->dev_private; > + > + drm_vblank_cleanup(dev); > + gm12u320_fbdev_cleanup(dev); > + gm12u320_modeset_cleanup(dev); > + gm12u320_usb_free(gm12u320); > + destroy_workqueue(gm12u320->fb_update.workq); > + kfree(gm12u320); > +} > + > +int gm12u320_set_ecomode(struct drm_device *dev) > +{ > + struct gm12u320_device *gm12u320 = dev->dev_private; > + > + return gm12u320_misc_request(gm12u320, MISC_REQ_GET_SET_ECO_A, > + MISC_REQ_GET_SET_ECO_B, 0x01 /* set */, > + eco_mode ? 0x01 : 0x00, 0x00, 0x01); > +} > diff --git a/drivers/gpu/drm/gm12u320/gm12u320_modeset.c b/drivers/gpu/drm/gm12u320/gm12u320_modeset.c > new file mode 100644 > index 000000000000..bb3122295d15 > --- /dev/null > +++ b/drivers/gpu/drm/gm12u320/gm12u320_modeset.c > @@ -0,0 +1,143 @@ > +/* > + * Copyright (C) 2012-2016 Red Hat Inc. > + * > + * Based in parts on the udl code. Based in parts on the gm12u320 fb driver: > + * Copyright (C) 2013 Viacheslav Nurmekhamitov <slavrn@yandex.ru> > + * Copyright (C) 2009 Roberto De Ioris <roberto@unbit.it> > + * Copyright (C) 2009 Jaya Kumar <jayakumar.lkml@gmail.com> > + * Copyright (C) 2009 Bernie Thompson <bernie@plugable.com> > + * > + * This file is subject to the terms and conditions of the GNU General Public > + * License v2. See the file COPYING in the main directory of this archive for > + * more details. > + */ > + > +#include <drm/drmP.h> > +#include <drm/drm_crtc.h> > +#include <drm/drm_crtc_helper.h> > +#include <drm/drm_plane_helper.h> > +#include "gm12u320_drv.h" > + > +static void gm12u320_crtc_dpms(struct drm_crtc *crtc, int mode) > +{ > +} > + > +static int gm12u320_crtc_mode_set(struct drm_crtc *crtc, > + struct drm_display_mode *mode, > + struct drm_display_mode *adjusted_mode, > + int x, int y, > + struct drm_framebuffer *old_fb) > + > +{ > + struct gm12u320_framebuffer *fb = to_gm12u320_fb(crtc->primary->fb); > + > + gm12u320_fb_mark_dirty(fb, 0, GM12U320_USER_WIDTH, 0, GM12U320_HEIGHT); > + return 0; > +} > + > + > +static void gm12u320_crtc_disable(struct drm_crtc *crtc) > +{ > +} > + > +static void gm12u320_crtc_destroy(struct drm_crtc *crtc) > +{ > + drm_crtc_cleanup(crtc); > + kfree(crtc); > +} > + > +static int gm12u320_crtc_page_flip(struct drm_crtc *crtc, > + struct drm_framebuffer *drm_fb, > + struct drm_pending_vblank_event *event, > + uint32_t page_flip_flags, > + struct drm_modeset_acquire_ctx *ctx) > +{ > + struct gm12u320_framebuffer *fb = to_gm12u320_fb(drm_fb); > + struct drm_device *dev = crtc->dev; > + unsigned long flags; > + > + gm12u320_fb_mark_dirty(fb, 0, GM12U320_USER_WIDTH, 0, GM12U320_HEIGHT); > + > + spin_lock_irqsave(&dev->event_lock, flags); > + if (event) > + drm_crtc_send_vblank_event(crtc, event); > + spin_unlock_irqrestore(&dev->event_lock, flags); > + > + crtc->primary->fb = drm_fb; > + > + return 0; > +} > + > +static void gm12u320_crtc_prepare(struct drm_crtc *crtc) > +{ > +} > + > +static void gm12u320_crtc_commit(struct drm_crtc *crtc) > +{ > + gm12u320_crtc_dpms(crtc, DRM_MODE_DPMS_ON); > +} > + > +static const struct drm_crtc_helper_funcs gm12u320_helper_funcs = { > + .dpms = gm12u320_crtc_dpms, > + .mode_set = gm12u320_crtc_mode_set, > + .prepare = gm12u320_crtc_prepare, > + .commit = gm12u320_crtc_commit, > + .disable = gm12u320_crtc_disable, > +}; > + > +static const struct drm_crtc_funcs gm12u320_crtc_funcs = { > + .set_config = drm_crtc_helper_set_config, > + .destroy = gm12u320_crtc_destroy, > + .page_flip = gm12u320_crtc_page_flip, > +}; > + > +static int gm12u320_crtc_init(struct drm_device *dev) > +{ > + struct drm_crtc *crtc; > + > + crtc = kzalloc(sizeof(struct drm_crtc) + > + sizeof(struct drm_connector *), GFP_KERNEL); > + if (crtc == NULL) > + return -ENOMEM; > + > + drm_crtc_init(dev, crtc, &gm12u320_crtc_funcs); > + drm_crtc_helper_add(crtc, &gm12u320_helper_funcs); > + > + return 0; > +} > + > +static const struct drm_mode_config_funcs gm12u320_mode_funcs = { > + .fb_create = gm12u320_fb_user_fb_create, > + .output_poll_changed = NULL, > +}; Submitting a non-atomic driver for inclusions in todays time! tsk ... Also, this is a prime example of hw that wants to use the simple display pipe helpers, which gives you atomic and all the new gizmos for free. > + > +int gm12u320_modeset_init(struct drm_device *dev) > +{ > + struct drm_encoder *encoder; > + > + drm_mode_config_init(dev); > + > + dev->mode_config.min_width = GM12U320_USER_WIDTH; > + dev->mode_config.min_height = GM12U320_HEIGHT; > + > + dev->mode_config.max_width = 2048; > + dev->mode_config.max_height = 2048; > + > + dev->mode_config.prefer_shadow = 0; > + dev->mode_config.preferred_depth = 24; > + > + dev->mode_config.funcs = &gm12u320_mode_funcs; > + > + gm12u320_crtc_init(dev); > + > + encoder = gm12u320_encoder_init(dev); > + > + gm12u320_connector_init(dev, encoder); > + > + return 0; > +} > + > +void gm12u320_modeset_cleanup(struct drm_device *dev) > +{ > + drm_mode_config_cleanup(dev); > +} > -- > 2.13.0 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [RFC 0/1] drm: Add Grain Media GM12U320 kms driver 2017-06-01 11:59 [RFC 0/1] drm: Add Grain Media GM12U320 kms driver Hans de Goede 2017-06-01 11:59 ` [RFC] " Hans de Goede @ 2017-06-01 22:46 ` Marco Diego Aurélio Mesquita 2017-06-02 16:14 ` Emil Velikov 1 sibling, 1 reply; 23+ messages in thread From: Marco Diego Aurélio Mesquita @ 2017-06-01 22:46 UTC (permalink / raw) To: Hans de Goede; +Cc: Daniel Vetter, dri-devel Hi Devs! On Thu, Jun 1, 2017 at 8:59 AM, Hans de Goede <hdegoede@redhat.com> wrote: > Hi All, > > This is a resend of a patch I send out a while back, rebased on top > of 4.12-rc3. Back then the main comment was can you try to make this > driver use the drm_simple_kms_helper stuff? Unfortunately I have > not had time yet to look into this. > > Recently I've been contacted by Marco Diego Aurélio Mesquita (in the Cc) > who wants to work on getting this driver ready for mainline. > > He has has some questions / ideas about how to do this, so the > main reason for reposting this is to give him a thread to reply to > which provides context for his questions / ideas. > Hans, thanks for citing me. I'm an owner of a c120 miniprojector and would like to have this driver on mainline. As far as I could test (previous versions) it works reasonably well. From what I've seen[1], main obstacle for this driver been mainlined is the duplicated code from the udl driver. I've been playing with the code of this driver for a few days and I think that moving the common code between the udl and gm12u320 is a sound idea. It would greatly simplify the code of both drivers and both would become much smaller. Since I'm a coder myself, I would like to do it myself. Common code and differences from both drivers are very easy to spot and moving that into a common lib is something that I think a can do without any problems. The only reason I still have not started it is because I don't know if such work would be accepted. So, my question for you devs is: do you agree in factoring out some code from the udl driver so that both drivers (udl and gm12u320) can be smaller and simpler? If the answer to this question is yes, then I'll start coding and plan to comeback just to ask about minor details about what is really specific (even if equal) for any driver and what is not. Hope you agree with my proposal. When answering, please cc me as I'm not subscribed to the list. Thanks! [1] https://lists.freedesktop.org/archives/dri-devel/2016-June/109648.html _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [RFC 0/1] drm: Add Grain Media GM12U320 kms driver 2017-06-01 22:46 ` [RFC 0/1] " Marco Diego Aurélio Mesquita @ 2017-06-02 16:14 ` Emil Velikov 2017-06-02 16:39 ` Marco Diego Aurélio Mesquita 0 siblings, 1 reply; 23+ messages in thread From: Emil Velikov @ 2017-06-02 16:14 UTC (permalink / raw) To: Marco Diego Aurélio Mesquita Cc: Hans de Goede, ML dri-devel, Daniel Vetter Hi Marco, Disclaimer: I'm mostly lurking around, barring the occasional patch so please take my input with a grain of salt. On 1 June 2017 at 23:46, Marco Diego Aurélio Mesquita <marcodiegomesquita@gmail.com> wrote: > Hi Devs! > > On Thu, Jun 1, 2017 at 8:59 AM, Hans de Goede <hdegoede@redhat.com> wrote: >> Hi All, >> >> This is a resend of a patch I send out a while back, rebased on top >> of 4.12-rc3. Back then the main comment was can you try to make this >> driver use the drm_simple_kms_helper stuff? Unfortunately I have >> not had time yet to look into this. >> >> Recently I've been contacted by Marco Diego Aurélio Mesquita (in the Cc) >> who wants to work on getting this driver ready for mainline. >> >> He has has some questions / ideas about how to do this, so the >> main reason for reposting this is to give him a thread to reply to >> which provides context for his questions / ideas. >> > > Hans, thanks for citing me. > > I'm an owner of a c120 miniprojector and would like to have this > driver on mainline. As far as I could test (previous versions) it > works reasonably well. From what I've seen[1], main obstacle for this > driver been mainlined is the duplicated code from the udl driver. > > I've been playing with the code of this driver for a few days and I > think that moving the common code between the udl and gm12u320 is a > sound idea. It would greatly simplify the code of both drivers and > both would become much smaller. > > Since I'm a coder myself, I would like to do it myself. Common code > and differences from both drivers are very easy to spot and moving > that into a common lib is something that I think a can do without any > problems. The only reason I still have not started it is because I > don't know if such work would be accepted. > > So, my question for you devs is: do you agree in factoring out some > code from the udl driver so that both drivers (udl and gm12u320) can > be smaller and simpler? > > If the answer to this question is yes, then I'll start coding and plan > to comeback just to ask about minor details about what is really > specific (even if equal) for any driver and what is not. > As Daniel mentioned in the earlier thread, factoring out things can be done as a follow-up. On the other hand, I _think_ that the blocker for this driver that it's not doing atomic mode setting. There's some example resources in Daniel's blog [1], although you could skim through any of the existing drivers that were converted recently (git log -p | grep DRIVER_ATOMIC) -Emil [1] http://blog.ffwll.ch/ _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [RFC 0/1] drm: Add Grain Media GM12U320 kms driver 2017-06-02 16:14 ` Emil Velikov @ 2017-06-02 16:39 ` Marco Diego Aurélio Mesquita 2017-06-07 10:30 ` Emil Velikov 0 siblings, 1 reply; 23+ messages in thread From: Marco Diego Aurélio Mesquita @ 2017-06-02 16:39 UTC (permalink / raw) To: Emil Velikov; +Cc: Hans de Goede, ML dri-devel, Daniel Vetter Hi Emil! On Fri, Jun 2, 2017 at 1:14 PM, Emil Velikov <emil.l.velikov@gmail.com> wrote: > As Daniel mentioned in the earlier thread, factoring out things can be > done as a follow-up. > On the other hand, I _think_ that the blocker for this driver that > it's not doing atomic mode setting. > I've been looking on other small drivers to see how complicated would it be to use the simple pipe framework. Both mxsfb and tinydrm do atomic mode setting. It looks like some changes would be needed like using the cma allocator and calling other specific functions tu do atomic mode setting. Can you point to a simple patch that implements one of these "conversions"? _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [RFC 0/1] drm: Add Grain Media GM12U320 kms driver 2017-06-02 16:39 ` Marco Diego Aurélio Mesquita @ 2017-06-07 10:30 ` Emil Velikov 2017-06-07 15:35 ` Marco Diego Aurélio Mesquita 0 siblings, 1 reply; 23+ messages in thread From: Emil Velikov @ 2017-06-07 10:30 UTC (permalink / raw) To: Marco Diego Aurélio Mesquita Cc: Hans de Goede, ML dri-devel, Daniel Vetter On 2 June 2017 at 17:39, Marco Diego Aurélio Mesquita <marcodiegomesquita@gmail.com> wrote: > Hi Emil! > > On Fri, Jun 2, 2017 at 1:14 PM, Emil Velikov <emil.l.velikov@gmail.com> wrote: >> As Daniel mentioned in the earlier thread, factoring out things can be >> done as a follow-up. >> On the other hand, I _think_ that the blocker for this driver that >> it's not doing atomic mode setting. >> > > I've been looking on other small drivers to see how complicated would > it be to use the simple pipe framework. Both mxsfb and tinydrm do > atomic mode setting. It looks like some changes would be needed like > using the cma allocator and calling other specific functions tu do > atomic mode setting. > > Can you point to a simple patch that implements one of these "conversions"? TinyDRM is a helper/library which can be used to write a DRM driver driving 'simple' hardware. IIRC one of the ideas was to use it, as a reference you can skim through the latest driver [nor merged yet] that utilises the helper [1]. Additionally the latest two drivers coverted to atomic seems to be: - vmwgfx [2] - a bit more complex driver, many changed squashed in - qxl [3] - simpler driver, but still more complex than gm12u320, a nice gradual conversion Additionally, feel free to join #dri-devel at FreeNode. Hope that helps, Emil [1] https://lists.freedesktop.org/archives/dri-devel/2017-June/143357.html [2] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/log/drivers/gpu/drm/vmwgfx?h=v4.12-rc4 [3] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/log/drivers/gpu/drm/qxl?h=v4.12-rc4 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [RFC 0/1] drm: Add Grain Media GM12U320 kms driver 2017-06-07 10:30 ` Emil Velikov @ 2017-06-07 15:35 ` Marco Diego Aurélio Mesquita 2017-06-07 16:56 ` Noralf Trønnes 0 siblings, 1 reply; 23+ messages in thread From: Marco Diego Aurélio Mesquita @ 2017-06-07 15:35 UTC (permalink / raw) To: Emil Velikov, noralf; +Cc: Hans de Goede, ML dri-devel, Daniel Vetter Hi Emil! On Wed, Jun 7, 2017 at 7:30 AM, Emil Velikov <emil.l.velikov@gmail.com> wrote: > On 2 June 2017 at 17:39, Marco Diego Aurélio Mesquita > <marcodiegomesquita@gmail.com> wrote: >> Hi Emil! >> >> On Fri, Jun 2, 2017 at 1:14 PM, Emil Velikov <emil.l.velikov@gmail.com> wrote: >>> As Daniel mentioned in the earlier thread, factoring out things can be >>> done as a follow-up. >>> On the other hand, I _think_ that the blocker for this driver that >>> it's not doing atomic mode setting. >>> >> >> I've been looking on other small drivers to see how complicated would >> it be to use the simple pipe framework. Both mxsfb and tinydrm do >> atomic mode setting. It looks like some changes would be needed like >> using the cma allocator and calling other specific functions tu do >> atomic mode setting. >> >> Can you point to a simple patch that implements one of these "conversions"? > > TinyDRM is a helper/library which can be used to write a DRM driver > driving 'simple' hardware. > IIRC one of the ideas was to use it, as a reference you can skim > through the latest driver [nor merged yet] that utilises the helper > [1]. Thanks for helping! I was indeed studying TinyDRM these days. But still haven't figured out it was a lib. So I started modifying it to fit my needs and found out it was too much work. Now I see, from the example you provided, how simple it should be to use it. Thanks! I'll try to do the same for gm12u320. Anyway, for now I still have some problems. Mainly the way gm12u320 provides its modes. In the patch sent by Hans[2] the get_modes function seems to be hardcoded. So, TinyDRM would probably need to be modified so that a custom get_modes function can be provided. Do you think that is reasonable? Noralf Tronnes, can you answer this? Also, I've had some problems trying to compile TinyDRM. When I type "make modules SUBDIRS=drivers/gpu/drm/tinydrm" I get lots of "WARNING ... undefined!" warnings. What is the right way to compile TinyDRM? One more thing: isn't TinyDRM specific to spi devices? > [1] https://lists.freedesktop.org/archives/dri-devel/2017-June/143357.html [2] https://lists.freedesktop.org/archives/dri-devel/2017-June/143234.html _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [RFC 0/1] drm: Add Grain Media GM12U320 kms driver 2017-06-07 15:35 ` Marco Diego Aurélio Mesquita @ 2017-06-07 16:56 ` Noralf Trønnes 2017-06-07 18:46 ` Marco Diego Aurélio Mesquita 0 siblings, 1 reply; 23+ messages in thread From: Noralf Trønnes @ 2017-06-07 16:56 UTC (permalink / raw) To: Marco Diego Aurélio Mesquita, Emil Velikov Cc: Hans de Goede, ML dri-devel, Daniel Vetter Hi Marco, Den 07.06.2017 17.35, skrev Marco Diego Aurélio Mesquita: > Hi Emil! > > On Wed, Jun 7, 2017 at 7:30 AM, Emil Velikov <emil.l.velikov@gmail.com> wrote: >> On 2 June 2017 at 17:39, Marco Diego Aurélio Mesquita >> <marcodiegomesquita@gmail.com> wrote: >>> Hi Emil! >>> >>> On Fri, Jun 2, 2017 at 1:14 PM, Emil Velikov <emil.l.velikov@gmail.com> wrote: >>>> As Daniel mentioned in the earlier thread, factoring out things can be >>>> done as a follow-up. >>>> On the other hand, I _think_ that the blocker for this driver that >>>> it's not doing atomic mode setting. >>>> >>> I've been looking on other small drivers to see how complicated would >>> it be to use the simple pipe framework. Both mxsfb and tinydrm do >>> atomic mode setting. It looks like some changes would be needed like >>> using the cma allocator and calling other specific functions tu do >>> atomic mode setting. >>> >>> Can you point to a simple patch that implements one of these "conversions"? >> TinyDRM is a helper/library which can be used to write a DRM driver >> driving 'simple' hardware. >> IIRC one of the ideas was to use it, as a reference you can skim >> through the latest driver [nor merged yet] that utilises the helper >> [1]. > Thanks for helping! > > I was indeed studying TinyDRM these days. But still haven't figured > out it was a lib. So I started modifying it to fit my needs and found > out it was too much work. Now I see, from the example you provided, > how simple it should be to use it. Thanks! I'll try to do the same for > gm12u320. > > Anyway, for now I still have some problems. Mainly the way gm12u320 > provides its modes. In the patch sent by Hans[2] the get_modes > function seems to be hardcoded. So, TinyDRM would probably need to be > modified so that a custom get_modes function can be provided. Do you > think that is reasonable? Noralf Tronnes, can you answer this? > > Also, I've had some problems trying to compile TinyDRM. When I type > "make modules SUBDIRS=drivers/gpu/drm/tinydrm" I get lots of "WARNING > ... undefined!" warnings. What is the right way to compile TinyDRM? > > One more thing: isn't TinyDRM specific to spi devices? tinydrm is targeted at displays on slow busses where userspace tells the driver which part of the framebuffer it has changed to minimize the transfer. The PL111 driver uses drm_simple_display_pipe and might be a better example for your use case: https://cgit.freedesktop.org/drm/drm-misc/tree/drivers/gpu/drm/pl111 Noralf. >> [1] https://lists.freedesktop.org/archives/dri-devel/2017-June/143357.html > [2] https://lists.freedesktop.org/archives/dri-devel/2017-June/143234.html > _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [RFC 0/1] drm: Add Grain Media GM12U320 kms driver 2017-06-07 16:56 ` Noralf Trønnes @ 2017-06-07 18:46 ` Marco Diego Aurélio Mesquita 2017-06-07 19:38 ` Noralf Trønnes 0 siblings, 1 reply; 23+ messages in thread From: Marco Diego Aurélio Mesquita @ 2017-06-07 18:46 UTC (permalink / raw) To: Noralf Trønnes Cc: Hans de Goede, Emil Velikov, ML dri-devel, Daniel Vetter Hi Noralf! On Wed, Jun 7, 2017 at 1:56 PM, Noralf Trønnes <noralf@tronnes.org> wrote: > tinydrm is targeted at displays on slow busses where userspace tells > the driver which part of the framebuffer it has changed to minimize > the transfer. > > The PL111 driver uses drm_simple_display_pipe and might be a better > example for your use case: > https://cgit.freedesktop.org/drm/drm-misc/tree/drivers/gpu/drm/pl111 I'll investigate how to modify the pl111 driver to fit my needs then. Do you think is there any change that must be done to the pl111_get_panel function regarding the call to of_graph_get_next_endpoint? I mean, the udl driver (which the gm12u320 driver is based on) does not have a panel; would any change be needed because of this? _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [RFC 0/1] drm: Add Grain Media GM12U320 kms driver 2017-06-07 18:46 ` Marco Diego Aurélio Mesquita @ 2017-06-07 19:38 ` Noralf Trønnes 2017-06-07 19:50 ` Marco Diego Aurélio Mesquita 0 siblings, 1 reply; 23+ messages in thread From: Noralf Trønnes @ 2017-06-07 19:38 UTC (permalink / raw) To: Marco Diego Aurélio Mesquita Cc: Hans de Goede, Emil Velikov, ML dri-devel, Daniel Vetter Den 07.06.2017 20.46, skrev Marco Diego Aurélio Mesquita: > Hi Noralf! > > On Wed, Jun 7, 2017 at 1:56 PM, Noralf Trønnes <noralf@tronnes.org> wrote: >> tinydrm is targeted at displays on slow busses where userspace tells >> the driver which part of the framebuffer it has changed to minimize >> the transfer. >> >> The PL111 driver uses drm_simple_display_pipe and might be a better >> example for your use case: >> https://cgit.freedesktop.org/drm/drm-misc/tree/drivers/gpu/drm/pl111 > I'll investigate how to modify the pl111 driver to fit my needs then. > Do you think is there any change that must be done to the > pl111_get_panel function regarding the call to > of_graph_get_next_endpoint? I mean, the udl driver (which the gm12u320 > driver is based on) does not have a panel; would any change be needed > because of this? I guess you can keep your get_modes and do something like this: static const struct drm_connector_helper_funcs gm12u320_helper_funcs = { .get_modes = gm12u320_get_modes, }; .best_encoder has a default that fits your 1 encoder case. static const struct drm_connector_funcs gm12u320_connector_funcs = { .fill_modes = drm_helper_probe_single_connector_modes, .destroy = gm12u320_connector_destroy, .detect = gm12u320_detect, .dpms = drm_atomic_helper_connector_dpms, .reset = drm_atomic_helper_connector_reset, .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, }; Then you init and add helper: drm_connector_init(dev, connector, &gm12u320_connector_funcs, DRM_MODE_CONNECTOR_Unknown); drm_connector_helper_add(connector, &gm12u320_helper_funcs); And finally attach the connector to the pipe: drm_simple_display_pipe_init(..., connector); The connector is registered when the drm device is registered. Noralf. _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [RFC 0/1] drm: Add Grain Media GM12U320 kms driver 2017-06-07 19:38 ` Noralf Trønnes @ 2017-06-07 19:50 ` Marco Diego Aurélio Mesquita 2017-06-07 20:19 ` Noralf Trønnes 0 siblings, 1 reply; 23+ messages in thread From: Marco Diego Aurélio Mesquita @ 2017-06-07 19:50 UTC (permalink / raw) To: Noralf Trønnes Cc: Hans de Goede, Emil Velikov, ML dri-devel, Daniel Vetter On Wed, Jun 7, 2017 at 4:38 PM, Noralf Trønnes <noralf@tronnes.org> wrote: > > Den 07.06.2017 20.46, skrev Marco Diego Aurélio Mesquita: >> >> Hi Noralf! >> >> On Wed, Jun 7, 2017 at 1:56 PM, Noralf Trønnes <noralf@tronnes.org> wrote: >>> >>> tinydrm is targeted at displays on slow busses where userspace tells >>> the driver which part of the framebuffer it has changed to minimize >>> the transfer. >>> >>> The PL111 driver uses drm_simple_display_pipe and might be a better >>> example for your use case: >>> https://cgit.freedesktop.org/drm/drm-misc/tree/drivers/gpu/drm/pl111 >> >> I'll investigate how to modify the pl111 driver to fit my needs then. >> Do you think is there any change that must be done to the >> pl111_get_panel function regarding the call to >> of_graph_get_next_endpoint? I mean, the udl driver (which the gm12u320 >> driver is based on) does not have a panel; would any change be needed >> because of this? > > > I guess you can keep your get_modes and do something like this: > > static const struct drm_connector_helper_funcs gm12u320_helper_funcs = { > .get_modes = gm12u320_get_modes, > }; > > .best_encoder has a default that fits your 1 encoder case. > > static const struct drm_connector_funcs gm12u320_connector_funcs = { > .fill_modes = drm_helper_probe_single_connector_modes, > .destroy = gm12u320_connector_destroy, > .detect = gm12u320_detect, > .dpms = drm_atomic_helper_connector_dpms, > .reset = drm_atomic_helper_connector_reset, > .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, > .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, > }; > > Then you init and add helper: > drm_connector_init(dev, connector, &gm12u320_connector_funcs, > DRM_MODE_CONNECTOR_Unknown); > drm_connector_helper_add(connector, &gm12u320_helper_funcs); > > And finally attach the connector to the pipe: > drm_simple_display_pipe_init(..., connector); > > The connector is registered when the drm device is registered. > Thanks Noralf! That's exactly what I did and I'll test it soon. The parts that scare me the most are the calls to of_graph_get_next_endpoint, of_property_read_u32_array and of_node_put (in display.c, for example). I'm still not sure those will work. _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [RFC 0/1] drm: Add Grain Media GM12U320 kms driver 2017-06-07 19:50 ` Marco Diego Aurélio Mesquita @ 2017-06-07 20:19 ` Noralf Trønnes 2017-06-07 21:14 ` Noralf Trønnes 0 siblings, 1 reply; 23+ messages in thread From: Noralf Trønnes @ 2017-06-07 20:19 UTC (permalink / raw) To: Marco Diego Aurélio Mesquita Cc: Hans de Goede, Emil Velikov, ML dri-devel, Daniel Vetter Den 07.06.2017 21.50, skrev Marco Diego Aurélio Mesquita: > On Wed, Jun 7, 2017 at 4:38 PM, Noralf Trønnes <noralf@tronnes.org> wrote: >> Den 07.06.2017 20.46, skrev Marco Diego Aurélio Mesquita: >>> Hi Noralf! >>> >>> On Wed, Jun 7, 2017 at 1:56 PM, Noralf Trønnes <noralf@tronnes.org> wrote: >>>> tinydrm is targeted at displays on slow busses where userspace tells >>>> the driver which part of the framebuffer it has changed to minimize >>>> the transfer. >>>> >>>> The PL111 driver uses drm_simple_display_pipe and might be a better >>>> example for your use case: >>>> https://cgit.freedesktop.org/drm/drm-misc/tree/drivers/gpu/drm/pl111 >>> I'll investigate how to modify the pl111 driver to fit my needs then. >>> Do you think is there any change that must be done to the >>> pl111_get_panel function regarding the call to >>> of_graph_get_next_endpoint? I mean, the udl driver (which the gm12u320 >>> driver is based on) does not have a panel; would any change be needed >>> because of this? >> >> I guess you can keep your get_modes and do something like this: >> >> static const struct drm_connector_helper_funcs gm12u320_helper_funcs = { >> .get_modes = gm12u320_get_modes, >> }; >> >> .best_encoder has a default that fits your 1 encoder case. >> >> static const struct drm_connector_funcs gm12u320_connector_funcs = { >> .fill_modes = drm_helper_probe_single_connector_modes, >> .destroy = gm12u320_connector_destroy, >> .detect = gm12u320_detect, >> .dpms = drm_atomic_helper_connector_dpms, >> .reset = drm_atomic_helper_connector_reset, >> .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, >> .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, >> }; >> >> Then you init and add helper: >> drm_connector_init(dev, connector, &gm12u320_connector_funcs, >> DRM_MODE_CONNECTOR_Unknown); >> drm_connector_helper_add(connector, &gm12u320_helper_funcs); >> >> And finally attach the connector to the pipe: >> drm_simple_display_pipe_init(..., connector); >> >> The connector is registered when the drm device is registered. >> > Thanks Noralf! That's exactly what I did and I'll test it soon. The > parts that scare me the most are the calls to > of_graph_get_next_endpoint, of_property_read_u32_array and of_node_put > (in display.c, for example). I'm still not sure those will work. You don't need those since you don't have a panel nor those pads: https://cgit.freedesktop.org/drm/drm-misc/tree/Documentation/devicetree/bindings/display/arm,pl11x.txt The reason I pointed you to the PL111 driver is because it's very simple, so it's easy to see how the simple pipeline works. It uses CMA memory and if you can use that all is well, but if you need to access the framebuffer from the cpu, it's not so good, because cma memory has uncached reads. The udl driver handles memory in a different way. I'm out of my depths here with memory and GEM and stuff. Noralf. _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [RFC 0/1] drm: Add Grain Media GM12U320 kms driver 2017-06-07 20:19 ` Noralf Trønnes @ 2017-06-07 21:14 ` Noralf Trønnes 2017-06-08 7:08 ` Hans de Goede 0 siblings, 1 reply; 23+ messages in thread From: Noralf Trønnes @ 2017-06-07 21:14 UTC (permalink / raw) To: Marco Diego Aurélio Mesquita Cc: Hans de Goede, Emil Velikov, ML dri-devel, Daniel Vetter Den 07.06.2017 22.19, skrev Noralf Trønnes: > > Den 07.06.2017 21.50, skrev Marco Diego Aurélio Mesquita: >> On Wed, Jun 7, 2017 at 4:38 PM, Noralf Trønnes <noralf@tronnes.org> >> wrote: >>> Den 07.06.2017 20.46, skrev Marco Diego Aurélio Mesquita: >>>> Hi Noralf! >>>> >>>> On Wed, Jun 7, 2017 at 1:56 PM, Noralf Trønnes <noralf@tronnes.org> >>>> wrote: >>>>> tinydrm is targeted at displays on slow busses where userspace tells >>>>> the driver which part of the framebuffer it has changed to minimize >>>>> the transfer. >>>>> >>>>> The PL111 driver uses drm_simple_display_pipe and might be a better >>>>> example for your use case: >>>>> https://cgit.freedesktop.org/drm/drm-misc/tree/drivers/gpu/drm/pl111 >>>> I'll investigate how to modify the pl111 driver to fit my needs then. >>>> Do you think is there any change that must be done to the >>>> pl111_get_panel function regarding the call to >>>> of_graph_get_next_endpoint? I mean, the udl driver (which the gm12u320 >>>> driver is based on) does not have a panel; would any change be needed >>>> because of this? >>> >>> I guess you can keep your get_modes and do something like this: >>> >>> static const struct drm_connector_helper_funcs gm12u320_helper_funcs >>> = { >>> .get_modes = gm12u320_get_modes, >>> }; >>> >>> .best_encoder has a default that fits your 1 encoder case. >>> >>> static const struct drm_connector_funcs gm12u320_connector_funcs = { >>> .fill_modes = drm_helper_probe_single_connector_modes, >>> .destroy = gm12u320_connector_destroy, >>> .detect = gm12u320_detect, >>> .dpms = drm_atomic_helper_connector_dpms, >>> .reset = drm_atomic_helper_connector_reset, >>> .atomic_duplicate_state = >>> drm_atomic_helper_connector_duplicate_state, >>> .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, >>> }; >>> >>> Then you init and add helper: >>> drm_connector_init(dev, connector, &gm12u320_connector_funcs, >>> DRM_MODE_CONNECTOR_Unknown); >>> drm_connector_helper_add(connector, &gm12u320_helper_funcs); >>> >>> And finally attach the connector to the pipe: >>> drm_simple_display_pipe_init(..., connector); >>> >>> The connector is registered when the drm device is registered. >>> >> Thanks Noralf! That's exactly what I did and I'll test it soon. The >> parts that scare me the most are the calls to >> of_graph_get_next_endpoint, of_property_read_u32_array and of_node_put >> (in display.c, for example). I'm still not sure those will work. > > You don't need those since you don't have a panel nor those pads: > https://cgit.freedesktop.org/drm/drm-misc/tree/Documentation/devicetree/bindings/display/arm,pl11x.txt > > > The reason I pointed you to the PL111 driver is because it's very simple, > so it's easy to see how the simple pipeline works. > It uses CMA memory and if you can use that all is well, but if you need > to access the framebuffer from the cpu, it's not so good, because cma > memory has uncached reads. > The udl driver handles memory in a different way. > > I'm out of my depths here with memory and GEM and stuff. > I see that you access the framebuffer in gm12u320_copy_fb_to_blocks(). That will be be very slow with CMA memory. I have worked around this in tinydrm by caching one line at a time to speed it up. I don't know if this will work for you. tinydrm displays are very small so the overhead isn't big compared to the transfer speed. See http://elixir.free-electrons.com/linux/latest/ident/tinydrm_swab16 Maybe you can cache one cacheline size at a time? After all, you have to pull it through the cpu cache. But as I said, memory isn't my expertise. It greatly simplifies your driver if you can use the cma library though. If so, maybe you even can use tinydrm with a connector of your own. You can just make your own version of tinydrm_display_pipe_init(). Noralf. _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [RFC 0/1] drm: Add Grain Media GM12U320 kms driver 2017-06-07 21:14 ` Noralf Trønnes @ 2017-06-08 7:08 ` Hans de Goede 2017-06-09 20:59 ` Marco Diego Aurélio Mesquita 0 siblings, 1 reply; 23+ messages in thread From: Hans de Goede @ 2017-06-08 7:08 UTC (permalink / raw) To: Noralf Trønnes, Marco Diego Aurélio Mesquita Cc: Daniel Vetter, Emil Velikov, ML dri-devel Hi, On 07-06-17 23:14, Noralf Trønnes wrote: > > Den 07.06.2017 22.19, skrev Noralf Trønnes: >> >> Den 07.06.2017 21.50, skrev Marco Diego Aurélio Mesquita: >>> On Wed, Jun 7, 2017 at 4:38 PM, Noralf Trønnes <noralf@tronnes.org> wrote: >>>> Den 07.06.2017 20.46, skrev Marco Diego Aurélio Mesquita: >>>>> Hi Noralf! >>>>> >>>>> On Wed, Jun 7, 2017 at 1:56 PM, Noralf Trønnes <noralf@tronnes.org> wrote: >>>>>> tinydrm is targeted at displays on slow busses where userspace tells >>>>>> the driver which part of the framebuffer it has changed to minimize >>>>>> the transfer. >>>>>> >>>>>> The PL111 driver uses drm_simple_display_pipe and might be a better >>>>>> example for your use case: >>>>>> https://cgit.freedesktop.org/drm/drm-misc/tree/drivers/gpu/drm/pl111 >>>>> I'll investigate how to modify the pl111 driver to fit my needs then. >>>>> Do you think is there any change that must be done to the >>>>> pl111_get_panel function regarding the call to >>>>> of_graph_get_next_endpoint? I mean, the udl driver (which the gm12u320 >>>>> driver is based on) does not have a panel; would any change be needed >>>>> because of this? >>>> >>>> I guess you can keep your get_modes and do something like this: >>>> >>>> static const struct drm_connector_helper_funcs gm12u320_helper_funcs = { >>>> .get_modes = gm12u320_get_modes, >>>> }; >>>> >>>> .best_encoder has a default that fits your 1 encoder case. >>>> >>>> static const struct drm_connector_funcs gm12u320_connector_funcs = { >>>> .fill_modes = drm_helper_probe_single_connector_modes, >>>> .destroy = gm12u320_connector_destroy, >>>> .detect = gm12u320_detect, >>>> .dpms = drm_atomic_helper_connector_dpms, >>>> .reset = drm_atomic_helper_connector_reset, >>>> .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, >>>> .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, >>>> }; >>>> >>>> Then you init and add helper: >>>> drm_connector_init(dev, connector, &gm12u320_connector_funcs, >>>> DRM_MODE_CONNECTOR_Unknown); >>>> drm_connector_helper_add(connector, &gm12u320_helper_funcs); >>>> >>>> And finally attach the connector to the pipe: >>>> drm_simple_display_pipe_init(..., connector); >>>> >>>> The connector is registered when the drm device is registered. >>>> >>> Thanks Noralf! That's exactly what I did and I'll test it soon. The >>> parts that scare me the most are the calls to >>> of_graph_get_next_endpoint, of_property_read_u32_array and of_node_put >>> (in display.c, for example). I'm still not sure those will work. >> >> You don't need those since you don't have a panel nor those pads: >> https://cgit.freedesktop.org/drm/drm-misc/tree/Documentation/devicetree/bindings/display/arm,pl11x.txt >> >> The reason I pointed you to the PL111 driver is because it's very simple, >> so it's easy to see how the simple pipeline works. >> It uses CMA memory and if you can use that all is well, but if you need >> to access the framebuffer from the cpu, it's not so good, because cma >> memory has uncached reads. >> The udl driver handles memory in a different way. >> >> I'm out of my depths here with memory and GEM and stuff. >> > > I see that you access the framebuffer in gm12u320_copy_fb_to_blocks(). > That will be be very slow with CMA memory. I have worked around this in > tinydrm by caching one line at a time to speed it up. I don't know if > this will work for you. tinydrm displays are very small so the overhead > isn't big compared to the transfer speed. > See http://elixir.free-electrons.com/linux/latest/ident/tinydrm_swab16 > > Maybe you can cache one cacheline size at a time? After all, you have to > pull it through the cpu cache. But as I said, memory isn't my expertise. > > It greatly simplifies your driver if you can use the cma library though. > If so, maybe you even can use tinydrm with a connector of your own. You > can just make your own version of tinydrm_display_pipe_init(). I don't think that using cma for the gm12u320 is a good idea, it will typically be used as a secondary GPU output together with a real GPU extending the desktop by being a prime display output. So for the memory management stuff I would keep the code copied from the udl driver (which we may later split out in a separate helper lib for devices where the framebuffer is in normal system memory and we have some scather-gather capable process copying it to the real device over e.g. USB) Regards, Hans _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [RFC 0/1] drm: Add Grain Media GM12U320 kms driver 2017-06-08 7:08 ` Hans de Goede @ 2017-06-09 20:59 ` Marco Diego Aurélio Mesquita 2017-06-09 22:31 ` Noralf Trønnes 2017-06-10 9:49 ` Hans de Goede 0 siblings, 2 replies; 23+ messages in thread From: Marco Diego Aurélio Mesquita @ 2017-06-09 20:59 UTC (permalink / raw) To: Hans de Goede; +Cc: Daniel Vetter, Emil Velikov, ML dri-devel Hi Devs! On Thu, Jun 8, 2017 at 4:08 AM, Hans de Goede <hdegoede@redhat.com> wrote: > I don't think that using cma for the gm12u320 is a good idea, it will > typically be used as a secondary GPU output together with a real GPU > extending the desktop by being a prime display output. So for the memory > management stuff I would keep the code copied from the udl driver (which > we may later split out in a separate helper lib for devices where > the framebuffer is in normal system memory and we have some scather-gather > capable process copying it to the real device over e.g. USB) > I got the PL111 driver and stripped all device specific code. Also, I added the get_modes and driver usb probe functions from gm12u320. The resulting code is available in https://gitlab.com/marcodiego/dummy-display-driver . The driver compiles, loads, identifies the device when I plug it, /dev/fb1 is created adequately but it stops there. Gnome monitors tool does not see it as a new monitor. What I expected was that it would be seen as a new monitor and that I could even activate it. Instead, syslog complains: "Cannot find any crtc or sizes". Anyway, I think this is a first step. My first doubt: where should I go from now? What should I change in the driver so that gnome monitors tool sees it as a new monitor and I could activate it, even if it works as a mere dummy device? Second doubt is: is this really the simplest/best way? I mean, the repaper driver that Emil pointed seems a lot simpler, wouldn't it be better to mimic it? How complicated is it to modify the repaper driver to build a dummy driver? By dummy driver, I mean something that gnome monitors tools can identify as a new monitor and I can activate it. I hope to reach a point where the update or dirty callback is called. From that point on it is just a matter of sending the framebuffer through USB the way gm12u320 does currently. Thanks! _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [RFC 0/1] drm: Add Grain Media GM12U320 kms driver 2017-06-09 20:59 ` Marco Diego Aurélio Mesquita @ 2017-06-09 22:31 ` Noralf Trønnes 2017-06-10 17:14 ` Marco Diego Aurélio Mesquita 2017-06-10 9:49 ` Hans de Goede 1 sibling, 1 reply; 23+ messages in thread From: Noralf Trønnes @ 2017-06-09 22:31 UTC (permalink / raw) To: Marco Diego Aurélio Mesquita, Hans de Goede Cc: Daniel Vetter, Emil Velikov, ML dri-devel Den 09.06.2017 22.59, skrev Marco Diego Aurélio Mesquita: > Hi Devs! > > On Thu, Jun 8, 2017 at 4:08 AM, Hans de Goede <hdegoede@redhat.com> wrote: >> I don't think that using cma for the gm12u320 is a good idea, it will >> typically be used as a secondary GPU output together with a real GPU >> extending the desktop by being a prime display output. So for the memory >> management stuff I would keep the code copied from the udl driver (which >> we may later split out in a separate helper lib for devices where >> the framebuffer is in normal system memory and we have some scather-gather >> capable process copying it to the real device over e.g. USB) >> > I got the PL111 driver and stripped all device specific code. Also, I > added the get_modes and driver usb probe functions from gm12u320. The > resulting code is available in > https://gitlab.com/marcodiego/dummy-display-driver . > > The driver compiles, loads, identifies the device when I plug it, > /dev/fb1 is created adequately but it stops there. Gnome monitors tool > does not see it as a new monitor. What I expected was that it would be > seen as a new monitor and that I could even activate it. Instead, > syslog complains: "Cannot find any crtc or sizes". > > Anyway, I think this is a first step. My first doubt: where should I > go from now? What should I change in the driver so that gnome monitors > tool sees it as a new monitor and I could activate it, even if it > works as a mere dummy device? > > Second doubt is: is this really the simplest/best way? I mean, the > repaper driver that Emil pointed seems a lot simpler, wouldn't it be > better to mimic it? How complicated is it to modify the repaper driver > to build a dummy driver? > > By dummy driver, I mean something that gnome monitors tools can > identify as a new monitor and I can activate it. I hope to reach a > point where the update or dirty callback is called. From that point on > it is just a matter of sending the framebuffer through USB the way > gm12u320 does currently. I guess you have forgotten to replace connector detect, because I didn't see you use drm_panel in your RFC. (gm12u320_connector->panel is NULL afaict, so it's always disconnected) static enum drm_connector_status gm12u320_connector_detect(struct drm_connector *connector, bool force) { - struct gm12u320_drm_connector *gm12u320_connector = - to_gm12u320_connector(connector); - - return (gm12u320_connector->panel ? - connector_status_connected : - connector_status_disconnected); + if (drm_device_is_unplugged(connector->dev)) + return connector_status_disconnected; + + return connector_status_connected; } Something like this should give you the dirty callback: static int gm12u320_fb_dirty(struct drm_framebuffer *fb, struct drm_file *file_priv, unsigned int flags, unsigned int color, struct drm_clip_rect *clips, unsigned int num_clips) { struct drm_gem_cma_object *cma_obj = drm_fb_cma_get_gem_obj(fb, 0); void *src = cma_obj->vaddr; printk("FBDIRTY\n"); } static const struct drm_framebuffer_funcs gm12u320_fb_funcs = { .destroy = drm_fb_cma_destroy, .create_handle = drm_fb_cma_create_handle, .dirty = gm12u320_fb_dirty, }; static struct drm_framebuffer * gm12u320_fb_create(struct drm_device *drm, struct drm_file *file_priv, const struct drm_mode_fb_cmd2 *mode_cmd) { return drm_fb_cma_create_with_funcs(drm, file_priv, mode_cmd, &gm12u320_fb_funcs); } static struct drm_mode_config_funcs mode_config_funcs = { .fb_create = gm12u320_fb_create, .atomic_check = drm_atomic_helper_check, .atomic_commit = drm_atomic_helper_commit, }; The repaper driver is based on tinydrm which uses the CMA library. Hans said that cma wasn't appropriate for your monitor. It will be difficult to go from a working tinydrm driver to one based on the udl GEM functions. I don't know gnome monitors tools, so I can't comment on that. Noralf. _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [RFC 0/1] drm: Add Grain Media GM12U320 kms driver 2017-06-09 22:31 ` Noralf Trønnes @ 2017-06-10 17:14 ` Marco Diego Aurélio Mesquita 2017-06-10 18:39 ` Hans de Goede 0 siblings, 1 reply; 23+ messages in thread From: Marco Diego Aurélio Mesquita @ 2017-06-10 17:14 UTC (permalink / raw) To: Noralf Trønnes Cc: Hans de Goede, Emil Velikov, ML dri-devel, Daniel Vetter Hi Devs! On Fri, Jun 9, 2017 at 7:31 PM, Noralf Trønnes <noralf@tronnes.org> wrote: > > Den 09.06.2017 22.59, skrev Marco Diego Aurélio Mesquita: >> >> Hi Devs! >> >> On Thu, Jun 8, 2017 at 4:08 AM, Hans de Goede <hdegoede@redhat.com> wrote: >>> >>> I don't think that using cma for the gm12u320 is a good idea, it will >>> typically be used as a secondary GPU output together with a real GPU >>> extending the desktop by being a prime display output. So for the memory >>> management stuff I would keep the code copied from the udl driver (which >>> we may later split out in a separate helper lib for devices where >>> the framebuffer is in normal system memory and we have some >>> scather-gather >>> capable process copying it to the real device over e.g. USB) >>> >> I got the PL111 driver and stripped all device specific code. Also, I >> added the get_modes and driver usb probe functions from gm12u320. The >> resulting code is available in >> https://gitlab.com/marcodiego/dummy-display-driver . >> >> The driver compiles, loads, identifies the device when I plug it, >> /dev/fb1 is created adequately but it stops there. Gnome monitors tool >> does not see it as a new monitor. What I expected was that it would be >> seen as a new monitor and that I could even activate it. Instead, >> syslog complains: "Cannot find any crtc or sizes". >> >> Anyway, I think this is a first step. My first doubt: where should I >> go from now? What should I change in the driver so that gnome monitors >> tool sees it as a new monitor and I could activate it, even if it >> works as a mere dummy device? >> >> Second doubt is: is this really the simplest/best way? I mean, the >> repaper driver that Emil pointed seems a lot simpler, wouldn't it be >> better to mimic it? How complicated is it to modify the repaper driver >> to build a dummy driver? >> >> By dummy driver, I mean something that gnome monitors tools can >> identify as a new monitor and I can activate it. I hope to reach a >> point where the update or dirty callback is called. From that point on >> it is just a matter of sending the framebuffer through USB the way >> gm12u320 does currently. > > > I guess you have forgotten to replace connector detect, because I > didn't see you use drm_panel in your RFC. > (gm12u320_connector->panel is NULL afaict, so it's always disconnected) > > static enum drm_connector_status gm12u320_connector_detect(struct > drm_connector > *connector, bool force) > { > - struct gm12u320_drm_connector *gm12u320_connector = > - to_gm12u320_connector(connector); > - > - return (gm12u320_connector->panel ? > - connector_status_connected : > - connector_status_disconnected); > + if (drm_device_is_unplugged(connector->dev)) > + return connector_status_disconnected; > + > + return connector_status_connected; > } > > I applied this change and now gnome monitors tool identifies it as another monitor, thanks Noralf! There are still some problems: when I activate it, gnome complains "could not set configuration for CRTC 284". I still don't know what causes this. Any idea? Other problem I get is that the device is spontaneously disconnected after some time. I'm not sure what causes this, but I think it happens because it receives no data after an amount of time. On the udl-based driver, a workqueue is used to periodically send some data to the device. Is there any problem using the same approach here? I mean, won't using a workqueue to periodically send some data to the device bring any conflict? If not, I'll start porting the code related to the workqueue from the udl-based driver to the pl111-based driver. That will probably improve the behavior of the device. Once I get it behaving properly, my next step will be to finally try to update the framebuffer of the device and get it to show something. Does this approach seem sound? _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [RFC 0/1] drm: Add Grain Media GM12U320 kms driver 2017-06-10 17:14 ` Marco Diego Aurélio Mesquita @ 2017-06-10 18:39 ` Hans de Goede 2017-06-11 17:20 ` Marco Diego Aurélio Mesquita 0 siblings, 1 reply; 23+ messages in thread From: Hans de Goede @ 2017-06-10 18:39 UTC (permalink / raw) To: Marco Diego Aurélio Mesquita, Noralf Trønnes Cc: Daniel Vetter, Emil Velikov, ML dri-devel Hi, On 10-06-17 19:14, Marco Diego Aurélio Mesquita wrote: > Hi Devs! > > On Fri, Jun 9, 2017 at 7:31 PM, Noralf Trønnes <noralf@tronnes.org> wrote: >> >> Den 09.06.2017 22.59, skrev Marco Diego Aurélio Mesquita: >>> >>> Hi Devs! >>> >>> On Thu, Jun 8, 2017 at 4:08 AM, Hans de Goede <hdegoede@redhat.com> wrote: >>>> >>>> I don't think that using cma for the gm12u320 is a good idea, it will >>>> typically be used as a secondary GPU output together with a real GPU >>>> extending the desktop by being a prime display output. So for the memory >>>> management stuff I would keep the code copied from the udl driver (which >>>> we may later split out in a separate helper lib for devices where >>>> the framebuffer is in normal system memory and we have some >>>> scather-gather >>>> capable process copying it to the real device over e.g. USB) >>>> >>> I got the PL111 driver and stripped all device specific code. Also, I >>> added the get_modes and driver usb probe functions from gm12u320. The >>> resulting code is available in >>> https://gitlab.com/marcodiego/dummy-display-driver . >>> >>> The driver compiles, loads, identifies the device when I plug it, >>> /dev/fb1 is created adequately but it stops there. Gnome monitors tool >>> does not see it as a new monitor. What I expected was that it would be >>> seen as a new monitor and that I could even activate it. Instead, >>> syslog complains: "Cannot find any crtc or sizes". >>> >>> Anyway, I think this is a first step. My first doubt: where should I >>> go from now? What should I change in the driver so that gnome monitors >>> tool sees it as a new monitor and I could activate it, even if it >>> works as a mere dummy device? >>> >>> Second doubt is: is this really the simplest/best way? I mean, the >>> repaper driver that Emil pointed seems a lot simpler, wouldn't it be >>> better to mimic it? How complicated is it to modify the repaper driver >>> to build a dummy driver? >>> >>> By dummy driver, I mean something that gnome monitors tools can >>> identify as a new monitor and I can activate it. I hope to reach a >>> point where the update or dirty callback is called. From that point on >>> it is just a matter of sending the framebuffer through USB the way >>> gm12u320 does currently. >> >> >> I guess you have forgotten to replace connector detect, because I >> didn't see you use drm_panel in your RFC. >> (gm12u320_connector->panel is NULL afaict, so it's always disconnected) >> >> static enum drm_connector_status gm12u320_connector_detect(struct >> drm_connector >> *connector, bool force) >> { >> - struct gm12u320_drm_connector *gm12u320_connector = >> - to_gm12u320_connector(connector); >> - >> - return (gm12u320_connector->panel ? >> - connector_status_connected : >> - connector_status_disconnected); >> + if (drm_device_is_unplugged(connector->dev)) >> + return connector_status_disconnected; >> + >> + return connector_status_connected; >> } >> >> > > I applied this change and now gnome monitors tool identifies it as > another monitor, thanks Noralf! There are still some problems: when I > activate it, gnome complains "could not set configuration for CRTC > 284". I still don't know what causes this. Any idea? > > Other problem I get is that the device is spontaneously disconnected > after some time. I'm not sure what causes this, but I think it happens > because it receives no data after an amount of time. Correct, there is no way to blank (think DPMS off) the device, but it will turn itself of it does not get any data for more then x seconds, I don't remember what X was. > On the udl-based > driver, a workqueue is used to periodically send some data to the > device. Is there any problem using the same approach here? I mean, > won't using a workqueue to periodically send some data to the device > bring any conflict? If not, I'll start porting the code related to the > workqueue from the udl-based driver to the pl111-based driver. Yes that is the right thing to do, notice that the workqueue is not just there to fix the timeout issue, the workqueue is there to send a full copy of the framebuffer (partial updates are not supported, but USB-3 is fast enough to not worry about this) to the device, it will this whenever it gets woken because either userspace gives us a new framebuffer (flip) or userspace has marked some area dirty marking. If the workqueue is not woken it will resend the last framebuffer after a timeout to avoid the device turning off, but its primary use is sending the framebuffer when updated. > That will probably improve the behavior of the device. Once I get it > behaving properly, my next step will be to finally try to update the > framebuffer of the device and get it to show something. > > Does this approach seem sound? This sounds good to me. Regards, Hans _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [RFC 0/1] drm: Add Grain Media GM12U320 kms driver 2017-06-10 18:39 ` Hans de Goede @ 2017-06-11 17:20 ` Marco Diego Aurélio Mesquita 2017-06-11 19:22 ` Hans de Goede 2017-06-11 20:24 ` Noralf Trønnes 0 siblings, 2 replies; 23+ messages in thread From: Marco Diego Aurélio Mesquita @ 2017-06-11 17:20 UTC (permalink / raw) To: Hans de Goede; +Cc: Daniel Vetter, Emil Velikov, ML dri-devel On Sat, Jun 10, 2017 at 3:39 PM, Hans de Goede <hdegoede@redhat.com> wrote: > On 10-06-17 19:14, Marco Diego Aurélio Mesquita wrote: >> I applied this change and now gnome monitors tool identifies it as >> another monitor, thanks Noralf! There are still some problems: when I >> activate it, gnome complains "could not set configuration for CRTC >> 284". I still don't know what causes this. Any idea? >> >> Other problem I get is that the device is spontaneously disconnected >> after some time. I'm not sure what causes this, but I think it happens >> because it receives no data after an amount of time. > > > Correct, there is no way to blank (think DPMS off) the device, but > it will turn itself of it does not get any data for more then x seconds, > I don't remember what X was. > I made an initial port of the workqueue to the in-progress driver. The behaviour improved. I no longer get spurious re-connections/disconnections and the device no longer shows its logo; that probably means that the data is successfully really reaching the device, I guess. I still have some problems. When I activate it through the gnome monitors tool, I get an error message: "failed to apply configuration %s" "timeout was reached". It doesn't complains about the crtc as before, but I still can't activate it. Anyone knows what is the problem that is causing this? Noralf, any idea? Now, my next steps will be to move part of the recently added code to another file, bring back the dirty callback, detect pages flips, call the update work queue accordingly, enable ecomode and fix some leaks. After that, the only thing missing to port will be the part that moves the data from the framebuffer to the blocks that are sent through usb. Hans, any objection to this roadmap/plan? _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [RFC 0/1] drm: Add Grain Media GM12U320 kms driver 2017-06-11 17:20 ` Marco Diego Aurélio Mesquita @ 2017-06-11 19:22 ` Hans de Goede 2017-06-11 20:24 ` Noralf Trønnes 1 sibling, 0 replies; 23+ messages in thread From: Hans de Goede @ 2017-06-11 19:22 UTC (permalink / raw) To: Marco Diego Aurélio Mesquita Cc: Daniel Vetter, Emil Velikov, ML dri-devel Hi, On 11-06-17 19:20, Marco Diego Aurélio Mesquita wrote: > On Sat, Jun 10, 2017 at 3:39 PM, Hans de Goede <hdegoede@redhat.com> wrote: >> On 10-06-17 19:14, Marco Diego Aurélio Mesquita wrote: >>> I applied this change and now gnome monitors tool identifies it as >>> another monitor, thanks Noralf! There are still some problems: when I >>> activate it, gnome complains "could not set configuration for CRTC >>> 284". I still don't know what causes this. Any idea? >>> >>> Other problem I get is that the device is spontaneously disconnected >>> after some time. I'm not sure what causes this, but I think it happens >>> because it receives no data after an amount of time. >> >> >> Correct, there is no way to blank (think DPMS off) the device, but >> it will turn itself of it does not get any data for more then x seconds, >> I don't remember what X was. >> > > I made an initial port of the workqueue to the in-progress driver. The > behaviour improved. I no longer get spurious > re-connections/disconnections and the device no longer shows its logo; > that probably means that the data is successfully really reaching the > device, I guess. > > I still have some problems. When I activate it through the gnome > monitors tool, I get an error message: "failed to apply configuration > %s" "timeout was reached". It doesn't complains about the crtc as > before, but I still can't activate it. Anyone knows what is the > problem that is causing this? Noralf, any idea? > > Now, my next steps will be to move part of the recently added code to > another file, bring back the dirty callback, detect pages flips, call > the update work queue accordingly, enable ecomode and fix some leaks. > After that, the only thing missing to port will be the part that moves > the data from the framebuffer to the blocks that are sent through usb. > Hans, any objection to this roadmap/plan? No sounds good to me. Regards, Hans _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [RFC 0/1] drm: Add Grain Media GM12U320 kms driver 2017-06-11 17:20 ` Marco Diego Aurélio Mesquita 2017-06-11 19:22 ` Hans de Goede @ 2017-06-11 20:24 ` Noralf Trønnes 1 sibling, 0 replies; 23+ messages in thread From: Noralf Trønnes @ 2017-06-11 20:24 UTC (permalink / raw) To: Marco Diego Aurélio Mesquita, Hans de Goede Cc: Daniel Vetter, Emil Velikov, ML dri-devel Den 11.06.2017 19.20, skrev Marco Diego Aurélio Mesquita: > On Sat, Jun 10, 2017 at 3:39 PM, Hans de Goede <hdegoede@redhat.com> wrote: >> On 10-06-17 19:14, Marco Diego Aurélio Mesquita wrote: >>> I applied this change and now gnome monitors tool identifies it as >>> another monitor, thanks Noralf! There are still some problems: when I >>> activate it, gnome complains "could not set configuration for CRTC >>> 284". I still don't know what causes this. Any idea? >>> >>> Other problem I get is that the device is spontaneously disconnected >>> after some time. I'm not sure what causes this, but I think it happens >>> because it receives no data after an amount of time. >> >> Correct, there is no way to blank (think DPMS off) the device, but >> it will turn itself of it does not get any data for more then x seconds, >> I don't remember what X was. >> > I made an initial port of the workqueue to the in-progress driver. The > behaviour improved. I no longer get spurious > re-connections/disconnections and the device no longer shows its logo; > that probably means that the data is successfully really reaching the > device, I guess. > > I still have some problems. When I activate it through the gnome > monitors tool, I get an error message: "failed to apply configuration > %s" "timeout was reached". It doesn't complains about the crtc as > before, but I still can't activate it. Anyone knows what is the > problem that is causing this? Noralf, any idea? I suggest you try the modetest tool in libdrm: https://cgit.freedesktop.org/mesa/drm This puts a test pattern on my display (driver mi0283qt): ./libdrm/tests/modetest/modetest -M "mi0283qt" -s 25:320x240@RG16 You can also enable some drm logging to see what's going on: echo 0xf > /sys/module/drm/parameters/debug Noralf. _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [RFC 0/1] drm: Add Grain Media GM12U320 kms driver 2017-06-09 20:59 ` Marco Diego Aurélio Mesquita 2017-06-09 22:31 ` Noralf Trønnes @ 2017-06-10 9:49 ` Hans de Goede 1 sibling, 0 replies; 23+ messages in thread From: Hans de Goede @ 2017-06-10 9:49 UTC (permalink / raw) To: Marco Diego Aurélio Mesquita Cc: Daniel Vetter, Emil Velikov, ML dri-devel Hi, On 09-06-17 22:59, Marco Diego Aurélio Mesquita wrote: > Hi Devs! > > On Thu, Jun 8, 2017 at 4:08 AM, Hans de Goede <hdegoede@redhat.com> wrote: >> I don't think that using cma for the gm12u320 is a good idea, it will >> typically be used as a secondary GPU output together with a real GPU >> extending the desktop by being a prime display output. So for the memory >> management stuff I would keep the code copied from the udl driver (which >> we may later split out in a separate helper lib for devices where >> the framebuffer is in normal system memory and we have some scather-gather >> capable process copying it to the real device over e.g. USB) >> > > I got the PL111 driver and stripped all device specific code. Also, I > added the get_modes and driver usb probe functions from gm12u320. The > resulting code is available in > https://gitlab.com/marcodiego/dummy-display-driver . Cool, I'm glad to see that you are making progress on this! Regards, Hans _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 23+ messages in thread
end of thread, other threads:[~2017-06-20 8:58 UTC | newest] Thread overview: 23+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2017-06-01 11:59 [RFC 0/1] drm: Add Grain Media GM12U320 kms driver Hans de Goede 2017-06-01 11:59 ` [RFC] " Hans de Goede 2017-06-20 8:57 ` Daniel Vetter 2017-06-01 22:46 ` [RFC 0/1] " Marco Diego Aurélio Mesquita 2017-06-02 16:14 ` Emil Velikov 2017-06-02 16:39 ` Marco Diego Aurélio Mesquita 2017-06-07 10:30 ` Emil Velikov 2017-06-07 15:35 ` Marco Diego Aurélio Mesquita 2017-06-07 16:56 ` Noralf Trønnes 2017-06-07 18:46 ` Marco Diego Aurélio Mesquita 2017-06-07 19:38 ` Noralf Trønnes 2017-06-07 19:50 ` Marco Diego Aurélio Mesquita 2017-06-07 20:19 ` Noralf Trønnes 2017-06-07 21:14 ` Noralf Trønnes 2017-06-08 7:08 ` Hans de Goede 2017-06-09 20:59 ` Marco Diego Aurélio Mesquita 2017-06-09 22:31 ` Noralf Trønnes 2017-06-10 17:14 ` Marco Diego Aurélio Mesquita 2017-06-10 18:39 ` Hans de Goede 2017-06-11 17:20 ` Marco Diego Aurélio Mesquita 2017-06-11 19:22 ` Hans de Goede 2017-06-11 20:24 ` Noralf Trønnes 2017-06-10 9:49 ` Hans de Goede
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.