drm/msm: queued up patches for 3.13
Subsystems (4)
cover drm/msm: queued up patches for 3.13
Fyi, here are the queued up patches I have so far for 3.13.
Rob Clark (6):
drm/msm: prime support
drm/msm: support render nodes
drm/msm: resync generated headers drm/msm: add plane support
drm/msm: rework inactive-work
drm/msm: EBUSY status handling in msm_gem_fault()
drivers/gpu/drm/msm/Makefile | 1 + drivers/gpu/drm/msm/adreno/a2xx.xml.h | 42 ++++++- drivers/gpu/drm/msm/adreno/a3xx.xml.h | 46 +++++-- drivers/gpu/drm/msm/adreno/adreno_common.xml.h | 10 +- drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h | 10 +- drivers/gpu/drm/msm/dsi/dsi.xml.h | 6 +- drivers/gpu/drm/msm/dsi/mmss_cc.xml.h | 6 +- drivers/gpu/drm/msm/dsi/sfpb.xml.h | 6 +- drivers/gpu/drm/msm/hdmi/hdmi.xml.h | 6 +- drivers/gpu/drm/msm/hdmi/qfprom.xml.h | 6 +- drivers/gpu/drm/msm/mdp4/mdp4.xml.h | 126 +++++++++---------- drivers/gpu/drm/msm/mdp4/mdp4_crtc.c | 147 ++++++++++++++--------- drivers/gpu/drm/msm/mdp4/mdp4_format.c | 16 +++ drivers/gpu/drm/msm/mdp4/mdp4_kms.c | 17 +++ drivers/gpu/drm/msm/mdp4/mdp4_kms.h | 56 ++++++++- drivers/gpu/drm/msm/mdp4/mdp4_plane.c | 30 +++-- drivers/gpu/drm/msm/msm_drv.c | 60 ++++++++-- drivers/gpu/drm/msm/msm_drv.h | 37 +++++- drivers/gpu/drm/msm/msm_gem.c | 160 +++++++++++++++++++------ drivers/gpu/drm/msm/msm_gem.h | 3 - drivers/gpu/drm/msm/msm_gem_prime.c | 56 +++++++++ drivers/gpu/drm/msm/msm_gpu.c | 4 +- 22 files changed, 614 insertions(+), 237 deletions(-) create mode 100644 drivers/gpu/drm/msm/msm_gem_prime.c
Signature · 1 line
1.8.3.1
PATCH 1/6 drm/msm: prime support
--- drivers/gpu/drm/msm/Makefile | 1 + drivers/gpu/drm/msm/msm_drv.c | 15 ++++- drivers/gpu/drm/msm/msm_drv.h | 13 +++- drivers/gpu/drm/msm/msm_gem.c | 120 +++++++++++++++++++++++++++++------- drivers/gpu/drm/msm/msm_gem_prime.c | 56 +++++++++++++++++ 5 files changed, 179 insertions(+), 26 deletions(-) create mode 100644 drivers/gpu/drm/msm/msm_gem_prime.c
drivers/gpu/drm/msm/Makefile +1 -0
@@ -21,6 +21,7 @@ msm-y := \ msm_drv.o \ msm_fb.o \ msm_gem.o \ + msm_gem_prime.o \ msm_gem_submit.o \ msm_gpu.o \ msm_ringbuffer.o
drivers/gpu/drm/msm/msm_drv.c +14 -1
@@ -680,7 +680,10 @@ static const struct file_operations fops = { };static struct drm_driver msm_driver = { - .driver_features =DRIVER_HAVE_IRQ |DRIVER_GEM |DRIVER_MODESET , + .driver_features =DRIVER_HAVE_IRQ | +DRIVER_GEM | +DRIVER_PRIME | +DRIVER_MODESET , .load = msm_load, .unload = msm_unload, .open = msm_open,
@@ -698,6 +701,16 @@ static struct drm_driver msm_driver = { .dumb_create = msm_gem_dumb_create, .dumb_map_offset = msm_gem_dumb_map_offset, .dumb_destroy = drm_gem_dumb_destroy, + .prime_handle_to_fd = drm_gem_prime_handle_to_fd, + .prime_fd_to_handle = drm_gem_prime_fd_to_handle, + .gem_prime_export = drm_gem_prime_export, + .gem_prime_import = drm_gem_prime_import, + .gem_prime_pin = msm_gem_prime_pin, + .gem_prime_unpin = msm_gem_prime_unpin, + .gem_prime_get_sg_table = msm_gem_prime_get_sg_table, + .gem_prime_import_sg_table = msm_gem_prime_import_sg_table, + .gem_prime_vmap = msm_gem_prime_vmap, + .gem_prime_vunmap = msm_gem_prime_vunmap, #ifdef CONFIG_DEBUG_FS .debugfs_init = msm_debugfs_init, .debugfs_cleanup = msm_debugfs_cleanup,
drivers/gpu/drm/msm/msm_drv.h +11 -2
@@ -141,13 +141,20 @@ uint64_t msm_gem_mmap_offset(struct drm_gem_object *obj);int msm_gem_get_iova_locked (struct drm_gem_object *obj,int id,uint32_t *iova);int msm_gem_get_iova (struct drm_gem_object *obj,int id,uint32_t *iova); +struct page **msm_gem_get_pages (struct drm_gem_object *obj); +void msm_gem_put_pages (struct drm_gem_object *obj);void msm_gem_put_iova (struct drm_gem_object *obj,int id);int msm_gem_dumb_create (struct drm_file *file,struct drm_device *dev,struct drm_mode_create_dumb *args); -int msm_gem_dumb_destroy (struct drm_file *file,struct drm_device *dev, -uint32_t handle);int msm_gem_dumb_map_offset (struct drm_file *file,struct drm_device *dev,uint32_t handle,uint64_t *offset); +struct sg_table *msm_gem_prime_get_sg_table (struct drm_gem_object *obj); +void *msm_gem_prime_vmap (struct drm_gem_object *obj); +void msm_gem_prime_vunmap (struct drm_gem_object *obj,void *vaddr); +struct drm_gem_object *msm_gem_prime_import_sg_table (struct drm_device *dev, +size_t size,struct sg_table *sg); +int msm_gem_prime_pin (struct drm_gem_object *obj); +void msm_gem_prime_unpin (struct drm_gem_object *obj);void *msm_gem_vaddr_locked (struct drm_gem_object *obj);void *msm_gem_vaddr (struct drm_gem_object *obj); int msm_gem_queue_inactive_work(struct drm_gem_object *obj,
@@ -163,6 +170,8 @@ int msm_gem_new_handle(struct drm_device *dev, struct drm_file *file, uint32_t size, uint32_t flags, uint32_t *handle);struct drm_gem_object *msm_gem_new (struct drm_device *dev,uint32_t size,uint32_t flags); +struct drm_gem_object *msm_gem_import (struct drm_device *dev, +uint32_t size,struct sg_table *sgt);struct drm_gem_object *msm_framebuffer_bo (struct drm_framebuffer *fb,int plane);const struct msm_format *msm_framebuffer_format (struct drm_framebuffer *fb);
drivers/gpu/drm/msm/msm_gem.c +97 -23
163 lines not on this page · raw message
drivers/gpu/drm/msm/msm_gem_prime.c new file +56 -0
56 lines not on this page · raw message
Signature · 1 line
1.8.3.1
PATCH 2/6 drm/msm: support render nodes
In reply to Rob ClarkEnable support for drm render nodes for msm by flagging the ioctls that are safe and only needed for rendering.
--- drivers/gpu/drm/msm/msm_drv.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/gpu/drm/msm/msm_drv.c +8 -7
@@ -650,13 +650,13 @@ static int msm_ioctl_wait_fence(struct drm_device *dev, void *data, }static const struct drm_ioctl_desc msm_ioctls[] = { -DRM_IOCTL_DEF_DRV (MSM_GET_PARAM , msm_ioctl_get_param,DRM_UNLOCKED |DRM_AUTH ), -DRM_IOCTL_DEF_DRV (MSM_GEM_NEW , msm_ioctl_gem_new,DRM_UNLOCKED |DRM_AUTH ), -DRM_IOCTL_DEF_DRV (MSM_GEM_INFO , msm_ioctl_gem_info,DRM_UNLOCKED |DRM_AUTH ), -DRM_IOCTL_DEF_DRV (MSM_GEM_CPU_PREP , msm_ioctl_gem_cpu_prep,DRM_UNLOCKED |DRM_AUTH ), -DRM_IOCTL_DEF_DRV (MSM_GEM_CPU_FINI , msm_ioctl_gem_cpu_fini,DRM_UNLOCKED |DRM_AUTH ), -DRM_IOCTL_DEF_DRV (MSM_GEM_SUBMIT , msm_ioctl_gem_submit,DRM_UNLOCKED |DRM_AUTH ), -DRM_IOCTL_DEF_DRV (MSM_WAIT_FENCE , msm_ioctl_wait_fence,DRM_UNLOCKED |DRM_AUTH ), +DRM_IOCTL_DEF_DRV (MSM_GET_PARAM , msm_ioctl_get_param,DRM_UNLOCKED |DRM_AUTH |DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (MSM_GEM_NEW , msm_ioctl_gem_new,DRM_UNLOCKED |DRM_AUTH |DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (MSM_GEM_INFO , msm_ioctl_gem_info,DRM_UNLOCKED |DRM_AUTH |DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (MSM_GEM_CPU_PREP , msm_ioctl_gem_cpu_prep,DRM_UNLOCKED |DRM_AUTH |DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (MSM_GEM_CPU_FINI , msm_ioctl_gem_cpu_fini,DRM_UNLOCKED |DRM_AUTH |DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (MSM_GEM_SUBMIT , msm_ioctl_gem_submit,DRM_UNLOCKED |DRM_AUTH |DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (MSM_WAIT_FENCE , msm_ioctl_wait_fence,DRM_UNLOCKED |DRM_AUTH |DRM_RENDER_ALLOW ), };static const struct vm_operations_struct vm_ops = {
@@ -683,6 +683,7 @@ static struct drm_driver msm_driver = { .driver_features = DRIVER_HAVE_IRQ |DRIVER_GEM |DRIVER_PRIME | +DRIVER_RENDER | DRIVER_MODESET, .load = msm_load, .unload = msm_unload,
Signature · 1 line
1.8.3.1
PATCH 3/6 drm/msm: resync generated headers
In reply to Rob Clarkresync to latest envytools db, fixes a typo: s/mpd4/mdp4/
--- drivers/gpu/drm/msm/adreno/a2xx.xml.h | 42 ++++++++- drivers/gpu/drm/msm/adreno/a3xx.xml.h | 46 ++++++--- drivers/gpu/drm/msm/adreno/adreno_common.xml.h | 10 +- drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h | 10 +- drivers/gpu/drm/msm/dsi/dsi.xml.h | 6 +- drivers/gpu/drm/msm/dsi/mmss_cc.xml.h | 6 +- drivers/gpu/drm/msm/dsi/sfpb.xml.h | 6 +- drivers/gpu/drm/msm/hdmi/hdmi.xml.h | 6 +- drivers/gpu/drm/msm/hdmi/qfprom.xml.h | 6 +- drivers/gpu/drm/msm/mdp4/mdp4.xml.h | 126 ++++++++++++------------- drivers/gpu/drm/msm/mdp4/mdp4_kms.h | 10 +- drivers/gpu/drm/msm/mdp4/mdp4_plane.c | 10 +- 12 files changed, 169 insertions(+), 115 deletions(-)
drivers/gpu/drm/msm/adreno/a2xx.xml.h +37 -5
@@ -4,16 +4,16 @@/* Autogenerated file, DO NOT EDIT manually! This file was generated by the rules-ng-ng headergen tool in this git repository: -http://0x04.net/cgit/index.cgi/rules-ng-ng -git clone git://0x04.net/rules-ng-ng +http://github.com/freedreno/envytools/ +git clone https://github.com/freedreno/envytools.git The rules-ng-ng source files this header was generated from are: - /home/robclark/src/freedreno/envytools/rnndb/adreno.xml ( 327 bytes, from 2013-07-05 19:21:12) - /home/robclark/src/freedreno/envytools/rnndb/freedreno_copyright.xml ( 1453 bytes, from 2013-03-31 16:51:27) -- /home/robclark/src/freedreno/envytools/rnndb/a2xx/a2xx.xml ( 30005 bytes, from 2013-07-19 21:30:48) +- /home/robclark/src/freedreno/envytools/rnndb/a2xx/a2xx.xml ( 31003 bytes, from 2013-09-19 18:50:16) - /home/robclark/src/freedreno/envytools/rnndb/adreno_common.xml ( 8983 bytes, from 2013-07-24 01:38:36) -- /home/robclark/src/freedreno/envytools/rnndb/adreno_pm4.xml ( 9712 bytes, from 2013-05-26 15:22:37) -- /home/robclark/src/freedreno/envytools/rnndb/a3xx/a3xx.xml ( 51415 bytes, from 2013-08-03 14:26:05) +- /home/robclark/src/freedreno/envytools/rnndb/adreno_pm4.xml ( 9759 bytes, from 2013-09-10 00:52:33) +- /home/robclark/src/freedreno/envytools/rnndb/a3xx/a3xx.xml ( 51983 bytes, from 2013-09-10 00:52:32) Copyright (C) 2013 by the following authors: - Rob Clark <[email protected]> (robclark)
@@ -317,6 +317,38 @@ static inline uint32_t A2XX_RBBM_STATUS_CMDFIFO_AVAIL(uint32_t val)#define A2XX_RBBM_STATUS_RB_CNTX_BUSY 0x40000000#define A2XX_RBBM_STATUS_GUI_ACTIVE 0x80000000 +#define REG_A2XX_MH_ARBITER_CONFIG 0x00000a40 +#define A2XX_MH_ARBITER_CONFIG_SAME_PAGE_LIMIT__MASK 0x0000003f +#define A2XX_MH_ARBITER_CONFIG_SAME_PAGE_LIMIT__SHIFT 0 +static inline uint32_t A2XX_MH_ARBITER_CONFIG_SAME_PAGE_LIMIT (uint32_t val) +{ +return ((val) <<A2XX_MH_ARBITER_CONFIG_SAME_PAGE_LIMIT__SHIFT ) &A2XX_MH_ARBITER_CONFIG_SAME_PAGE_LIMIT__MASK ; +} +#define A2XX_MH_ARBITER_CONFIG_SAME_PAGE_GRANULARITY 0x00000040 +#define A2XX_MH_ARBITER_CONFIG_L1_ARB_ENABLE 0x00000080 +#define A2XX_MH_ARBITER_CONFIG_L1_ARB_HOLD_ENABLE 0x00000100 +#define A2XX_MH_ARBITER_CONFIG_L2_ARB_CONTROL 0x00000200 +#define A2XX_MH_ARBITER_CONFIG_PAGE_SIZE__MASK 0x00001c00 +#define A2XX_MH_ARBITER_CONFIG_PAGE_SIZE__SHIFT 10 +static inline uint32_t A2XX_MH_ARBITER_CONFIG_PAGE_SIZE (uint32_t val) +{ +return ((val) <<A2XX_MH_ARBITER_CONFIG_PAGE_SIZE__SHIFT ) &A2XX_MH_ARBITER_CONFIG_PAGE_SIZE__MASK ; +} +#define A2XX_MH_ARBITER_CONFIG_TC_REORDER_ENABLE 0x00002000 +#define A2XX_MH_ARBITER_CONFIG_TC_ARB_HOLD_ENABLE 0x00004000 +#define A2XX_MH_ARBITER_CONFIG_IN_FLIGHT_LIMIT_ENABLE 0x00008000 +#define A2XX_MH_ARBITER_CONFIG_IN_FLIGHT_LIMIT__MASK 0x003f0000 +#define A2XX_MH_ARBITER_CONFIG_IN_FLIGHT_LIMIT__SHIFT 16 +static inline uint32_t A2XX_MH_ARBITER_CONFIG_IN_FLIGHT_LIMIT (uint32_t val) +{ +return ((val) <<A2XX_MH_ARBITER_CONFIG_IN_FLIGHT_LIMIT__SHIFT ) &A2XX_MH_ARBITER_CONFIG_IN_FLIGHT_LIMIT__MASK ; +} +#define A2XX_MH_ARBITER_CONFIG_CP_CLNT_ENABLE 0x00400000 +#define A2XX_MH_ARBITER_CONFIG_VGT_CLNT_ENABLE 0x00800000 +#define A2XX_MH_ARBITER_CONFIG_TC_CLNT_ENABLE 0x01000000 +#define A2XX_MH_ARBITER_CONFIG_RB_CLNT_ENABLE 0x02000000 +#define A2XX_MH_ARBITER_CONFIG_PA_CLNT_ENABLE 0x04000000 +#define REG_A2XX_A220_VSC_BIN_SIZE 0x00000c01#define A2XX_A220_VSC_BIN_SIZE_WIDTH__MASK 0x0000001f#define A2XX_A220_VSC_BIN_SIZE_WIDTH__SHIFT 0
drivers/gpu/drm/msm/adreno/a3xx.xml.h +34 -12
100 lines not on this page · raw message
drivers/gpu/drm/msm/adreno/adreno_common.xml.h +5 -5
@@ -4,16 +4,16 @@/* Autogenerated file, DO NOT EDIT manually! This file was generated by the rules-ng-ng headergen tool in this git repository: -http://0x04.net/cgit/index.cgi/rules-ng-ng -git clone git://0x04.net/rules-ng-ng +http://github.com/freedreno/envytools/ +git clone https://github.com/freedreno/envytools.git The rules-ng-ng source files this header was generated from are: - /home/robclark/src/freedreno/envytools/rnndb/adreno.xml ( 327 bytes, from 2013-07-05 19:21:12) - /home/robclark/src/freedreno/envytools/rnndb/freedreno_copyright.xml ( 1453 bytes, from 2013-03-31 16:51:27) -- /home/robclark/src/freedreno/envytools/rnndb/a2xx/a2xx.xml ( 30005 bytes, from 2013-07-19 21:30:48) +- /home/robclark/src/freedreno/envytools/rnndb/a2xx/a2xx.xml ( 31003 bytes, from 2013-09-19 18:50:16) - /home/robclark/src/freedreno/envytools/rnndb/adreno_common.xml ( 8983 bytes, from 2013-07-24 01:38:36) -- /home/robclark/src/freedreno/envytools/rnndb/adreno_pm4.xml ( 9712 bytes, from 2013-05-26 15:22:37) -- /home/robclark/src/freedreno/envytools/rnndb/a3xx/a3xx.xml ( 51415 bytes, from 2013-08-03 14:26:05) +- /home/robclark/src/freedreno/envytools/rnndb/adreno_pm4.xml ( 9759 bytes, from 2013-09-10 00:52:33) +- /home/robclark/src/freedreno/envytools/rnndb/a3xx/a3xx.xml ( 51983 bytes, from 2013-09-10 00:52:32) Copyright (C) 2013 by the following authors: - Rob Clark <[email protected]> (robclark)
drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h +5 -5
@@ -4,16 +4,16 @@/* Autogenerated file, DO NOT EDIT manually! This file was generated by the rules-ng-ng headergen tool in this git repository: -http://0x04.net/cgit/index.cgi/rules-ng-ng -git clone git://0x04.net/rules-ng-ng +http://github.com/freedreno/envytools/ +git clone https://github.com/freedreno/envytools.git The rules-ng-ng source files this header was generated from are: - /home/robclark/src/freedreno/envytools/rnndb/adreno.xml ( 327 bytes, from 2013-07-05 19:21:12) - /home/robclark/src/freedreno/envytools/rnndb/freedreno_copyright.xml ( 1453 bytes, from 2013-03-31 16:51:27) -- /home/robclark/src/freedreno/envytools/rnndb/a2xx/a2xx.xml ( 30005 bytes, from 2013-07-19 21:30:48) +- /home/robclark/src/freedreno/envytools/rnndb/a2xx/a2xx.xml ( 31003 bytes, from 2013-09-19 18:50:16) - /home/robclark/src/freedreno/envytools/rnndb/adreno_common.xml ( 8983 bytes, from 2013-07-24 01:38:36) -- /home/robclark/src/freedreno/envytools/rnndb/adreno_pm4.xml ( 9712 bytes, from 2013-05-26 15:22:37) -- /home/robclark/src/freedreno/envytools/rnndb/a3xx/a3xx.xml ( 51415 bytes, from 2013-08-03 14:26:05) +- /home/robclark/src/freedreno/envytools/rnndb/adreno_pm4.xml ( 9759 bytes, from 2013-09-10 00:52:33) +- /home/robclark/src/freedreno/envytools/rnndb/a3xx/a3xx.xml ( 51983 bytes, from 2013-09-10 00:52:32) Copyright (C) 2013 by the following authors: - Rob Clark <[email protected]> (robclark)
drivers/gpu/drm/msm/dsi/dsi.xml.h +3 -3
@@ -4,13 +4,13 @@/* Autogenerated file, DO NOT EDIT manually! This file was generated by the rules-ng-ng headergen tool in this git repository: -http://0x04.net/cgit/index.cgi/rules-ng-ng -git clone git://0x04.net/rules-ng-ng +http://github.com/freedreno/envytools/ +git clone https://github.com/freedreno/envytools.git The rules-ng-ng source files this header was generated from are: - /home/robclark/src/freedreno/envytools/rnndb/msm.xml ( 595 bytes, from 2013-07-05 19:21:12) - /home/robclark/src/freedreno/envytools/rnndb/freedreno_copyright.xml ( 1453 bytes, from 2013-03-31 16:51:27) -- /home/robclark/src/freedreno/envytools/rnndb/mdp4/mdp4.xml ( 19332 bytes, from 2013-08-16 22:16:36) +- /home/robclark/src/freedreno/envytools/rnndb/mdp4/mdp4.xml ( 19332 bytes, from 2013-10-07 16:36:48) - /home/robclark/src/freedreno/envytools/rnndb/dsi/dsi.xml ( 11712 bytes, from 2013-08-17 17:13:43) - /home/robclark/src/freedreno/envytools/rnndb/dsi/sfpb.xml ( 344 bytes, from 2013-08-11 19:26:32) - /home/robclark/src/freedreno/envytools/rnndb/dsi/mmss_cc.xml ( 1544 bytes, from 2013-08-16 19:17:05)
drivers/gpu/drm/msm/dsi/mmss_cc.xml.h +3 -3
@@ -4,13 +4,13 @@/* Autogenerated file, DO NOT EDIT manually! This file was generated by the rules-ng-ng headergen tool in this git repository: -http://0x04.net/cgit/index.cgi/rules-ng-ng -git clone git://0x04.net/rules-ng-ng +http://github.com/freedreno/envytools/ +git clone https://github.com/freedreno/envytools.git The rules-ng-ng source files this header was generated from are: - /home/robclark/src/freedreno/envytools/rnndb/msm.xml ( 595 bytes, from 2013-07-05 19:21:12) - /home/robclark/src/freedreno/envytools/rnndb/freedreno_copyright.xml ( 1453 bytes, from 2013-03-31 16:51:27) -- /home/robclark/src/freedreno/envytools/rnndb/mdp4/mdp4.xml ( 19332 bytes, from 2013-08-16 22:16:36) +- /home/robclark/src/freedreno/envytools/rnndb/mdp4/mdp4.xml ( 19332 bytes, from 2013-10-07 16:36:48) - /home/robclark/src/freedreno/envytools/rnndb/dsi/dsi.xml ( 11712 bytes, from 2013-08-17 17:13:43) - /home/robclark/src/freedreno/envytools/rnndb/dsi/sfpb.xml ( 344 bytes, from 2013-08-11 19:26:32) - /home/robclark/src/freedreno/envytools/rnndb/dsi/mmss_cc.xml ( 1544 bytes, from 2013-08-16 19:17:05)
drivers/gpu/drm/msm/dsi/sfpb.xml.h +3 -3
@@ -4,13 +4,13 @@/* Autogenerated file, DO NOT EDIT manually! This file was generated by the rules-ng-ng headergen tool in this git repository: -http://0x04.net/cgit/index.cgi/rules-ng-ng -git clone git://0x04.net/rules-ng-ng +http://github.com/freedreno/envytools/ +git clone https://github.com/freedreno/envytools.git The rules-ng-ng source files this header was generated from are: - /home/robclark/src/freedreno/envytools/rnndb/msm.xml ( 595 bytes, from 2013-07-05 19:21:12) - /home/robclark/src/freedreno/envytools/rnndb/freedreno_copyright.xml ( 1453 bytes, from 2013-03-31 16:51:27) -- /home/robclark/src/freedreno/envytools/rnndb/mdp4/mdp4.xml ( 19332 bytes, from 2013-08-16 22:16:36) +- /home/robclark/src/freedreno/envytools/rnndb/mdp4/mdp4.xml ( 19332 bytes, from 2013-10-07 16:36:48) - /home/robclark/src/freedreno/envytools/rnndb/dsi/dsi.xml ( 11712 bytes, from 2013-08-17 17:13:43) - /home/robclark/src/freedreno/envytools/rnndb/dsi/sfpb.xml ( 344 bytes, from 2013-08-11 19:26:32) - /home/robclark/src/freedreno/envytools/rnndb/dsi/mmss_cc.xml ( 1544 bytes, from 2013-08-16 19:17:05)
drivers/gpu/drm/msm/hdmi/hdmi.xml.h +3 -3
@@ -4,13 +4,13 @@/* Autogenerated file, DO NOT EDIT manually! This file was generated by the rules-ng-ng headergen tool in this git repository: -http://0x04.net/cgit/index.cgi/rules-ng-ng -git clone git://0x04.net/rules-ng-ng +http://github.com/freedreno/envytools/ +git clone https://github.com/freedreno/envytools.git The rules-ng-ng source files this header was generated from are: - /home/robclark/src/freedreno/envytools/rnndb/msm.xml ( 595 bytes, from 2013-07-05 19:21:12) - /home/robclark/src/freedreno/envytools/rnndb/freedreno_copyright.xml ( 1453 bytes, from 2013-03-31 16:51:27) -- /home/robclark/src/freedreno/envytools/rnndb/mdp4/mdp4.xml ( 19332 bytes, from 2013-08-16 22:16:36) +- /home/robclark/src/freedreno/envytools/rnndb/mdp4/mdp4.xml ( 19332 bytes, from 2013-10-07 16:36:48) - /home/robclark/src/freedreno/envytools/rnndb/dsi/dsi.xml ( 11712 bytes, from 2013-08-17 17:13:43) - /home/robclark/src/freedreno/envytools/rnndb/dsi/sfpb.xml ( 344 bytes, from 2013-08-11 19:26:32) - /home/robclark/src/freedreno/envytools/rnndb/dsi/mmss_cc.xml ( 1544 bytes, from 2013-08-16 19:17:05)
drivers/gpu/drm/msm/hdmi/qfprom.xml.h +3 -3
@@ -4,13 +4,13 @@/* Autogenerated file, DO NOT EDIT manually! This file was generated by the rules-ng-ng headergen tool in this git repository: -http://0x04.net/cgit/index.cgi/rules-ng-ng -git clone git://0x04.net/rules-ng-ng +http://github.com/freedreno/envytools/ +git clone https://github.com/freedreno/envytools.git The rules-ng-ng source files this header was generated from are: - /home/robclark/src/freedreno/envytools/rnndb/msm.xml ( 595 bytes, from 2013-07-05 19:21:12) - /home/robclark/src/freedreno/envytools/rnndb/freedreno_copyright.xml ( 1453 bytes, from 2013-03-31 16:51:27) -- /home/robclark/src/freedreno/envytools/rnndb/mdp4/mdp4.xml ( 19332 bytes, from 2013-08-16 22:16:36) +- /home/robclark/src/freedreno/envytools/rnndb/mdp4/mdp4.xml ( 19332 bytes, from 2013-10-07 16:36:48) - /home/robclark/src/freedreno/envytools/rnndb/dsi/dsi.xml ( 11712 bytes, from 2013-08-17 17:13:43) - /home/robclark/src/freedreno/envytools/rnndb/dsi/sfpb.xml ( 344 bytes, from 2013-08-11 19:26:32) - /home/robclark/src/freedreno/envytools/rnndb/dsi/mmss_cc.xml ( 1544 bytes, from 2013-08-16 19:17:05)
drivers/gpu/drm/msm/mdp4/mdp4.xml.h +63 -63
397 lines not on this page · raw message
drivers/gpu/drm/msm/mdp4/mdp4_kms.h +5 -5
@@ -75,8 +75,8 @@ struct mdp4_platform_config {struct mdp4_format {struct msm_format base; -enum mpd4_bpc bpc_r, bpc_g, bpc_b; -enum mpd4_bpc_alpha bpc_a; +enum mdp4_bpc bpc_r, bpc_g, bpc_b; +enum mdp4_bpc_alpha bpc_a;uint8_t unpack[4 ];bool alpha_enable, unpack_tight;uint8_t cpp, unpack_count;
@@ -93,7 +93,7 @@ static inline u32 mdp4_read(struct mdp4_kms *mdp4_kms, u32 reg)return msm_readl (mdp4_kms->mmio + reg); } -static inline uint32_t pipe2flush (enum mpd4_pipe pipe) +static inline uint32_t pipe2flush (enum mdp4_pipe pipe) {switch (pipe) {case VG1 :return MDP4_OVERLAY_FLUSH_VG1 ;
@@ -158,9 +158,9 @@ int mdp4_plane_mode_set(struct drm_plane *plane, unsigned int crtc_w, unsigned int crtc_h, uint32_t src_x, uint32_t src_y, uint32_t src_w, uint32_t src_h); -enum mpd4_pipe mdp4_plane_pipe (struct drm_plane *plane); +enum mdp4_pipe mdp4_plane_pipe (struct drm_plane *plane);struct drm_plane *mdp4_plane_init (struct drm_device *dev, -enum mpd4_pipe pipe_id,bool private_plane); +enum mdp4_pipe pipe_id,bool private_plane);uint32_t mdp4_crtc_vblank (struct drm_crtc *crtc);void mdp4_crtc_cancel_pending_flip (struct drm_crtc *crtc);
drivers/gpu/drm/msm/mdp4/mdp4_plane.c +5 -5
@@ -22,7 +22,7 @@ struct mdp4_plane {struct drm_plane base;const char *name; -enum mpd4_pipe pipe; +enum mdp4_pipe pipe;uint32_t nformats;uint32_t formats[32 ];
@@ -101,7 +101,7 @@ void mdp4_plane_set_scanout(struct drm_plane *plane, {struct mdp4_plane *mdp4_plane =to_mdp4_plane (plane);struct mdp4_kms *mdp4_kms =get_kms (plane); -enum mpd4_pipe pipe = mdp4_plane->pipe; +enum mdp4_pipe pipe = mdp4_plane->pipe;uint32_t iova; mdp4_write(mdp4_kms, REG_MDP4_PIPE_SRC_STRIDE_A(pipe),
@@ -129,7 +129,7 @@ int mdp4_plane_mode_set(struct drm_plane *plane, {struct mdp4_plane *mdp4_plane =to_mdp4_plane (plane);struct mdp4_kms *mdp4_kms =get_kms (plane); -enum mpd4_pipe pipe = mdp4_plane->pipe; +enum mdp4_pipe pipe = mdp4_plane->pipe;const struct mdp4_format *format;uint32_t op_mode =0 ;uint32_t phasex_step =MDP4_VG_PHASE_STEP_DEFAULT ;
@@ -202,7 +202,7 @@ static const char *pipe_names[] = { "VG3", "VG4", }; -enum mpd4_pipe mdp4_plane_pipe (struct drm_plane *plane) +enum mdp4_pipe mdp4_plane_pipe (struct drm_plane *plane) {struct mdp4_plane *mdp4_plane =to_mdp4_plane (plane);return mdp4_plane->pipe;
@@ -210,7 +210,7 @@ enum mpd4_pipe mdp4_plane_pipe(struct drm_plane *plane)/* initialize plane */ struct drm_plane *mdp4_plane_init (struct drm_device *dev, -enum mpd4_pipe pipe_id,bool private_plane) +enum mdp4_pipe pipe_id,bool private_plane) {struct msm_drm_private *priv = dev->dev_private;struct drm_plane *plane =NULL ;
Signature · 1 line
1.8.3.1
PATCH 4/6 drm/msm: add plane support
In reply to Rob ClarkEnable using VG1 and VG2 for planes. Currently YUV/CSC or scaling is not enabled, but ARGB and xRGB blending is.
--- drivers/gpu/drm/msm/mdp4/mdp4_crtc.c | 136 ++++++++++++++++++++------------- drivers/gpu/drm/msm/mdp4/mdp4_format.c | 16 ++++ drivers/gpu/drm/msm/mdp4/mdp4_kms.c | 17 +++++ drivers/gpu/drm/msm/mdp4/mdp4_kms.h | 46 +++++++++++ drivers/gpu/drm/msm/mdp4/mdp4_plane.c | 20 +++-- drivers/gpu/drm/msm/msm_drv.h | 3 + 6 files changed, 182 insertions(+), 56 deletions(-)
drivers/gpu/drm/msm/mdp4/mdp4_crtc.c +85 -51
@@ -26,6 +26,7 @@ struct mdp4_crtc {struct drm_crtc base;char name[8 ];struct drm_plane *plane; +struct drm_plane *planes[8 ];int id;int ovlp;enum mdp4_dma dma;
@@ -115,9 +116,15 @@ static void crtc_flush(struct drm_crtc *crtc) {struct mdp4_crtc *mdp4_crtc =to_mdp4_crtc (crtc);struct mdp4_kms *mdp4_kms =get_kms (crtc); -uint32_t flush =0 ; +uint32_t i, flush =0 ; - flush |=pipe2flush (mdp4_plane_pipe (mdp4_crtc->plane)); +for (i =0 ; i <ARRAY_SIZE (mdp4_crtc->planes); i++) { +struct drm_plane *plane = mdp4_crtc->planes[i]; +if (plane) { +enum mdp4_pipe pipe_id =mdp4_plane_pipe (plane); + flush |=pipe2flush (pipe_id); + } + } flush |=ovlp2flush (mdp4_crtc->ovlp);DBG ("%s: flush=%08x" , mdp4_crtc->name, flush);
@@ -205,67 +212,69 @@ static void blend_setup(struct drm_crtc *crtc)struct mdp4_kms *mdp4_kms =get_kms (crtc);int i, ovlp = mdp4_crtc->ovlp;uint32_t mixer_cfg =0 ; - -/* -* This probably would also need to be triggered by any attached -* plane when it changes.. for now since we are only using a single -* private plane, the configuration is hard-coded: -*/ +static const enum mdp4_mixer_stage_id stages[] = { +STAGE_BASE ,STAGE0 ,STAGE1 ,STAGE2 ,STAGE3 , + }; +/* statically (for now) map planes to mixer stage (z-order): */ +static const int idxs[] = { + [VG1 ] =1 , + [VG2 ] =2 , + [RGB1 ] =0 , + [RGB2 ] =0 , + [RGB3 ] =0 , + [VG3 ] =3 , + [VG4 ] =4 , + + }; +bool alpha[4 ]= { false, false, false, false };mdp4_write (mdp4_kms,REG_MDP4_OVLP_TRANSP_LOW0 (ovlp),0 );mdp4_write (mdp4_kms,REG_MDP4_OVLP_TRANSP_LOW1 (ovlp),0 );mdp4_write (mdp4_kms,REG_MDP4_OVLP_TRANSP_HIGH0 (ovlp),0 );mdp4_write (mdp4_kms,REG_MDP4_OVLP_TRANSP_HIGH1 (ovlp),0 ); +/* TODO single register for all CRTCs, so this won't work properly +* when multiple CRTCs are active.. +*/ +for (i =0 ; i <ARRAY_SIZE (mdp4_crtc->planes); i++) { +struct drm_plane *plane = mdp4_crtc->planes[i]; +if (plane) { +enum mdp4_pipe pipe_id =mdp4_plane_pipe (plane); +int idx = idxs[pipe_id]; +if (idx >0 ) { +const struct mdp4_format *format = +to_mdp4_format (msm_framebuffer_format (plane->fb)); + alpha[idx-1 ] = format->alpha_enable; + } + mixer_cfg |=mixercfg (mdp4_crtc->mixer, pipe_id, stages[idx]); + } + } + +/* this shouldn't happen.. and seems to cause underflow: */ +WARN_ON (!mixer_cfg); +for (i =0 ; i <4 ; i++) { -mdp4_write (mdp4_kms,REG_MDP4_OVLP_STAGE_FG_ALPHA (ovlp, i),0 ); -mdp4_write (mdp4_kms,REG_MDP4_OVLP_STAGE_BG_ALPHA (ovlp, i),0 ); -mdp4_write (mdp4_kms,REG_MDP4_OVLP_STAGE_OP (ovlp, i), -MDP4_OVLP_STAGE_OP_FG_ALPHA (FG_CONST ) | -MDP4_OVLP_STAGE_OP_BG_ALPHA (BG_CONST )); -mdp4_write (mdp4_kms,REG_MDP4_OVLP_STAGE_CO3 (ovlp, i),0 ); +uint32_t op; + +if (alpha[i]) { + op =MDP4_OVLP_STAGE_OP_FG_ALPHA (FG_PIXEL ) | +MDP4_OVLP_STAGE_OP_BG_ALPHA (FG_PIXEL ) | +MDP4_OVLP_STAGE_OP_BG_INV_ALPHA ; + }else { + op =MDP4_OVLP_STAGE_OP_FG_ALPHA (FG_CONST ) | +MDP4_OVLP_STAGE_OP_BG_ALPHA (BG_CONST ); + } + +mdp4_write (mdp4_kms,REG_MDP4_OVLP_STAGE_FG_ALPHA (ovlp, i),0xff ); +mdp4_write (mdp4_kms,REG_MDP4_OVLP_STAGE_BG_ALPHA (ovlp, i),0x00 ); +mdp4_write (mdp4_kms,REG_MDP4_OVLP_STAGE_OP (ovlp, i), op); +mdp4_write (mdp4_kms,REG_MDP4_OVLP_STAGE_CO3 (ovlp, i),1 );mdp4_write (mdp4_kms,REG_MDP4_OVLP_STAGE_TRANSP_LOW0 (ovlp, i),0 );mdp4_write (mdp4_kms,REG_MDP4_OVLP_STAGE_TRANSP_LOW1 (ovlp, i),0 );mdp4_write (mdp4_kms,REG_MDP4_OVLP_STAGE_TRANSP_HIGH0 (ovlp, i),0 );mdp4_write (mdp4_kms,REG_MDP4_OVLP_STAGE_TRANSP_HIGH1 (ovlp, i),0 ); } -/* TODO single register for all CRTCs, so this won't work properly -* when multiple CRTCs are active.. -*/ -switch (mdp4_plane_pipe (mdp4_crtc->plane)) { -case VG1 : - mixer_cfg =MDP4_LAYERMIXER_IN_CFG_PIPE0 (STAGE_BASE ) | -COND (mdp4_crtc->mixer ==1 ,MDP4_LAYERMIXER_IN_CFG_PIPE0_MIXER1 ); -break ; -case VG2 : - mixer_cfg =MDP4_LAYERMIXER_IN_CFG_PIPE1 (STAGE_BASE ) | -COND (mdp4_crtc->mixer ==1 ,MDP4_LAYERMIXER_IN_CFG_PIPE1_MIXER1 ); -break ; -case RGB1 : - mixer_cfg =MDP4_LAYERMIXER_IN_CFG_PIPE2 (STAGE_BASE ) | -COND (mdp4_crtc->mixer ==1 ,MDP4_LAYERMIXER_IN_CFG_PIPE2_MIXER1 ); -break ; -case RGB2 : - mixer_cfg =MDP4_LAYERMIXER_IN_CFG_PIPE3 (STAGE_BASE ) | -COND (mdp4_crtc->mixer ==1 ,MDP4_LAYERMIXER_IN_CFG_PIPE3_MIXER1 ); -break ; -case RGB3 : - mixer_cfg =MDP4_LAYERMIXER_IN_CFG_PIPE4 (STAGE_BASE ) | -COND (mdp4_crtc->mixer ==1 ,MDP4_LAYERMIXER_IN_CFG_PIPE4_MIXER1 ); -break ; -case VG3 : - mixer_cfg =MDP4_LAYERMIXER_IN_CFG_PIPE5 (STAGE_BASE ) | -COND (mdp4_crtc->mixer ==1 ,MDP4_LAYERMIXER_IN_CFG_PIPE5_MIXER1 ); -break ; -case VG4 : - mixer_cfg =MDP4_LAYERMIXER_IN_CFG_PIPE6 (STAGE_BASE ) | -COND (mdp4_crtc->mixer ==1 ,MDP4_LAYERMIXER_IN_CFG_PIPE6_MIXER1 ); -break ; -default : -WARN_ON ("invalid pipe" ); -break ; - }mdp4_write (mdp4_kms,REG_MDP4_LAYERMIXER_IN_CFG , mixer_cfg); }
@@ -622,6 +631,32 @@ void mdp4_crtc_set_intf(struct drm_crtc *crtc, enum mdp4_intf intf)mdp4_write (mdp4_kms,REG_MDP4_DISP_INTF_SEL , intf_sel); } +static void set_attach (struct drm_crtc *crtc,enum mdp4_pipe pipe_id, +struct drm_plane *plane) +{ +struct mdp4_crtc *mdp4_crtc =to_mdp4_crtc (crtc); + +BUG_ON (pipe_id >=ARRAY_SIZE (mdp4_crtc->planes)); + +if (mdp4_crtc->planes[pipe_id] == plane) +return ; + + mdp4_crtc->planes[pipe_id] = plane; +blend_setup (crtc); +if (mdp4_crtc->enabled && (plane != mdp4_crtc->plane)) +crtc_flush (crtc); +} + +void mdp4_crtc_attach (struct drm_crtc *crtc,struct drm_plane *plane) +{ +set_attach (crtc,mdp4_plane_pipe (plane), plane); +} + +void mdp4_crtc_detach (struct drm_crtc *crtc,struct drm_plane *plane) +{ +set_attach (crtc,mdp4_plane_pipe (plane),NULL ); +} +static const char *dma_names[] = {"DMA_P" ,"DMA_S" ,"DMA_E" , };
@@ -644,7 +679,6 @@ struct drm_crtc *mdp4_crtc_init(struct drm_device *dev, crtc = &mdp4_crtc->base; mdp4_crtc->plane = plane; - mdp4_crtc->plane->crtc = crtc; mdp4_crtc->ovlp = ovlp_id; mdp4_crtc->dma = dma_id;
drivers/gpu/drm/msm/mdp4/mdp4_format.c +16 -0
@@ -44,6 +44,22 @@ static const struct mdp4_format formats[] = { FMT(BGR565, 0, 5, 6, 5, 2, 0, 1, 0, false, true, 2, 3), }; +uint32_t mdp4_get_formats (enum mdp4_pipe pipe_id,uint32_t *pixel_formats, +uint32_t max_formats) +{ +uint32_t i; +for (i =0 ; i <ARRAY_SIZE (formats); i++) { +const struct mdp4_format *f = &formats[i]; + +if (i == max_formats) +break ; + + pixel_formats[i] = f->base.pixel_format; + } + +return i; +} +const struct msm_format *mdp4_get_format (struct msm_kms *kms,uint32_t format) {int i;
drivers/gpu/drm/msm/mdp4/mdp4_kms.c +17 -0
@@ -196,6 +196,23 @@ static int modeset_init(struct mdp4_kms *mdp4_kms)* for more than just RGB1->DMA_E->DTV->HDMI */ +/* construct non-private planes: */ + plane =mdp4_plane_init (dev,VG1 , false); +if (IS_ERR (plane)) { +dev_err (dev->dev,"failed to construct plane for VG1\n" ); + ret =PTR_ERR (plane); + goto fail; + } + priv->planes[priv->num_planes++] = plane; + + plane =mdp4_plane_init (dev,VG2 , false); +if (IS_ERR (plane)) { +dev_err (dev->dev,"failed to construct plane for VG2\n" ); + ret =PTR_ERR (plane); + goto fail; + } + priv->planes[priv->num_planes++] = plane; +/* the CRTCs get constructed with a private plane: */ plane =mdp4_plane_init (dev,RGB1 , true);if (IS_ERR (plane)) {
drivers/gpu/drm/msm/mdp4/mdp4_kms.h +46 -0
64 lines not on this page · raw message
drivers/gpu/drm/msm/mdp4/mdp4_plane.c +15 -5
@@ -61,7 +61,9 @@ static int mdp4_plane_update(struct drm_plane *plane,static int mdp4_plane_disable (struct drm_plane *plane) {struct mdp4_plane *mdp4_plane =to_mdp4_plane (plane); -DBG ("%s: TODO" , mdp4_plane->name);// XXX +DBG ("%s: disable" , mdp4_plane->name); +if (plane->crtc) +mdp4_crtc_detach (plane->crtc, plane);return 0 ; }
@@ -141,6 +143,10 @@ int mdp4_plane_mode_set(struct drm_plane *plane, src_w = src_w >>16 ; src_h = src_h >>16 ; +DBG ("%s: FB[%u] %u,%u,%u,%u -> CRTC[%u] %d,%d,%u,%u" , mdp4_plane->name, + fb->base.id, src_x, src_y, src_w, src_h, + crtc->base.id, crtc_x, crtc_y, crtc_w, crtc_h); +if (src_w != crtc_w) { op_mode |=MDP4_PIPE_OP_MODE_SCALEX_EN ;/* TODO calc phasex_step */
@@ -191,7 +197,8 @@ int mdp4_plane_mode_set(struct drm_plane *plane,mdp4_write (mdp4_kms,REG_MDP4_PIPE_PHASEX_STEP (pipe), phasex_step);mdp4_write (mdp4_kms,REG_MDP4_PIPE_PHASEY_STEP (pipe), phasey_step); - plane->crtc = crtc; +/* TODO detach from old crtc (if we had more than one) */ +mdp4_crtc_attach (crtc, plane);return 0 ; }
@@ -212,7 +219,6 @@ enum mdp4_pipe mdp4_plane_pipe(struct drm_plane *plane)struct drm_plane *mdp4_plane_init (struct drm_device *dev,enum mdp4_pipe pipe_id,bool private_plane) { -struct msm_drm_private *priv = dev->dev_private;struct drm_plane *plane =NULL ;struct mdp4_plane *mdp4_plane;int ret;
@@ -228,8 +234,12 @@ struct drm_plane *mdp4_plane_init(struct drm_device *dev, mdp4_plane->pipe = pipe_id; mdp4_plane->name = pipe_names[pipe_id]; -drm_plane_init (dev, plane, (1 << priv->num_crtcs) -1 , &mdp4_plane_funcs, - mdp4_plane->formats, mdp4_plane->nformats, private_plane); + mdp4_plane->nformats =mdp4_get_formats (pipe_id, mdp4_plane->formats, +ARRAY_SIZE (mdp4_plane->formats)); + +drm_plane_init (dev, plane,0xff , &mdp4_plane_funcs, + mdp4_plane->formats, mdp4_plane->nformats, + private_plane);mdp4_plane_install_properties (plane, &plane->base);
drivers/gpu/drm/msm/msm_drv.h +3 -0
@@ -77,6 +77,9 @@ struct msm_drm_private {unsigned int num_iommus;struct iommu_domain *iommus[NUM_DOMAINS ]; +unsigned int num_planes; +struct drm_plane *planes[8 ]; +unsigned int num_crtcs;struct drm_crtc *crtcs[8 ];
Signature · 1 line
1.8.3.1
PATCH 5/6 drm/msm: rework inactive-work
In reply to Rob ClarkRe-arrange things a bit so that we can get work requested after a bo fence passes, like pageflip, done before retiring bo's. Without any sort of bo cache in userspace, some games can trigger hundred's of transient bo's, which can cause retire to take a long time (5-10ms). Obviously we want a bo cache.. but this cleanup will make things a bit easier for atomic as well and makes things a bit cleaner.
--- drivers/gpu/drm/msm/mdp4/mdp4_crtc.c | 11 +++++------ drivers/gpu/drm/msm/msm_drv.c | 30 ++++++++++++++++++++++++++---- drivers/gpu/drm/msm/msm_drv.h | 21 +++++++++++++++++++-- drivers/gpu/drm/msm/msm_gem.c | 35 +++++++++++++++++++---------------- drivers/gpu/drm/msm/msm_gem.h | 3 --- drivers/gpu/drm/msm/msm_gpu.c | 4 ++-- 6 files changed, 71 insertions(+), 33 deletions(-)
drivers/gpu/drm/msm/mdp4/mdp4_crtc.c +5 -6
@@ -51,7 +51,7 @@ struct mdp4_crtc {/* if there is a pending flip, these will be non-null: */ struct drm_pending_vblank_event *event; -struct work_struct pageflip_work; +struct msm_fence_cb pageflip_cb;/* the fb that we currently hold a scanout ref to: */ struct drm_framebuffer *fb;
@@ -132,10 +132,10 @@ static void crtc_flush(struct drm_crtc *crtc)mdp4_write (mdp4_kms,REG_MDP4_OVERLAY_FLUSH , flush); } -static void pageflip_worker (struct work_struct *work) +static void pageflip_cb (struct msm_fence_cb *cb) {struct mdp4_crtc *mdp4_crtc = - container_of(work, struct mdp4_crtc, pageflip_work); + container_of(cb, struct mdp4_crtc, pageflip_cb);struct drm_crtc *crtc = &mdp4_crtc->base;mdp4_plane_set_scanout (mdp4_crtc->plane, crtc->fb);
@@ -397,8 +397,7 @@ static int mdp4_crtc_page_flip(struct drm_crtc *crtc, mdp4_crtc->event = event;update_fb (crtc, true, new_fb); -return msm_gem_queue_inactive_work (obj, - &mdp4_crtc->pageflip_work); +return msm_gem_queue_inactive_cb (obj, &mdp4_crtc->pageflip_cb); } static int mdp4_crtc_set_property(struct drm_crtc *crtc,
@@ -702,7 +701,7 @@ struct drm_crtc *mdp4_crtc_init(struct drm_device *dev, ret =drm_flip_work_init (&mdp4_crtc->unref_cursor_work,64 ,"unref cursor" , unref_cursor_worker); -INIT_WORK (&mdp4_crtc->pageflip_work, pageflip_worker); +INIT_FENCE_CB (&mdp4_crtc->pageflip_cb, pageflip_cb);drm_crtc_init (dev, crtc, &mdp4_crtc_funcs);drm_crtc_helper_add (crtc, &mdp4_crtc_helper_funcs);
drivers/gpu/drm/msm/msm_drv.c +26 -4
@@ -187,6 +187,7 @@ static int msm_load(struct drm_device *dev, unsigned long flags)init_waitqueue_head (&priv->fence_event);INIT_LIST_HEAD (&priv->inactive_list); +INIT_LIST_HEAD (&priv->fence_cbs);drm_mode_config_init (dev);
@@ -539,15 +540,36 @@ int msm_wait_fence_interruptable(struct drm_device *dev, uint32_t fence,return ret; } -/* call under struct_mutex */ +/* called from workqueue */ void msm_update_fence (struct drm_device *dev,uint32_t fence) {struct msm_drm_private *priv = dev->dev_private; -if (fence > priv->completed_fence) { - priv->completed_fence = fence; -wake_up_all (&priv->fence_event); +mutex_lock (&dev->struct_mutex); + priv->completed_fence =max (fence, priv->completed_fence); + +while (!list_empty (&priv->fence_cbs)) { +struct msm_fence_cb *cb; + + cb =list_first_entry (&priv->fence_cbs, + struct msm_fence_cb, work.entry); + +if (cb->fence > priv->completed_fence) +break ; + +list_del_init (&cb->work.entry); +queue_work (priv->wq, &cb->work); } + +mutex_unlock (&dev->struct_mutex); + +wake_up_all (&priv->fence_event); +} + +void __msm_fence_worker (struct work_struct *work) +{ + struct msm_fence_cb *cb = container_of(work, struct msm_fence_cb, work); + cb->func (cb); }/*
drivers/gpu/drm/msm/msm_drv.h +19 -2
@@ -73,6 +73,9 @@ struct msm_drm_private {struct workqueue_struct *wq; +/* callbacks deferred until bo is inactive: */ +struct list_head fence_cbs; +/* registered IOMMU domains: */ unsigned int num_iommus;struct iommu_domain *iommus[NUM_DOMAINS ];
@@ -97,6 +100,20 @@ struct msm_format {uint32_t pixel_format; }; +/* callback from wq once fence has passed: */ +struct msm_fence_cb { +struct work_struct work; +uint32_t fence; +void (*func)(struct msm_fence_cb *cb); +}; + +void __msm_fence_worker (struct work_struct *work); + +#define INIT_FENCE_CB (_cb, _func) do { \ + INIT_WORK(&(_cb)->work, __msm_fence_worker); \ + (_cb)->func = _func; \ + } while (0) +/* As there are different display controller blocks depending on the * snapdragon version, the kms support is split out and the appropriate * implementation is loaded at runtime. The kms module is responsible
@@ -160,8 +177,8 @@ int msm_gem_prime_pin(struct drm_gem_object *obj);void msm_gem_prime_unpin (struct drm_gem_object *obj);void *msm_gem_vaddr_locked (struct drm_gem_object *obj);void *msm_gem_vaddr (struct drm_gem_object *obj); -int msm_gem_queue_inactive_work (struct drm_gem_object *obj, -struct work_struct *work); +int msm_gem_queue_inactive_cb (struct drm_gem_object *obj, +struct msm_fence_cb *cb);void msm_gem_move_to_active (struct drm_gem_object *obj,struct msm_gpu *gpu,bool write,uint32_t fence);void msm_gem_move_to_inactive (struct drm_gem_object *obj);
drivers/gpu/drm/msm/msm_gem.c +19 -16
@@ -309,7 +309,17 @@ int msm_gem_get_iova_locked(struct drm_gem_object *obj, int id,int msm_gem_get_iova (struct drm_gem_object *obj,int id,uint32_t *iova) { +struct msm_gem_object *msm_obj =to_msm_bo (obj);int ret; + +/* this is safe right now because we don't unmap until the +* bo is deleted: +*/ +if (msm_obj->domain[id].iova) { + *iova = msm_obj->domain[id].iova; +return 0 ; + } +mutex_lock (&obj->dev->struct_mutex); ret =msm_gem_get_iova_locked (obj, id, iova);mutex_unlock (&obj->dev->struct_mutex);
@@ -379,8 +389,11 @@ void *msm_gem_vaddr(struct drm_gem_object *obj)return ret; } -int msm_gem_queue_inactive_work (struct drm_gem_object *obj, -struct work_struct *work) +/* setup callback for when bo is no longer busy.. +* TODO probably want to differentiate read vs write.. +*/ +int msm_gem_queue_inactive_cb (struct drm_gem_object *obj, +struct msm_fence_cb *cb) {struct drm_device *dev = obj->dev;struct msm_drm_private *priv = dev->dev_private;
@@ -388,12 +401,13 @@ int msm_gem_queue_inactive_work(struct drm_gem_object *obj,int ret =0 ;mutex_lock (&dev->struct_mutex); -if (!list_empty (&work->entry)) { +if (!list_empty (&cb->work.entry)) { ret = -EINVAL ; }else if (is_active (msm_obj)) { -list_add_tail (&work->entry, &msm_obj->inactive_work); + cb->fence =max (msm_obj->read_fence, msm_obj->write_fence); +list_add_tail (&cb->work.entry, &priv->fence_cbs); }else { -queue_work (priv->wq, work); +queue_work (priv->wq, &cb->work); }mutex_unlock (&dev->struct_mutex);
@@ -426,16 +440,6 @@ void msm_gem_move_to_inactive(struct drm_gem_object *obj) msm_obj->write_fence =0 ;list_del_init (&msm_obj->mm_list);list_add_tail (&msm_obj->mm_list, &priv->inactive_list); - -while (!list_empty (&msm_obj->inactive_work)) { -struct work_struct *work; - - work =list_first_entry (&msm_obj->inactive_work, - struct work_struct, entry); - -list_del_init (&work->entry); -queue_work (priv->wq, work); - } } int msm_gem_cpu_prep(struct drm_gem_object *obj, uint32_t op,
@@ -604,7 +608,6 @@ static int msm_gem_new_impl(struct drm_device *dev,reservation_object_init (msm_obj->resv);INIT_LIST_HEAD (&msm_obj->submit_entry); -INIT_LIST_HEAD (&msm_obj->inactive_work);list_add_tail (&msm_obj->mm_list, &priv->inactive_list); *obj = &msm_obj->base;
drivers/gpu/drm/msm/msm_gem.h +0 -3
@@ -45,9 +45,6 @@ struct msm_gem_object {*/ struct list_head submit_entry; -/* work defered until bo is inactive: */ -struct list_head inactive_work; -struct page **pages;struct sg_table *sgt;void *vaddr;
drivers/gpu/drm/msm/msm_gpu.c +2 -2
@@ -268,6 +268,8 @@ static void retire_worker(struct work_struct *work)struct drm_device *dev = gpu->dev;uint32_t fence = gpu->funcs->last_fence (gpu); +msm_update_fence (gpu->dev, fence); +mutex_lock (&dev->struct_mutex);while (!list_empty (&gpu->active_list)) {
@@ -287,8 +289,6 @@ static void retire_worker(struct work_struct *work) } } -msm_update_fence (gpu->dev, fence); -mutex_unlock (&dev->struct_mutex); }
Signature · 1 line
1.8.3.1
PATCH 6/6 drm/msm: EBUSY status handling in msm_gem_fault()
In reply to Rob ClarkSubsequent threads returning EBUSY from vm_insert_pfn() was not handled correctly. As a result concurrent access from new threads to mmapped data caused SIGBUS.
See e79e0fe3
--- drivers/gpu/drm/msm/msm_gem.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/msm/msm_gem.c +5 -0
@@ -178,6 +178,11 @@ out:case 0 :case -ERESTARTSYS :case -EINTR : +case -EBUSY : +/* +* EBUSY is ok: this just means that another thread +* already did the job. +*/ return VM_FAULT_NOPAGE ;case -ENOMEM :return VM_FAULT_OOM ;
Signature · 1 line
1.8.3.1
Quoted 1 line · Rob Clark
Fyi, here are the queued up patches I have so far for 3.13.
I'm happy with these changes. You can add a
if you want.
David
Quoted 40 lines
Rob Clark (6):
drm/msm: prime support
drm/msm: support render nodes
drm/msm: resync generated headers drm/msm: add plane support
drm/msm: rework inactive-work
drm/msm: EBUSY status handling inmsm_gem_fault()drivers/gpu/drm/msm/Makefile | 1 + drivers/gpu/drm/msm/adreno/a2xx.xml.h | 42 ++++++- drivers/gpu/drm/msm/adreno/a3xx.xml.h | 46 +++++-- drivers/gpu/drm/msm/adreno/adreno_common.xml.h | 10 +- drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h | 10 +- drivers/gpu/drm/msm/dsi/dsi.xml.h | 6 +- drivers/gpu/drm/msm/dsi/mmss_cc.xml.h | 6 +- drivers/gpu/drm/msm/dsi/sfpb.xml.h | 6 +- drivers/gpu/drm/msm/hdmi/hdmi.xml.h | 6 +- drivers/gpu/drm/msm/hdmi/qfprom.xml.h | 6 +- drivers/gpu/drm/msm/mdp4/mdp4.xml.h | 126 +++++++++---------- drivers/gpu/drm/msm/mdp4/mdp4_crtc.c | 147 ++++++++++++++--------- drivers/gpu/drm/msm/mdp4/mdp4_format.c | 16 +++ drivers/gpu/drm/msm/mdp4/mdp4_kms.c | 17 +++ drivers/gpu/drm/msm/mdp4/mdp4_kms.h | 56 ++++++++- drivers/gpu/drm/msm/mdp4/mdp4_plane.c | 30 +++-- drivers/gpu/drm/msm/msm_drv.c | 60 ++++++++-- drivers/gpu/drm/msm/msm_drv.h | 37 +++++- drivers/gpu/drm/msm/msm_gem.c | 160 +++++++++++++++++++------ drivers/gpu/drm/msm/msm_gem.h | 3 - drivers/gpu/drm/msm/msm_gem_prime.c | 56 +++++++++ drivers/gpu/drm/msm/msm_gpu.c | 4 +- 22 files changed, 614 insertions(+), 237 deletions(-)create mode 100644
drivers/gpu/drm/msm/msm_gem_prime.cSignature · 6 lines
1.8.3.1 -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 3 lines
sent by an employee of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation