diff options
| author | Maxime Ripard <maxime@cerno.tech> | 2020-03-17 11:29:11 +0300 |
|---|---|---|
| committer | Maxime Ripard <maxime@cerno.tech> | 2020-03-17 11:29:11 +0300 |
| commit | 51b8479ab20ba3804348824c63abdb3f35b0aaeb (patch) | |
| tree | f3ecae09fc31773c9da185de167bf2034f1aaa2e /include/drm | |
| parent | 6afe6929964bca6847986d0507a555a041f07753 (diff) | |
| parent | 69ddce0970d9d1de63bed9c24eefa0814db29a5a (diff) | |
| download | linux-51b8479ab20ba3804348824c63abdb3f35b0aaeb.tar.xz | |
Merge drm/drm-next into drm-misc-next
Jernej needs some patches that got merged in -rc5.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/drm_gem_shmem_helper.h | 5 | ||||
| -rw-r--r-- | include/drm/gpu_scheduler.h | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/include/drm/drm_gem_shmem_helper.h b/include/drm/drm_gem_shmem_helper.h index e34a7b7f848a..294b2931c4cc 100644 --- a/include/drm/drm_gem_shmem_helper.h +++ b/include/drm/drm_gem_shmem_helper.h @@ -96,6 +96,11 @@ struct drm_gem_shmem_object { * The address are un-mapped when the count reaches zero. */ unsigned int vmap_use_count; + + /** + * @map_cached: map object cached (instead of using writecombine). + */ + bool map_cached; }; #define to_drm_gem_shmem_obj(obj) \ diff --git a/include/drm/gpu_scheduler.h b/include/drm/gpu_scheduler.h index 589be851f8a1..d8972836d248 100644 --- a/include/drm/gpu_scheduler.h +++ b/include/drm/gpu_scheduler.h @@ -297,6 +297,10 @@ void drm_sched_fini(struct drm_gpu_scheduler *sched); int drm_sched_job_init(struct drm_sched_job *job, struct drm_sched_entity *entity, void *owner); +void drm_sched_entity_modify_sched(struct drm_sched_entity *entity, + struct drm_gpu_scheduler **sched_list, + unsigned int num_sched_list); + void drm_sched_job_cleanup(struct drm_sched_job *job); void drm_sched_wakeup(struct drm_gpu_scheduler *sched); void drm_sched_stop(struct drm_gpu_scheduler *sched, struct drm_sched_job *bad); |