dri-devel September 2019

dri-devel@lists.freedesktop.org

315 participants
2278 discussions

[PATCH 1/2] drm/panfrost: Allow passing extra information about BOs used by a job
by Boris Brezillon 23 Sep '19

23 Sep '19

The READ/WRITE flags are particularly useful if we want to avoid serialization of jobs that read from the same BO but never write to it. The NO_IMPLICIT_FENCE might be useful when the user knows the BO is shared but jobs are using different portions of the buffer. Signed-off-by: Boris Brezillon <boris.brezillon(a)collabora.com> --- drivers/gpu/drm/panfrost/panfrost_drv.c | 72 +++++++++-- drivers/gpu/drm/panfrost/panfrost_job.c | 164 +++++++++++++++++++----- drivers/gpu/drm/panfrost/panfrost_job.h | 11 +- include/uapi/drm/panfrost_drm.h | 41 ++++++ 4 files changed, 247 insertions(+), 41 deletions(-) diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c index d74442d71048..08082fd557c3 100644 --- a/drivers/gpu/drm/panfrost/panfrost_drv.c +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c @@ -119,20 +119,76 @@ panfrost_lookup_bos(struct drm_device *dev, struct drm_panfrost_submit *args, struct panfrost_job *job) { - job->bo_count = args->bo_handle_count; + struct drm_panfrost_submit_bo *bo_descs = NULL; + u32 *handles = NULL; + u32 i, bo_count; + int ret = 0; - if (!job->bo_count) + bo_count = args->bo_desc_count ? + args->bo_desc_count : args->bo_handle_count; + if (!bo_count) return 0; - job->implicit_fences = kvmalloc_array(job->bo_count, - sizeof(struct dma_fence *), + job->bos = kvmalloc_array(bo_count, sizeof(*job->bos), GFP_KERNEL | __GFP_ZERO); - if (!job->implicit_fences) + if (!job->bos) return -ENOMEM; - return drm_gem_objects_lookup(file_priv, - (void __user *)(uintptr_t)args->bo_handles, - job->bo_count, &job->bos); + job->bo_count = bo_count; + bo_descs = kvmalloc_array(bo_count, sizeof(*bo_descs), + GFP_KERNEL | __GFP_ZERO); + if (!bo_descs) { + ret = -ENOMEM; + goto out; + } + + if (!args->bo_desc_count) { + handles = kvmalloc_array(bo_count, sizeof(*handles), + GFP_KERNEL); + if (!handles) { + ret =-ENOMEM; + goto out; + } + + if (copy_from_user(handles, + (void __user *)(uintptr_t)args->bo_handles, + job->bo_count * sizeof(*handles))) { + ret = -EFAULT; + goto out; + } + + for (i = 0; i < job->bo_count; i++) { + bo_descs[i].handle = handles[i]; + bo_descs[i].flags = PANFROST_SUBMIT_BO_WRITE | + PANFROST_SUBMIT_BO_READ; + } + } else if (copy_from_user(bo_descs, + (void __user *)(uintptr_t)args->bo_descs, + job->bo_count * sizeof(*bo_descs))) { + ret = -EFAULT; + goto out; + } + + for (i = 0; i < job->bo_count; i++) { + if ((bo_descs[i].flags & ~PANFROST_SUBMIT_BO_VALID_FLAGS) || + !(bo_descs[i].flags & PANFROST_SUBMIT_BO_RW)) { + ret = -EINVAL; + goto out; + } + + job->bos[i].flags = bo_descs[i].flags; + job->bos[i].obj = drm_gem_object_lookup(file_priv, + bo_descs[i].handle); + if (!job->bos[i].obj) { + ret = -ENOENT; + goto out; + } + } + +out: + kvfree(handles); + kvfree(bo_descs); + return ret; } /** diff --git a/drivers/gpu/drm/panfrost/panfrost_job.c b/drivers/gpu/drm/panfrost/panfrost_job.c index 05c85f45a0de..e4b74fde9339 100644 --- a/drivers/gpu/drm/panfrost/panfrost_job.c +++ b/drivers/gpu/drm/panfrost/panfrost_job.c @@ -193,24 +193,116 @@ static void panfrost_job_hw_submit(struct panfrost_job *job, int js) pm_runtime_put_autosuspend(pfdev->dev); } -static void panfrost_acquire_object_fences(struct drm_gem_object **bos, - int bo_count, - struct dma_fence **implicit_fences) +static int panfrost_acquire_object_fences(struct panfrost_job *job) { - int i; + int i, ret; - for (i = 0; i < bo_count; i++) - implicit_fences[i] = dma_resv_get_excl_rcu(bos[i]->resv); + for (i = 0; i < job->bo_count; i++) { + struct panfrost_job_bo_desc *bo = &job->bos[i]; + struct dma_resv *robj = bo->obj->resv; + + if (!(job->bos[i].flags & PANFROST_SUBMIT_BO_WRITE)) { + ret = dma_resv_reserve_shared(robj, 1); + if (ret) + return ret; + } + + if (bo->flags & PANFROST_SUBMIT_BO_NO_IMPLICIT_FENCE) + continue; + + if (bo->flags & PANFROST_SUBMIT_BO_WRITE) { + ret = dma_resv_get_fences_rcu(robj, &bo->excl, + &bo->shared_count, + &bo->shared); + if (ret) + return ret; + } else { + bo->excl = dma_resv_get_excl_rcu(robj); + } + } + + return 0; } -static void panfrost_attach_object_fences(struct drm_gem_object **bos, - int bo_count, - struct dma_fence *fence) +static void panfrost_attach_object_fences(struct panfrost_job *job) { int i; - for (i = 0; i < bo_count; i++) - dma_resv_add_excl_fence(bos[i]->resv, fence); + for (i = 0; i < job->bo_count; i++) { + struct drm_gem_object *obj = job->bos[i].obj; + + if (job->bos[i].flags & PANFROST_SUBMIT_BO_WRITE) + dma_resv_add_excl_fence(obj->resv, + job->render_done_fence); + else + dma_resv_add_shared_fence(obj->resv, + job->render_done_fence); + } +} + +static int panfrost_job_lock_bos(struct panfrost_job *job, + struct ww_acquire_ctx *acquire_ctx) +{ + int contended = -1; + int i, ret; + + ww_acquire_init(acquire_ctx, &reservation_ww_class); + +retry: + if (contended != -1) { + struct drm_gem_object *obj = job->bos[contended].obj; + + ret = ww_mutex_lock_slow_interruptible(&obj->resv->lock, + acquire_ctx); + if (ret) { + ww_acquire_done(acquire_ctx); + return ret; + } + } + + for (i = 0; i < job->bo_count; i++) { + if (i == contended) + continue; + + ret = ww_mutex_lock_interruptible(&job->bos[i].obj->resv->lock, + acquire_ctx); + if (ret) { + int j; + + for (j = 0; j < i; j++) + ww_mutex_unlock(&job->bos[j].obj->resv->lock); + + if (contended != -1 && contended >= i) { + struct drm_gem_object *contended_obj; + + contended_obj = job->bos[contended].obj; + ww_mutex_unlock(&contended_obj->resv->lock); + } + + if (ret == -EDEADLK) { + contended = i; + goto retry; + } + + ww_acquire_done(acquire_ctx); + return ret; + } + } + + ww_acquire_done(acquire_ctx); + + return 0; +} + +static void panfrost_job_unlock_bos(struct panfrost_job *job, + struct ww_acquire_ctx *acquire_ctx) +{ + int i; + + for (i = 0; i < job->bo_count; i++) + ww_mutex_unlock(&job->bos[i].obj->resv->lock); + + ww_acquire_fini(acquire_ctx); } int panfrost_job_push(struct panfrost_job *job) @@ -223,8 +315,7 @@ int panfrost_job_push(struct panfrost_job *job) mutex_lock(&pfdev->sched_lock); - ret = drm_gem_lock_reservations(job->bos, job->bo_count, - &acquire_ctx); + ret = panfrost_job_lock_bos(job, &acquire_ctx); if (ret) { mutex_unlock(&pfdev->sched_lock); return ret; @@ -240,18 +331,16 @@ int panfrost_job_push(struct panfrost_job *job) kref_get(&job->refcount); /* put by scheduler job completion */ - panfrost_acquire_object_fences(job->bos, job->bo_count, - job->implicit_fences); + panfrost_acquire_object_fences(job); drm_sched_entity_push_job(&job->base, entity); mutex_unlock(&pfdev->sched_lock); - panfrost_attach_object_fences(job->bos, job->bo_count, - job->render_done_fence); + panfrost_attach_object_fences(job); unlock: - drm_gem_unlock_reservations(job->bos, job->bo_count, &acquire_ctx); + panfrost_job_unlock_bos(job, &acquire_ctx); return ret; } @@ -267,20 +356,22 @@ static void panfrost_job_cleanup(struct kref *ref) dma_fence_put(job->in_fences[i]); kvfree(job->in_fences); } - if (job->implicit_fences) { - for (i = 0; i < job->bo_count; i++) - dma_fence_put(job->implicit_fences[i]); - kvfree(job->implicit_fences); + + for (i = 0; i < job->bo_count; i++) { + unsigned int j; + + dma_fence_put(job->bos[i].excl); + for (j = 0; j < job->bos[i].shared_count; j++) + dma_fence_put(job->bos[i].shared[j]); } + dma_fence_put(job->done_fence); dma_fence_put(job->render_done_fence); - if (job->bos) { - for (i = 0; i < job->bo_count; i++) - drm_gem_object_put_unlocked(job->bos[i]); - kvfree(job->bos); - } + for (i = 0; i < job->bo_count; i++) + drm_gem_object_put_unlocked(job->bos[i].obj); + kvfree(job->bos); kfree(job); } @@ -314,11 +405,22 @@ static struct dma_fence *panfrost_job_dependency(struct drm_sched_job *sched_job } } - /* Implicit fences, max. one per BO */ + /* Implicit fences */ for (i = 0; i < job->bo_count; i++) { - if (job->implicit_fences[i]) { - fence = job->implicit_fences[i]; - job->implicit_fences[i] = NULL; + unsigned int j; + + if (job->bos[i].excl) { + fence = job->bos[i].excl; + job->bos[i].excl = NULL; + return fence; + } + + for (j = 0; j < job->bos[i].shared_count; j++) { + if (!job->bos[i].shared[j]) + continue; + + fence = job->bos[i].shared[j]; + job->bos[i].shared[j] = NULL; return fence; } } diff --git a/drivers/gpu/drm/panfrost/panfrost_job.h b/drivers/gpu/drm/panfrost/panfrost_job.h index 62454128a792..53440640a6e3 100644 --- a/drivers/gpu/drm/panfrost/panfrost_job.h +++ b/drivers/gpu/drm/panfrost/panfrost_job.h @@ -11,6 +11,14 @@ struct panfrost_device; struct panfrost_gem_object; struct panfrost_file_priv; +struct panfrost_job_bo_desc { + struct drm_gem_object *obj; + struct dma_fence *excl; + struct dma_fence **shared; + unsigned int shared_count; + u32 flags; +}; + struct panfrost_job { struct drm_sched_job base; @@ -31,8 +39,7 @@ struct panfrost_job { __u32 flush_id; /* Exclusive fences we have taken from the BOs to wait for */ - struct dma_fence **implicit_fences; - struct drm_gem_object **bos; + struct panfrost_job_bo_desc *bos; u32 bo_count; /* Fence to be signaled by drm-sched once its done with the job */ diff --git a/include/uapi/drm/panfrost_drm.h b/include/uapi/drm/panfrost_drm.h index ec19db1eead8..029c6ae1b1f0 100644 --- a/include/uapi/drm/panfrost_drm.h +++ b/include/uapi/drm/panfrost_drm.h @@ -40,6 +40,28 @@ extern "C" { #define DRM_IOCTL_PANFROST_PERFCNT_DUMP DRM_IOW(DRM_COMMAND_BASE + DRM_PANFROST_PERFCNT_DUMP, struct drm_panfrost_perfcnt_dump) #define PANFROST_JD_REQ_FS (1 << 0) + +#define PANFROST_SUBMIT_BO_READ (1 << 0) +#define PANFROST_SUBMIT_BO_WRITE (1 << 1) +#define PANFROST_SUBMIT_BO_RW (PANFROST_SUBMIT_BO_READ | \ + PANFROST_SUBMIT_BO_WRITE) +#define PANFROST_SUBMIT_BO_NO_IMPLICIT_FENCE (1 << 2) +#define PANFROST_SUBMIT_BO_VALID_FLAGS \ + (PANFROST_SUBMIT_BO_RW | PANFROST_SUBMIT_BO_NO_IMPLICIT_FENCE) + +/** + * struct drm_panfrost_submit_bo - BO descriptor passed to the submit ioctl. + * + * Useful to give detailed information about BOs used by a given job. + * + * @handle: the GEM handle + * @flags: a combination of PANFROST_SUBMIT_BO_* + */ +struct drm_panfrost_submit_bo { + __u32 handle; + __u32 flags; +}; + /** * struct drm_panfrost_submit - ioctl argument for submitting commands to the 3D * engine. @@ -68,6 +90,25 @@ struct drm_panfrost_submit { /** A combination of PANFROST_JD_REQ_* */ __u32 requirements; + + /** + * Pointer to a u32 array of &drm_panfrost_submit_bo_desc objects. This + * field is meant to replace &drm_panfrost_submit.bo_handles which did + * not provide enough information to relax synchronization between + * jobs that only only read the BO they share. When both + * &drm_panfrost_submit.bo_handles and &drm_panfrost_submit.bo_descs + * are provided, drm_panfrost_submit.bo_handles is ignored. + */ + __u64 bo_descs; + + /** + * Number of BO descriptors passed in (size is that times + * sizeof(drm_panfrost_submit_bo_desc)). + */ + __u32 bo_desc_count; + + /** Padding, must be 0. */ + __u32 pad; }; /** -- 2.21.0

5 10

[PATCH v2] drm: tweak drm_print_bits()
by Gerd Hoffmann 23 Sep '19

23 Sep '19

There is little reason for the from/to logic, printing a subset of the bits can be done by simply shifting/masking value if needed. Also use for_each_set_bit(). Suggested-by: Jani Nikula <jani.nikula(a)linux.intel.com> Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com> Reviewed-by: Jani Nikula <jani.nikula(a)intel.com> --- include/drm/drm_print.h | 5 ++--- drivers/gpu/drm/drm_gem_ttm_helper.c | 4 ++-- drivers/gpu/drm/drm_print.c | 20 +++++++++----------- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h index 12d4916254b4..89d38d07316c 100644 --- a/include/drm/drm_print.h +++ b/include/drm/drm_print.h @@ -89,9 +89,8 @@ __printf(2, 3) void drm_printf(struct drm_printer *p, const char *f, ...); void drm_puts(struct drm_printer *p, const char *str); void drm_print_regset32(struct drm_printer *p, struct debugfs_regset32 *regset); -void drm_print_bits(struct drm_printer *p, - unsigned long value, const char *bits[], - unsigned int from, unsigned int to); +void drm_print_bits(struct drm_printer *p, unsigned long value, + const char * const bits[], unsigned int nbits); __printf(2, 0) /** diff --git a/drivers/gpu/drm/drm_gem_ttm_helper.c b/drivers/gpu/drm/drm_gem_ttm_helper.c index 9a4bafcf20df..a534104d8bee 100644 --- a/drivers/gpu/drm/drm_gem_ttm_helper.c +++ b/drivers/gpu/drm/drm_gem_ttm_helper.c @@ -23,7 +23,7 @@ void drm_gem_ttm_print_info(struct drm_printer *p, unsigned int indent, const struct drm_gem_object *gem) { - static const char const *plname[] = { + static const char * const plname[] = { [ TTM_PL_SYSTEM ] = "system", [ TTM_PL_TT ] = "tt", [ TTM_PL_VRAM ] = "vram", @@ -40,7 +40,7 @@ void drm_gem_ttm_print_info(struct drm_printer *p, unsigned int indent, const struct ttm_buffer_object *bo = drm_gem_ttm_of_gem(gem); drm_printf_indent(p, indent, "placement="); - drm_print_bits(p, bo->mem.placement, plname, 0, ARRAY_SIZE(plname)); + drm_print_bits(p, bo->mem.placement, plname, ARRAY_SIZE(plname)); drm_printf(p, "\n"); if (bo->mem.bus.is_iomem) { diff --git a/drivers/gpu/drm/drm_print.c b/drivers/gpu/drm/drm_print.c index dfa27367ebb8..52cc7b38eb12 100644 --- a/drivers/gpu/drm/drm_print.c +++ b/drivers/gpu/drm/drm_print.c @@ -189,28 +189,26 @@ EXPORT_SYMBOL(drm_printf); * drm_print_bits - print bits to a &drm_printer stream * * Print bits (in flag fields for example) in human readable form. - * The first name in the @bits array is for the bit indexed by @from. * * @p: the &drm_printer * @value: field value. * @bits: Array with bit names. - * @from: start of bit range to print (inclusive). - * @to: end of bit range to print (exclusive). + * @nbits: Size of bit names array. */ -void drm_print_bits(struct drm_printer *p, - unsigned long value, const char *bits[], - unsigned int from, unsigned int to) +void drm_print_bits(struct drm_printer *p, unsigned long value, + const char * const bits[], unsigned int nbits) { bool first = true; unsigned int i; - for (i = from; i < to; i++) { - if (!(value & (1 << i))) - continue; - if (WARN_ON_ONCE(!bits[i-from])) + if (WARN_ON_ONCE(nbits > BITS_PER_TYPE(value))) + nbits = BITS_PER_TYPE(value); + + for_each_set_bit(i, &value, nbits) { + if (WARN_ON_ONCE(!bits[i])) continue; drm_printf(p, "%s%s", first ? "" : ",", - bits[i-from]); + bits[i]); first = false; } if (first) -- 2.18.1

2 1

[PATCH v2 00/11] drm: rework mmap() workflow
by Gerd Hoffmann 23 Sep '19

23 Sep '19

Add mmap callback to struct drm_gem_object_funcs, which is supposed to handle the vma setup. It will be used by both normal fops->mmap (via drm_gem_mmap_obj()) and prime mmap (via drm_gem_prime_mmap()). For starters the shmem and vram helpers are switched over to the new workflow, to show things in action for review. Gerd Hoffmann (11): drm: add mmap() to drm_gem_object_funcs drm/shmem: switch shmem helper to &drm_gem_object_funcs.mmap drm/shmem: drop VM_DONTDUMP drm/shmem: drop VM_IO drm/shmem: drop DEFINE_DRM_GEM_SHMEM_FOPS drm/ttm: factor out ttm_bo_mmap_vma_setup drm/ttm: drop VM_DONTDUMP drm/ttm: add drm_gem_ttm_mmap() drm/vram: switch vram helper to &drm_gem_object_funcs.mmap() drm/vram: drop verify_access drm/vram: drop DRM_VRAM_MM_FILE_OPERATIONS include/drm/drm_gem.h | 14 +++++ include/drm/drm_gem_shmem_helper.h | 30 +--------- include/drm/drm_gem_ttm_helper.h | 2 + include/drm/drm_gem_vram_helper.h | 25 --------- include/drm/ttm/ttm_bo_api.h | 8 +++ drivers/gpu/drm/ast/ast_drv.c | 5 +- drivers/gpu/drm/bochs/bochs_drv.c | 5 +- drivers/gpu/drm/cirrus/cirrus.c | 2 +- drivers/gpu/drm/drm_gem.c | 27 ++++++--- drivers/gpu/drm/drm_gem_shmem_helper.c | 28 ++++------ drivers/gpu/drm/drm_gem_ttm_helper.c | 19 +++++++ drivers/gpu/drm/drm_gem_vram_helper.c | 56 +------------------ drivers/gpu/drm/drm_prime.c | 9 +++ .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 5 +- drivers/gpu/drm/mgag200/mgag200_drv.c | 5 +- drivers/gpu/drm/panfrost/panfrost_drv.c | 2 +- drivers/gpu/drm/panfrost/panfrost_gem.c | 2 +- drivers/gpu/drm/tiny/gm12u320.c | 2 +- drivers/gpu/drm/ttm/ttm_bo_vm.c | 47 ++++++++-------- drivers/gpu/drm/v3d/v3d_bo.c | 2 +- drivers/gpu/drm/v3d/v3d_drv.c | 2 +- drivers/gpu/drm/vboxvideo/vbox_drv.c | 5 +- drivers/gpu/drm/virtio/virtgpu_drv.c | 2 +- drivers/gpu/drm/virtio/virtgpu_object.c | 2 +- 24 files changed, 120 insertions(+), 186 deletions(-) -- 2.18.1

3 16

[PATCH 1/3] drm/panel: simple: Add Logic PD Type 28 display support
by Adam Ford 23 Sep '19

23 Sep '19

Previously, there was an omap panel-dpi driver that would read generic timings from the device tree and set the display timing accordingly. This driver was removed so the screen no longer functions. This patch modifies the panel-simple file to setup the timings to the same values previously used. Fixes: 8bf4b1621178 ("drm/omap: Remove panel-dpi driver") Signed-off-by: Adam Ford <aford173(a)gmail.com> diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c index 5a93c4edf1e4..c86c30f3a8a1 100644 --- a/drivers/gpu/drm/panel/panel-simple.c +++ b/drivers/gpu/drm/panel/panel-simple.c @@ -1900,6 +1900,40 @@ static const struct drm_display_mode mitsubishi_aa070mc01_mode = { .flags = DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC, }; +static const struct drm_display_mode logicpd_type_28_mode = { + .clock = 9000, + .hdisplay = 480, + .hsync_start = 480 + 3, + .hsync_end = 480 + 3 + 42, + .htotal = 480 + 3 + 42 + 2, + + .vdisplay = 272, + .vsync_start = 272 + 2, + .vsync_end = 272 + 2 + 11, + .vtotal = 272 + 2 + 11 + 3, + .vrefresh = 60, + .flags = DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC, +}; + +static const struct panel_desc logicpd_type_28 = { + .modes = &logicpd_type_28_mode, + .num_modes = 1, + .bpc = 8, + .size = { + .width = 105, + .height = 67, + }, + .delay = { + .prepare = 200, + .enable = 200, + .unprepare = 200, + .disable = 200, + }, + .bus_format = MEDIA_BUS_FMT_RGB888_1X24, + .bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE | + DRM_BUS_FLAG_SYNC_DRIVE_NEGEDGE, +}; + static const struct panel_desc mitsubishi_aa070mc01 = { .modes = &mitsubishi_aa070mc01_mode, .num_modes = 1, @@ -2948,6 +2982,9 @@ static const struct of_device_id platform_of_match[] = { }, { .compatible = "lg,lp129qe", .data = &lg_lp129qe, + }, { + .compatible = "logicpd,type28", + .data = &logicpd_type_28, }, { .compatible = "mitsubishi,aa070mc01-ca1", .data = &mitsubishi_aa070mc01, -- 2.17.1

2 7

[PATCH] drm/amdgpu: release allocated memory
by Navid Emamdoost 23 Sep '19

23 Sep '19

In amdgpu_vmid_grab_idle, fences is being leaked in one execution path. The missing kfree was added. Signed-off-by: Navid Emamdoost <navid.emamdoost(a)gmail.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c index 57b3d8a9bef3..9063cd36fa94 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c @@ -244,6 +244,7 @@ static int amdgpu_vmid_grab_idle(struct amdgpu_vm *vm, r = amdgpu_sync_fence(adev, sync, &array->base, false); dma_fence_put(ring->vmid_wait); ring->vmid_wait = &array->base; + kfree(fences); return r; } kfree(fences); -- 2.17.1

3 3

[PATCH 36/36] drm/omapdrm: use bpp instead of cpp for drm_format_info
by Sandy Huang 23 Sep '19

23 Sep '19

cpp[BytePerPlane] can't describe the 10bit data format correctly, So we use bpp[BitPerPlane] to instead cpp. Signed-off-by: Sandy Huang <hjc(a)rock-chips.com> --- drivers/gpu/drm/omapdrm/omap_fb.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/omap_fb.c b/drivers/gpu/drm/omapdrm/omap_fb.c index 1b8b510..d18aafa 100644 --- a/drivers/gpu/drm/omapdrm/omap_fb.c +++ b/drivers/gpu/drm/omapdrm/omap_fb.c @@ -87,7 +87,7 @@ static u32 get_linear_addr(struct drm_framebuffer *fb, u32 offset; offset = fb->offsets[n] - + (x * format->cpp[n] / (n == 0 ? 1 : format->hsub)) + + (x * format->bpp[n] / 8 / (n == 0 ? 1 : format->hsub)) + (y * fb->pitches[n] / (n == 0 ? 1 : format->vsub)); return plane->dma_addr + offset; @@ -206,7 +206,7 @@ void omap_framebuffer_update_scanout(struct drm_framebuffer *fb, } /* convert to pixels: */ - info->screen_width /= format->cpp[0]; + info->screen_width /= format->bpp[0] / 8; if (fb->format->format == DRM_FORMAT_NV12) { plane = &omap_fb->planes[1]; @@ -382,10 +382,10 @@ struct drm_framebuffer *omap_framebuffer_init(struct drm_device *dev, goto fail; } - if (pitch % format->cpp[0]) { + if (pitch % (format->bpp[0] / 8)) { dev_dbg(dev->dev, "buffer pitch (%u bytes) is not a multiple of pixel size (%u bytes)\n", - pitch, format->cpp[0]); + pitch, format->bpp[0] / 8); ret = -EINVAL; goto fail; } -- 2.7.4

1 0

[PATCH 31/36] drm/stm: use bpp instead of cpp for drm_format_info
by Sandy Huang 23 Sep '19

23 Sep '19

1 4

[PATCH 16/36] drm/tilcdc: use bpp instead of cpp for drm_format_info
by Sandy Huang 23 Sep '19

23 Sep '19

cpp[BytePerPlane] can't describe the 10bit data format correctly, So we use bpp[BitPerPlane] to instead cpp. Signed-off-by: Sandy Huang <hjc(a)rock-chips.com> --- drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 2 +- drivers/gpu/drm/tilcdc/tilcdc_plane.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c index e9dd5e5..78c587d 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c @@ -71,7 +71,7 @@ static void set_scanout(struct drm_crtc *crtc, struct drm_framebuffer *fb) start = gem->paddr + fb->offsets[0] + crtc->y * fb->pitches[0] + - crtc->x * fb->format->cpp[0]; + crtc->x * fb->format->bpp[0] / 8; end = start + (crtc->mode.vdisplay * fb->pitches[0]); diff --git a/drivers/gpu/drm/tilcdc/tilcdc_plane.c b/drivers/gpu/drm/tilcdc/tilcdc_plane.c index 3abb964..fca7375 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_plane.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_plane.c @@ -55,7 +55,7 @@ static int tilcdc_plane_atomic_check(struct drm_plane *plane, } pitch = crtc_state->mode.hdisplay * - state->fb->format->cpp[0]; + state->fb->format->bpp[0] / 8; if (state->fb->pitches[0] != pitch) { dev_err(plane->dev->dev, "Invalid pitch: fb and crtc widths must be the same"); -- 2.7.4

1 4

[PATCH 05/36] drm/sun4i: use bpp instead of cpp for drm_format_info
by Sandy Huang 23 Sep '19

23 Sep '19

cpp[BytePerPlane] can't describe the 10bit data format correctly, So we use bpp[BitPerPlane] to instead cpp. Signed-off-by: Sandy Huang <hjc(a)rock-chips.com> --- drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 2 +- drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/sun4i/sun8i_ui_layer.c b/drivers/gpu/drm/sun4i/sun8i_ui_layer.c index c87fd84..147e251 100644 --- a/drivers/gpu/drm/sun4i/sun8i_ui_layer.c +++ b/drivers/gpu/drm/sun4i/sun8i_ui_layer.c @@ -211,7 +211,7 @@ static int sun8i_ui_layer_update_buffer(struct sun8i_mixer *mixer, int channel, DRM_DEBUG_DRIVER("Using GEM @ %pad\n", &gem->paddr); /* Compute the start of the displayed memory */ - bpp = fb->format->cpp[0]; + bpp = fb->format->bpp[0] / 8; paddr = gem->paddr + fb->offsets[0]; /* Fixup framebuffer address for src coordinates */ diff --git a/drivers/gpu/drm/sun4i/sun8i_vi_layer.c b/drivers/gpu/drm/sun4i/sun8i_vi_layer.c index 42d445d..dd777aa 100644 --- a/drivers/gpu/drm/sun4i/sun8i_vi_layer.c +++ b/drivers/gpu/drm/sun4i/sun8i_vi_layer.c @@ -295,7 +295,7 @@ static int sun8i_vi_layer_update_buffer(struct sun8i_mixer *mixer, int channel, } /* Fixup framebuffer address for src coordinates */ - paddr += dx * format->cpp[i]; + paddr += dx * format->bpp[i] / 8; paddr += dy * fb->pitches[i]; /* Set the line width */ -- 2.7.4

1 0

[RFC PATCH V2 0/6] mdev based hardware virtio offloading support
by Jason Wang 23 Sep '19

23 Sep '19

Hi all: There are hardware that can do virtio datapath offloading while having its own control path. This path tries to implement a mdev based unified API to support using kernel virtio driver to drive those devices. This is done by introducing a new mdev transport for virtio (virtio_mdev) and register itself as a new kind of mdev driver. Then it provides a unified way for kernel virtio driver to talk with mdev device implementation. Though the series only contain kernel driver support, the goal is to make the transport generic enough to support userspace drivers. This means vhost-mdev[1] could be built on top as well by resuing the transport. A sample driver is also implemented which simulate a virito-net loopback ethernet device on top of vringh + workqueue. This could be used as a reference implementation for real hardware driver. Consider mdev framework only support VFIO device and driver right now, this series also extend it to support other types. This is done through introducing class id to the device and pairing it with id_talbe claimed by the driver. On top, this seris also decouple device specific parents ops out of the common ones. Pktgen test was done with virito-net + mvnet loop back device. Please review. Changes from V1: - rename device id to class id - add docs for class id and device specific ops (device_ops) - split device_ops into seperate headers - drop the mdev_set_dma_ops() - use device_ops to implement the transport API, then it's not a part of UAPI any more - use GFP_ATOMIC in mvnet sample device and other tweaks - set_vring_base/get_vring_base support for mvnet device Jason Wang (6): mdev: class id support mdev: introduce device specific ops mdev: introduce virtio device and its device ops virtio: introudce a mdev based transport vringh: fix copy direction of vringh_iov_push_kern() docs: Sample driver to demonstrate how to implement virtio-mdev framework .../driver-api/vfio-mediated-device.rst | 11 +- drivers/gpu/drm/i915/gvt/kvmgt.c | 17 +- drivers/s390/cio/vfio_ccw_ops.c | 17 +- drivers/s390/crypto/vfio_ap_ops.c | 14 +- drivers/vfio/mdev/Kconfig | 7 + drivers/vfio/mdev/Makefile | 1 + drivers/vfio/mdev/mdev_core.c | 21 +- drivers/vfio/mdev/mdev_driver.c | 14 + drivers/vfio/mdev/mdev_private.h | 1 + drivers/vfio/mdev/vfio_mdev.c | 37 +- drivers/vfio/mdev/virtio_mdev.c | 418 +++++++++++ drivers/vhost/vringh.c | 8 +- include/linux/mdev.h | 46 +- include/linux/mod_devicetable.h | 8 + include/linux/vfio_mdev.h | 50 ++ include/linux/virtio_mdev.h | 141 ++++ samples/Kconfig | 7 + samples/vfio-mdev/Makefile | 1 + samples/vfio-mdev/mbochs.c | 19 +- samples/vfio-mdev/mdpy.c | 19 +- samples/vfio-mdev/mtty.c | 17 +- samples/vfio-mdev/mvnet.c | 688 ++++++++++++++++++ 22 files changed, 1473 insertions(+), 89 deletions(-) create mode 100644 drivers/vfio/mdev/virtio_mdev.c create mode 100644 include/linux/vfio_mdev.h create mode 100644 include/linux/virtio_mdev.h create mode 100644 samples/vfio-mdev/mvnet.c -- 2.19.1

2 8

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel September 2019