Merge tag 'drm-misc-fixes-2024-11-08' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-fixes
Short summary of fixes pull: imagination: - Track PVR context per file - Break ref-counting cycle panel-orientation-quirks: - Fix matching Lenovo Yoga Tab 3 X90F panthor: - Lock VM array - Be strict about I/O mapping flags Signed-off-by: Dave Airlie <airlied@redhat.com> From: Thomas Zimmermann <tzimmermann@suse.de> Link: https://patchwork.freedesktop.org/patch/msgid/20241108085058.GA37468@linux.fritz.box
This commit is contained in:
@@ -403,7 +403,6 @@ static const struct dmi_system_id orientation_data[] = {
|
||||
}, { /* Lenovo Yoga Tab 3 X90F */
|
||||
.matches = {
|
||||
DMI_MATCH(DMI_SYS_VENDOR, "Intel Corporation"),
|
||||
DMI_MATCH(DMI_PRODUCT_NAME, "CHERRYVIEW D1 PLATFORM"),
|
||||
DMI_MATCH(DMI_PRODUCT_VERSION, "Blade3-10A-001"),
|
||||
},
|
||||
.driver_data = (void *)&lcd1600x2560_rightside_up,
|
||||
|
||||
@@ -17,10 +17,14 @@
|
||||
|
||||
#include <drm/drm_auth.h>
|
||||
#include <drm/drm_managed.h>
|
||||
|
||||
#include <linux/bug.h>
|
||||
#include <linux/errno.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/list.h>
|
||||
#include <linux/sched.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/spinlock.h>
|
||||
#include <linux/string.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/xarray.h>
|
||||
@@ -354,6 +358,10 @@ int pvr_context_create(struct pvr_file *pvr_file, struct drm_pvr_ioctl_create_co
|
||||
return err;
|
||||
}
|
||||
|
||||
spin_lock(&pvr_dev->ctx_list_lock);
|
||||
list_add_tail(&ctx->file_link, &pvr_file->contexts);
|
||||
spin_unlock(&pvr_dev->ctx_list_lock);
|
||||
|
||||
return 0;
|
||||
|
||||
err_destroy_fw_obj:
|
||||
@@ -380,6 +388,11 @@ pvr_context_release(struct kref *ref_count)
|
||||
container_of(ref_count, struct pvr_context, ref_count);
|
||||
struct pvr_device *pvr_dev = ctx->pvr_dev;
|
||||
|
||||
WARN_ON(in_interrupt());
|
||||
spin_lock(&pvr_dev->ctx_list_lock);
|
||||
list_del(&ctx->file_link);
|
||||
spin_unlock(&pvr_dev->ctx_list_lock);
|
||||
|
||||
xa_erase(&pvr_dev->ctx_ids, ctx->ctx_id);
|
||||
pvr_context_destroy_queues(ctx);
|
||||
pvr_fw_object_destroy(ctx->fw_obj);
|
||||
@@ -437,11 +450,30 @@ pvr_context_destroy(struct pvr_file *pvr_file, u32 handle)
|
||||
*/
|
||||
void pvr_destroy_contexts_for_file(struct pvr_file *pvr_file)
|
||||
{
|
||||
struct pvr_device *pvr_dev = pvr_file->pvr_dev;
|
||||
struct pvr_context *ctx;
|
||||
unsigned long handle;
|
||||
|
||||
xa_for_each(&pvr_file->ctx_handles, handle, ctx)
|
||||
pvr_context_destroy(pvr_file, handle);
|
||||
|
||||
spin_lock(&pvr_dev->ctx_list_lock);
|
||||
ctx = list_first_entry(&pvr_file->contexts, struct pvr_context, file_link);
|
||||
|
||||
while (!list_entry_is_head(ctx, &pvr_file->contexts, file_link)) {
|
||||
list_del_init(&ctx->file_link);
|
||||
|
||||
if (pvr_context_get_if_referenced(ctx)) {
|
||||
spin_unlock(&pvr_dev->ctx_list_lock);
|
||||
|
||||
pvr_vm_unmap_all(ctx->vm_ctx);
|
||||
|
||||
pvr_context_put(ctx);
|
||||
spin_lock(&pvr_dev->ctx_list_lock);
|
||||
}
|
||||
ctx = list_first_entry(&pvr_file->contexts, struct pvr_context, file_link);
|
||||
}
|
||||
spin_unlock(&pvr_dev->ctx_list_lock);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -451,6 +483,7 @@ void pvr_destroy_contexts_for_file(struct pvr_file *pvr_file)
|
||||
void pvr_context_device_init(struct pvr_device *pvr_dev)
|
||||
{
|
||||
xa_init_flags(&pvr_dev->ctx_ids, XA_FLAGS_ALLOC1);
|
||||
spin_lock_init(&pvr_dev->ctx_list_lock);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -85,6 +85,9 @@ struct pvr_context {
|
||||
/** @compute: Transfer queue. */
|
||||
struct pvr_queue *transfer;
|
||||
} queues;
|
||||
|
||||
/** @file_link: pvr_file PVR context list link. */
|
||||
struct list_head file_link;
|
||||
};
|
||||
|
||||
static __always_inline struct pvr_queue *
|
||||
@@ -123,6 +126,24 @@ pvr_context_get(struct pvr_context *ctx)
|
||||
return ctx;
|
||||
}
|
||||
|
||||
/**
|
||||
* pvr_context_get_if_referenced() - Take an additional reference on a still
|
||||
* referenced context.
|
||||
* @ctx: Context pointer.
|
||||
*
|
||||
* Call pvr_context_put() to release.
|
||||
*
|
||||
* Returns:
|
||||
* * True on success, or
|
||||
* * false if no context pointer passed, or the context wasn't still
|
||||
* * referenced.
|
||||
*/
|
||||
static __always_inline bool
|
||||
pvr_context_get_if_referenced(struct pvr_context *ctx)
|
||||
{
|
||||
return ctx != NULL && kref_get_unless_zero(&ctx->ref_count) != 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* pvr_context_lookup() - Lookup context pointer from handle and file.
|
||||
* @pvr_file: Pointer to pvr_file structure.
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/math.h>
|
||||
#include <linux/mutex.h>
|
||||
#include <linux/spinlock_types.h>
|
||||
#include <linux/timer.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/wait.h>
|
||||
@@ -293,6 +294,12 @@ struct pvr_device {
|
||||
|
||||
/** @sched_wq: Workqueue for schedulers. */
|
||||
struct workqueue_struct *sched_wq;
|
||||
|
||||
/**
|
||||
* @ctx_list_lock: Lock to be held when accessing the context list in
|
||||
* struct pvr_file.
|
||||
*/
|
||||
spinlock_t ctx_list_lock;
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -344,6 +351,9 @@ struct pvr_file {
|
||||
* This array is used to allocate handles returned to userspace.
|
||||
*/
|
||||
struct xarray vm_ctx_handles;
|
||||
|
||||
/** @contexts: PVR context list. */
|
||||
struct list_head contexts;
|
||||
};
|
||||
|
||||
/**
|
||||
|
||||
@@ -28,6 +28,7 @@
|
||||
#include <linux/export.h>
|
||||
#include <linux/fs.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/list.h>
|
||||
#include <linux/mod_devicetable.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/moduleparam.h>
|
||||
@@ -1326,6 +1327,8 @@ pvr_drm_driver_open(struct drm_device *drm_dev, struct drm_file *file)
|
||||
*/
|
||||
pvr_file->pvr_dev = pvr_dev;
|
||||
|
||||
INIT_LIST_HEAD(&pvr_file->contexts);
|
||||
|
||||
xa_init_flags(&pvr_file->ctx_handles, XA_FLAGS_ALLOC1);
|
||||
xa_init_flags(&pvr_file->free_list_handles, XA_FLAGS_ALLOC1);
|
||||
xa_init_flags(&pvr_file->hwrt_handles, XA_FLAGS_ALLOC1);
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
#include <drm/drm_gem.h>
|
||||
#include <drm/drm_gpuvm.h>
|
||||
|
||||
#include <linux/bug.h>
|
||||
#include <linux/container_of.h>
|
||||
#include <linux/err.h>
|
||||
#include <linux/errno.h>
|
||||
@@ -597,12 +598,26 @@ err_free:
|
||||
}
|
||||
|
||||
/**
|
||||
* pvr_vm_context_release() - Teardown a VM context.
|
||||
* @ref_count: Pointer to reference counter of the VM context.
|
||||
* pvr_vm_unmap_all() - Unmap all mappings associated with a VM context.
|
||||
* @vm_ctx: Target VM context.
|
||||
*
|
||||
* This function ensures that no mappings are left dangling by unmapping them
|
||||
* all in order of ascending device-virtual address.
|
||||
*/
|
||||
void
|
||||
pvr_vm_unmap_all(struct pvr_vm_context *vm_ctx)
|
||||
{
|
||||
WARN_ON(pvr_vm_unmap(vm_ctx, vm_ctx->gpuvm_mgr.mm_start,
|
||||
vm_ctx->gpuvm_mgr.mm_range));
|
||||
}
|
||||
|
||||
/**
|
||||
* pvr_vm_context_release() - Teardown a VM context.
|
||||
* @ref_count: Pointer to reference counter of the VM context.
|
||||
*
|
||||
* This function also ensures that no mappings are left dangling by calling
|
||||
* pvr_vm_unmap_all.
|
||||
*/
|
||||
static void
|
||||
pvr_vm_context_release(struct kref *ref_count)
|
||||
{
|
||||
@@ -612,8 +627,7 @@ pvr_vm_context_release(struct kref *ref_count)
|
||||
if (vm_ctx->fw_mem_ctx_obj)
|
||||
pvr_fw_object_destroy(vm_ctx->fw_mem_ctx_obj);
|
||||
|
||||
WARN_ON(pvr_vm_unmap(vm_ctx, vm_ctx->gpuvm_mgr.mm_start,
|
||||
vm_ctx->gpuvm_mgr.mm_range));
|
||||
pvr_vm_unmap_all(vm_ctx);
|
||||
|
||||
pvr_mmu_context_destroy(vm_ctx->mmu_ctx);
|
||||
drm_gem_private_object_fini(&vm_ctx->dummy_gem);
|
||||
|
||||
@@ -39,6 +39,7 @@ int pvr_vm_map(struct pvr_vm_context *vm_ctx,
|
||||
struct pvr_gem_object *pvr_obj, u64 pvr_obj_offset,
|
||||
u64 device_addr, u64 size);
|
||||
int pvr_vm_unmap(struct pvr_vm_context *vm_ctx, u64 device_addr, u64 size);
|
||||
void pvr_vm_unmap_all(struct pvr_vm_context *vm_ctx);
|
||||
|
||||
dma_addr_t pvr_vm_get_page_table_root_addr(struct pvr_vm_context *vm_ctx);
|
||||
struct dma_resv *pvr_vm_get_dma_resv(struct pvr_vm_context *vm_ctx);
|
||||
|
||||
@@ -390,11 +390,15 @@ int panthor_device_mmap_io(struct panthor_device *ptdev, struct vm_area_struct *
|
||||
{
|
||||
u64 offset = (u64)vma->vm_pgoff << PAGE_SHIFT;
|
||||
|
||||
if ((vma->vm_flags & VM_SHARED) == 0)
|
||||
return -EINVAL;
|
||||
|
||||
switch (offset) {
|
||||
case DRM_PANTHOR_USER_FLUSH_ID_MMIO_OFFSET:
|
||||
if (vma->vm_end - vma->vm_start != PAGE_SIZE ||
|
||||
(vma->vm_flags & (VM_WRITE | VM_EXEC)))
|
||||
return -EINVAL;
|
||||
vm_flags_clear(vma, VM_MAYWRITE);
|
||||
|
||||
break;
|
||||
|
||||
|
||||
@@ -1580,7 +1580,9 @@ panthor_vm_pool_get_vm(struct panthor_vm_pool *pool, u32 handle)
|
||||
{
|
||||
struct panthor_vm *vm;
|
||||
|
||||
xa_lock(&pool->xa);
|
||||
vm = panthor_vm_get(xa_load(&pool->xa, handle));
|
||||
xa_unlock(&pool->xa);
|
||||
|
||||
return vm;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user