mirror of
https://github.com/torvalds/linux.git
synced 2024-12-19 17:41:29 +00:00
0bec6219e5
UAPI Changes: - Add Colorspace connector property (Uma) - fourcc: Several new YUV formats from ARM (Brian & Ayan) - fourcc: Fix merge conflicts between new formats above and Swati's that went in via topic/hdr-formats-2019-03-07 branch (Maarten) Cross-subsystem Changes: - Typed component support via topic/component-typed-2019-02-11 (Maxime/Daniel) Core Changes: - Improve component helper documentation (Daniel) - Avoid calling drm_dev_unregister() twice on unplugged devices (Noralf) - Add device managed (devm) drm_device init function (Noralf) - Graduate TINYDRM_MODE to DRM_SIMPLE_MODE in core (Noralf) - Move MIPI/DSI rate control params computation into core from i915 (David) - Add support for shmem backed gem objects (Noralf) Driver Changes: - various: Use of_node_name_eq for node name comparisons (Rob Herring) - sun4i: Add DSI burst mode support (Konstantin) - panel: Add Ronbo RB070D30 MIPI/DSI panel support (Konstantin) - virtio: A few prime improvements (Gerd) - tinydrm: Remove tinydrm_device (Noralf) - vc4: Add load tracker to driver to detect underflow in atomic check (Boris) - vboxvideo: Move it out of staging \o/ (Hans) - v3d: Add support for V3D v4.2 (Eric) Cc: Konstantin Sudakov <k.sudakov@integrasources.com> Cc: Rob Herring <robh@kernel.org> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Maxime Ripard <maxime.ripard@bootlin.com> Cc: Uma Shankar <uma.shankar@intel.com> Cc: Noralf Trønnes <noralf@tronnes.org> Cc: Gerd Hoffmann <kraxel@redhat.com> Cc: David Francis <David.Francis@amd.com> Cc: Boris Brezillon <boris.brezillon@bootlin.com> Cc: Eric Anholt <eric@anholt.net> Cc: Hans de Goede <hdegoede@redhat.com> Cc: Brian Starkey <brian.starkey@arm.com> Cc: Ayan Kumar Halder <ayan.halder@arm.com> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEfxcpfMSgdnQMs+QqlvcN/ahKBwoFAlyTxEYACgkQlvcN/ahK Bwpfhgf9HTwlxHKPwRL70o5Ilp7JVjeLjM5IgDgz+o7F+UZn2OdWocmSDAbJ+lwe V+LXImc5tykGNRzgn4lXljGv3jqxOgVOxEBo53hVjXeYE/jIdbGDF1cx+1tSke67 lbO61dD9RM5GG9eLuzZ9S72qv5mfBYKHJZuULqOei/Ohnubkg0kDQ3zQEFDah1mh kqHJkd+x1PwcwBnAjbWdIaCMiwrVmxj7yXLQS8bJzSFKc0/r7HlG8qNWmiBllH0D aRMO2phHkXCVZY+GWWCEOZwz7ve23sibYm9tzBS69nbWJL12CAomB/8LrRPM2K5v tVBNrX0eNHMKtOa0En0oF37BXUXizQ== =DVKQ -----END PGP SIGNATURE----- Merge tag 'drm-misc-next-2019-03-21' of git://anongit.freedesktop.org/drm/drm-misc into drm-next drm-misc-next for 5.2: UAPI Changes: - Add Colorspace connector property (Uma) - fourcc: Several new YUV formats from ARM (Brian & Ayan) - fourcc: Fix merge conflicts between new formats above and Swati's that went in via topic/hdr-formats-2019-03-07 branch (Maarten) Cross-subsystem Changes: - Typed component support via topic/component-typed-2019-02-11 (Maxime/Daniel) Core Changes: - Improve component helper documentation (Daniel) - Avoid calling drm_dev_unregister() twice on unplugged devices (Noralf) - Add device managed (devm) drm_device init function (Noralf) - Graduate TINYDRM_MODE to DRM_SIMPLE_MODE in core (Noralf) - Move MIPI/DSI rate control params computation into core from i915 (David) - Add support for shmem backed gem objects (Noralf) Driver Changes: - various: Use of_node_name_eq for node name comparisons (Rob Herring) - sun4i: Add DSI burst mode support (Konstantin) - panel: Add Ronbo RB070D30 MIPI/DSI panel support (Konstantin) - virtio: A few prime improvements (Gerd) - tinydrm: Remove tinydrm_device (Noralf) - vc4: Add load tracker to driver to detect underflow in atomic check (Boris) - vboxvideo: Move it out of staging \o/ (Hans) - v3d: Add support for V3D v4.2 (Eric) Cc: Konstantin Sudakov <k.sudakov@integrasources.com> Cc: Rob Herring <robh@kernel.org> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Maxime Ripard <maxime.ripard@bootlin.com> Cc: Uma Shankar <uma.shankar@intel.com> Cc: Noralf Trønnes <noralf@tronnes.org> Cc: Gerd Hoffmann <kraxel@redhat.com> Cc: David Francis <David.Francis@amd.com> Cc: Boris Brezillon <boris.brezillon@bootlin.com> Cc: Eric Anholt <eric@anholt.net> Cc: Hans de Goede <hdegoede@redhat.com> Cc: Brian Starkey <brian.starkey@arm.com> Cc: Ayan Kumar Halder <ayan.halder@arm.com> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> From: Sean Paul <sean@poorly.run> Link: https://patchwork.freedesktop.org/patch/msgid/20190321170805.GA50145@art_vandelay
127 lines
3.3 KiB
C
127 lines
3.3 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/*
|
|
* Copyright (C) 2015-2018 Etnaviv Project
|
|
*/
|
|
|
|
#ifndef __ETNAVIV_GEM_H__
|
|
#define __ETNAVIV_GEM_H__
|
|
|
|
#include <linux/reservation.h>
|
|
#include "etnaviv_cmdbuf.h"
|
|
#include "etnaviv_drv.h"
|
|
|
|
struct dma_fence;
|
|
struct etnaviv_gem_ops;
|
|
struct etnaviv_gem_object;
|
|
|
|
struct etnaviv_gem_userptr {
|
|
uintptr_t ptr;
|
|
struct mm_struct *mm;
|
|
bool ro;
|
|
};
|
|
|
|
struct etnaviv_vram_mapping {
|
|
struct list_head obj_node;
|
|
struct list_head scan_node;
|
|
struct list_head mmu_node;
|
|
struct etnaviv_gem_object *object;
|
|
struct etnaviv_iommu *mmu;
|
|
struct drm_mm_node vram_node;
|
|
unsigned int use;
|
|
u32 iova;
|
|
};
|
|
|
|
struct etnaviv_gem_object {
|
|
struct drm_gem_object base;
|
|
const struct etnaviv_gem_ops *ops;
|
|
struct mutex lock;
|
|
|
|
u32 flags;
|
|
|
|
struct list_head gem_node;
|
|
struct etnaviv_gpu *gpu; /* non-null if active */
|
|
atomic_t gpu_active;
|
|
u32 access;
|
|
|
|
struct page **pages;
|
|
struct sg_table *sgt;
|
|
void *vaddr;
|
|
|
|
struct list_head vram_list;
|
|
|
|
/* cache maintenance */
|
|
u32 last_cpu_prep_op;
|
|
|
|
struct etnaviv_gem_userptr userptr;
|
|
};
|
|
|
|
static inline
|
|
struct etnaviv_gem_object *to_etnaviv_bo(struct drm_gem_object *obj)
|
|
{
|
|
return container_of(obj, struct etnaviv_gem_object, base);
|
|
}
|
|
|
|
struct etnaviv_gem_ops {
|
|
int (*get_pages)(struct etnaviv_gem_object *);
|
|
void (*release)(struct etnaviv_gem_object *);
|
|
void *(*vmap)(struct etnaviv_gem_object *);
|
|
int (*mmap)(struct etnaviv_gem_object *, struct vm_area_struct *);
|
|
};
|
|
|
|
static inline bool is_active(struct etnaviv_gem_object *etnaviv_obj)
|
|
{
|
|
return atomic_read(&etnaviv_obj->gpu_active) != 0;
|
|
}
|
|
|
|
#define MAX_CMDS 4
|
|
|
|
struct etnaviv_gem_submit_bo {
|
|
u32 flags;
|
|
struct etnaviv_gem_object *obj;
|
|
struct etnaviv_vram_mapping *mapping;
|
|
struct dma_fence *excl;
|
|
unsigned int nr_shared;
|
|
struct dma_fence **shared;
|
|
};
|
|
|
|
/* Created per submit-ioctl, to track bo's and cmdstream bufs, etc,
|
|
* associated with the cmdstream submission for synchronization (and
|
|
* make it easier to unwind when things go wrong, etc).
|
|
*/
|
|
struct etnaviv_gem_submit {
|
|
struct drm_sched_job sched_job;
|
|
struct kref refcount;
|
|
struct etnaviv_file_private *ctx;
|
|
struct etnaviv_gpu *gpu;
|
|
struct dma_fence *out_fence, *in_fence;
|
|
int out_fence_id;
|
|
struct list_head node; /* GPU active submit list */
|
|
struct etnaviv_cmdbuf cmdbuf;
|
|
bool runtime_resumed;
|
|
u32 exec_state;
|
|
u32 flags;
|
|
unsigned int nr_pmrs;
|
|
struct etnaviv_perfmon_request *pmrs;
|
|
unsigned int nr_bos;
|
|
struct etnaviv_gem_submit_bo bos[0];
|
|
/* No new members here, the previous one is variable-length! */
|
|
};
|
|
|
|
void etnaviv_submit_put(struct etnaviv_gem_submit * submit);
|
|
|
|
int etnaviv_gem_wait_bo(struct etnaviv_gpu *gpu, struct drm_gem_object *obj,
|
|
struct timespec *timeout);
|
|
int etnaviv_gem_new_private(struct drm_device *dev, size_t size, u32 flags,
|
|
struct reservation_object *robj, const struct etnaviv_gem_ops *ops,
|
|
struct etnaviv_gem_object **res);
|
|
void etnaviv_gem_obj_add(struct drm_device *dev, struct drm_gem_object *obj);
|
|
struct page **etnaviv_gem_get_pages(struct etnaviv_gem_object *obj);
|
|
void etnaviv_gem_put_pages(struct etnaviv_gem_object *obj);
|
|
|
|
struct etnaviv_vram_mapping *etnaviv_gem_mapping_get(
|
|
struct drm_gem_object *obj, struct etnaviv_gpu *gpu);
|
|
void etnaviv_gem_mapping_reference(struct etnaviv_vram_mapping *mapping);
|
|
void etnaviv_gem_mapping_unreference(struct etnaviv_vram_mapping *mapping);
|
|
|
|
#endif /* __ETNAVIV_GEM_H__ */
|