drm/msm: support arbitrary number of vma's per gem bo
Subsystems (3)
cover drm/msm: support arbitrary number of vma's per gem bo
A step towards having per-process pagetables, we need to be able to map a given buffer into multiple address spaces.
This is similar to Jordan's "drm/msm: get an iova from the address space instead of an id" patch, except split up into smaller steps, and fixing some issues with the non-IOMMU case.
Rob Clark (6):
drm/msm/mdp5: kill pipe_lock
drm/msm/mdp4+5: move aspace/id to base class drm/msm: pass address-space to _get_iova() and friends drm/msm: refactor how we handle vram carveout buffers drm/msm: support for an arbitrary number of address spaces drm/msm: remove address-space id
drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 8 +- drivers/gpu/drm/msm/adreno/a5xx_power.c | 5 +- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 6 +- drivers/gpu/drm/msm/dsi/dsi_host.c | 10 +- drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 9 +- drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 15 +-- drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h | 4 - drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c | 15 ++- drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 6 +- drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 11 +- drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 4 - drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 26 ++--- drivers/gpu/drm/msm/msm_drv.c | 13 --- drivers/gpu/drm/msm/msm_drv.h | 33 +++--- drivers/gpu/drm/msm/msm_fb.c | 15 ++- drivers/gpu/drm/msm/msm_fbdev.c | 4 +- drivers/gpu/drm/msm/msm_gem.c | 184 ++++++++++++++++++++---------- drivers/gpu/drm/msm/msm_gem.h | 4 +- drivers/gpu/drm/msm/msm_gem_submit.c | 4 +- drivers/gpu/drm/msm/msm_gpu.c | 8 +- drivers/gpu/drm/msm/msm_gpu.h | 1 - drivers/gpu/drm/msm/msm_kms.h | 3 + 22 files changed, 215 insertions(+), 173 deletions(-)
Signature · 6 lines
2.9.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 1/6 drm/msm/mdp5: kill pipe_lock
In reply to a message not in the archiveIt serves no purpose, things should be sufficiently synchronized already by atomic framework. And it is somewhat awkward to be holding a spinlock when msm_gem_iova() is going to start needing to grab a mutex.
--- drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 10 ---------- 1 file changed, 10 deletions(-)
drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c +0 -10
@@ -22,8 +22,6 @@struct mdp5_plane {struct drm_plane base; -spinlock_t pipe_lock;/* protect REG_MDP5_PIPE_* registers */ -uint32_t nformats;uint32_t formats[32 ]; };
@@ -875,7 +873,6 @@ static int mdp5_plane_mode_set(struct drm_plane *plane, struct drm_crtc *crtc, struct drm_framebuffer *fb, struct drm_rect *src, struct drm_rect *dest) { - struct mdp5_plane *mdp5_plane = to_mdp5_plane(plane); struct drm_plane_state *pstate = plane->state;struct mdp5_hw_pipe *hwpipe =to_mdp5_plane_state (pstate)->hwpipe;struct mdp5_kms *mdp5_kms =get_kms (plane);
@@ -896,7 +893,6 @@ static int mdp5_plane_mode_set(struct drm_plane *plane,uint32_t src_img_w, src_img_h;uint32_t src_x_r;int crtc_x_r; -unsigned long flags;int ret; nplanes = fb->format->num_planes;
@@ -975,8 +971,6 @@ static int mdp5_plane_mode_set(struct drm_plane *plane, hflip = !!(rotation &DRM_REFLECT_X ); vflip = !!(rotation &DRM_REFLECT_Y ); -spin_lock_irqsave (&mdp5_plane->pipe_lock, flags); - mdp5_hwpipe_mode_set(mdp5_kms, hwpipe, fb, &step, &pe, config, hdecm, vdecm, hflip, vflip, crtc_x, crtc_y, crtc_w, crtc_h,
@@ -989,8 +983,6 @@ static int mdp5_plane_mode_set(struct drm_plane *plane, src_img_w, src_img_h, src_x_r, src_y, src_w, src_h); -spin_unlock_irqrestore (&mdp5_plane->pipe_lock, flags); - plane->fb = fb;return ret;
@@ -1132,8 +1124,6 @@ struct drm_plane *mdp5_plane_init(struct drm_device *dev, mdp5_plane->nformats =mdp_get_formats (mdp5_plane->formats,ARRAY_SIZE (mdp5_plane->formats), false); -spin_lock_init (&mdp5_plane->pipe_lock); -if (type ==DRM_PLANE_TYPE_CURSOR ) ret = drm_universal_plane_init(dev, plane, 0xff, &mdp5_cursor_plane_funcs,
Signature · 6 lines
2.9.4 _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH 2/6 drm/msm/mdp4+5: move aspace/id to base class
In reply to a message not in the archiveBefore we can shift to passing the address-space object to _get_iova(), we need to fix a few places (dsi+fbdev) that were hard-coding the adress space id. That gets somewhat easier if we just move these to the kms base class.
Prep work for next patch.
--- drivers/gpu/drm/msm/dsi/dsi_host.c | 10 ++++++++-- drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 9 ++++++--- drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 14 +++++++------- drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h | 4 ---- drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c | 15 +++++++++------ drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 6 ++++-- drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 10 +++++----- drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 4 ---- drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 16 ++++++++++------ drivers/gpu/drm/msm/msm_fbdev.c | 4 +++- drivers/gpu/drm/msm/msm_kms.h | 4 ++++ 11 files changed, 56 insertions(+), 40 deletions(-)
drivers/gpu/drm/msm/dsi/dsi_host.c +8 -2
@@ -32,6 +32,7 @@#include "dsi.xml.h" #include "sfpb.xml.h" #include "dsi_cfg.h" +#include "msm_kms.h" static int dsi_get_version (const void __iomem *base,u32 *major,u32 *minor) {
@@ -975,6 +976,7 @@ static void dsi_wait4video_eng_busy(struct msm_dsi_host *msm_host)static int dsi_tx_buf_alloc (struct msm_dsi_host *msm_host,int size) {struct drm_device *dev = msm_host->dev; +struct msm_drm_private *priv = dev->dev_private;const struct msm_dsi_cfg_handler *cfg_hnd = msm_host->cfg_hnd;int ret;uint64_t iova;
@@ -991,7 +993,8 @@ static int dsi_tx_buf_alloc(struct msm_dsi_host *msm_host, int size)return ret; } - ret =msm_gem_get_iova_locked (msm_host->tx_gem_obj,0 , &iova); + ret =msm_gem_get_iova_locked (msm_host->tx_gem_obj, + priv->kms->id, &iova);mutex_unlock (&dev->struct_mutex);if (ret) {pr_err ("%s: failed to get iova, %d\n" , __func__, ret);
@@ -1141,12 +1144,15 @@ static int dsi_long_read_resp(u8 *buf, const struct mipi_dsi_msg *msg)static int dsi_cmd_dma_tx (struct msm_dsi_host *msm_host,int len) {const struct msm_dsi_cfg_handler *cfg_hnd = msm_host->cfg_hnd; +struct drm_device *dev = msm_host->dev; +struct msm_drm_private *priv = dev->dev_private;int ret;uint64_t dma_base;bool triggered;if (cfg_hnd->major ==MSM_DSI_VER_MAJOR_6G ) { - ret =msm_gem_get_iova (msm_host->tx_gem_obj,0 , &dma_base); + ret =msm_gem_get_iova (msm_host->tx_gem_obj, + priv->kms->id, &dma_base);if (ret) {pr_err ("%s: failed to get iova: %d\n" , __func__, ret);return ret;
drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c +6 -3
@@ -126,8 +126,9 @@ static void unref_cursor_worker(struct drm_flip_work *work, void *val)struct mdp4_crtc *mdp4_crtc = container_of(work, struct mdp4_crtc, unref_cursor_work);struct mdp4_kms *mdp4_kms =get_kms (&mdp4_crtc->base); +struct msm_kms *kms = &mdp4_kms->base.base; -msm_gem_put_iova (val, mdp4_kms->id); +msm_gem_put_iova (val, kms->id);drm_gem_object_unreference_unlocked (val); }
@@ -360,6 +361,7 @@ static void update_cursor(struct drm_crtc *crtc) {struct mdp4_crtc *mdp4_crtc =to_mdp4_crtc (crtc);struct mdp4_kms *mdp4_kms =get_kms (crtc); +struct msm_kms *kms = &mdp4_kms->base.base;enum mdp4_dma dma = mdp4_crtc->dma;unsigned long flags;
@@ -372,7 +374,7 @@ static void update_cursor(struct drm_crtc *crtc)if (next_bo) {/* take a obj ref + iova ref when we start scanning out: */ drm_gem_object_reference (next_bo); -msm_gem_get_iova_locked (next_bo, mdp4_kms->id, &iova); +msm_gem_get_iova_locked (next_bo, kms->id, &iova);/* enable cursor: */ mdp4_write(mdp4_kms, REG_MDP4_DMA_CURSOR_SIZE(dma),
@@ -409,6 +411,7 @@ static int mdp4_crtc_cursor_set(struct drm_crtc *crtc, {struct mdp4_crtc *mdp4_crtc =to_mdp4_crtc (crtc);struct mdp4_kms *mdp4_kms =get_kms (crtc); +struct msm_kms *kms = &mdp4_kms->base.base;struct drm_device *dev = crtc->dev;struct drm_gem_object *cursor_bo, *old_bo;unsigned long flags;
@@ -429,7 +432,7 @@ static int mdp4_crtc_cursor_set(struct drm_crtc *crtc, }if (cursor_bo) { - ret =msm_gem_get_iova (cursor_bo, mdp4_kms->id, &iova); + ret =msm_gem_get_iova (cursor_bo, kms->id, &iova);if (ret) goto fail; }else {
drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c +7 -7
@@ -160,10 +160,10 @@ static void mdp4_destroy(struct msm_kms *kms) {struct mdp4_kms *mdp4_kms =to_mdp4_kms (to_mdp_kms (kms));struct device *dev = mdp4_kms->dev->dev; -struct msm_gem_address_space *aspace = mdp4_kms->aspace; +struct msm_gem_address_space *aspace = kms->aspace;if (mdp4_kms->blank_cursor_iova) -msm_gem_put_iova (mdp4_kms->blank_cursor_bo, mdp4_kms->id); +msm_gem_put_iova (mdp4_kms->blank_cursor_bo, kms->id);drm_gem_object_unreference_unlocked (mdp4_kms->blank_cursor_bo);if (aspace) {
@@ -536,7 +536,7 @@ struct msm_kms *mdp4_kms_init(struct drm_device *dev) goto fail; } - mdp4_kms->aspace = aspace; + kms->aspace = aspace; ret = aspace->mmu->funcs->attach (aspace->mmu, iommu_ports,ARRAY_SIZE (iommu_ports));
@@ -548,9 +548,9 @@ struct msm_kms *mdp4_kms_init(struct drm_device *dev) aspace =NULL ; } - mdp4_kms->id =msm_register_address_space (dev, aspace); -if (mdp4_kms->id <0 ) { - ret = mdp4_kms->id; + kms->id =msm_register_address_space (dev, aspace); +if (kms->id <0 ) { + ret = kms->id;dev_err (dev->dev,"failed to register mdp4 iommu: %d\n" , ret); goto fail; }
@@ -571,7 +571,7 @@ struct msm_kms *mdp4_kms_init(struct drm_device *dev) goto fail; } - ret =msm_gem_get_iova (mdp4_kms->blank_cursor_bo, mdp4_kms->id, + ret =msm_gem_get_iova (mdp4_kms->blank_cursor_bo, kms->id, &mdp4_kms->blank_cursor_iova);if (ret) {dev_err (dev->dev,"could not pin blank-cursor bo: %d\n" , ret);
drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h +0 -4
@@ -32,9 +32,6 @@ struct mdp4_kms {int rev; -/* mapper-id used to request GEM buffer mapped for scanout: */ -int id; -void __iomem *mmio;struct regulator *vdd;
@@ -43,7 +40,6 @@ struct mdp4_kms {struct clk *pclk;struct clk *lut_clk;struct clk *axi_clk; -struct msm_gem_address_space *aspace;struct mdp_irq error_handler;
drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c +9 -6
@@ -103,13 +103,14 @@ static int mdp4_plane_prepare_fb(struct drm_plane *plane, {struct mdp4_plane *mdp4_plane =to_mdp4_plane (plane);struct mdp4_kms *mdp4_kms =get_kms (plane); +struct msm_kms *kms = &mdp4_kms->base.base;struct drm_framebuffer *fb = new_state->fb;if (!fb)return 0 ;DBG ("%s: prepare: FB[%u]" , mdp4_plane->name, fb->base.id); -return msm_framebuffer_prepare (fb, mdp4_kms->id); +return msm_framebuffer_prepare (fb, kms->id); } static void mdp4_plane_cleanup_fb(struct drm_plane *plane,
@@ -117,13 +118,14 @@ static void mdp4_plane_cleanup_fb(struct drm_plane *plane, {struct mdp4_plane *mdp4_plane =to_mdp4_plane (plane);struct mdp4_kms *mdp4_kms =get_kms (plane); +struct msm_kms *kms = &mdp4_kms->base.base;struct drm_framebuffer *fb = old_state->fb;if (!fb)return ;DBG ("%s: cleanup: FB[%u]" , mdp4_plane->name, fb->base.id); -msm_framebuffer_cleanup (fb, mdp4_kms->id); +msm_framebuffer_cleanup (fb, kms->id); }
@@ -161,6 +163,7 @@ static 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); +struct msm_kms *kms = &mdp4_kms->base.base;enum mdp4_pipe pipe = mdp4_plane->pipe; mdp4_write(mdp4_kms, REG_MDP4_PIPE_SRC_STRIDE_A(pipe),
@@ -172,13 +175,13 @@ static void mdp4_plane_set_scanout(struct drm_plane *plane, MDP4_PIPE_SRC_STRIDE_B_P3(fb->pitches[3]));mdp4_write (mdp4_kms,REG_MDP4_PIPE_SRCP0_BASE (pipe), -msm_framebuffer_iova (fb, mdp4_kms->id,0 )); +msm_framebuffer_iova (fb, kms->id,0 ));mdp4_write (mdp4_kms,REG_MDP4_PIPE_SRCP1_BASE (pipe), -msm_framebuffer_iova (fb, mdp4_kms->id,1 )); +msm_framebuffer_iova (fb, kms->id,1 ));mdp4_write (mdp4_kms,REG_MDP4_PIPE_SRCP2_BASE (pipe), -msm_framebuffer_iova (fb, mdp4_kms->id,2 )); +msm_framebuffer_iova (fb, kms->id,2 ));mdp4_write (mdp4_kms,REG_MDP4_PIPE_SRCP3_BASE (pipe), -msm_framebuffer_iova (fb, mdp4_kms->id,3 )); +msm_framebuffer_iova (fb, kms->id,3 )); plane->fb = fb; }
drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c +4 -2
@@ -160,8 +160,9 @@ static void unref_cursor_worker(struct drm_flip_work *work, void *val)struct mdp5_crtc *mdp5_crtc = container_of(work, struct mdp5_crtc, unref_cursor_work);struct mdp5_kms *mdp5_kms =get_kms (&mdp5_crtc->base); +struct msm_kms *kms = &mdp5_kms->base.base; -msm_gem_put_iova (val, mdp5_kms->id); +msm_gem_put_iova (val, kms->id);drm_gem_object_unreference_unlocked (val); }
@@ -724,6 +725,7 @@ static int mdp5_crtc_cursor_set(struct drm_crtc *crtc,struct mdp5_pipeline *pipeline = &mdp5_cstate->pipeline;struct drm_device *dev = crtc->dev;struct mdp5_kms *mdp5_kms =get_kms (crtc); +struct msm_kms *kms = &mdp5_kms->base.base;struct drm_gem_object *cursor_bo, *old_bo =NULL ;uint32_t blendcfg, stride;uint64_t cursor_addr;
@@ -758,7 +760,7 @@ static int mdp5_crtc_cursor_set(struct drm_crtc *crtc,if (!cursor_bo)return -ENOENT ; - ret =msm_gem_get_iova (cursor_bo, mdp5_kms->id, &cursor_addr); + ret =msm_gem_get_iova (cursor_bo, kms->id, &cursor_addr);if (ret)return -EINVAL ;
drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c +5 -5
@@ -160,7 +160,7 @@ static void mdp5_set_encoder_mode(struct msm_kms *kms,static void mdp5_kms_destroy (struct msm_kms *kms) {struct mdp5_kms *mdp5_kms =to_mdp5_kms (to_mdp_kms (kms)); -struct msm_gem_address_space *aspace = mdp5_kms->aspace; +struct msm_gem_address_space *aspace = kms->aspace;int i;for (i =0 ; i < mdp5_kms->num_hwmixers; i++)
@@ -731,7 +731,7 @@ struct msm_kms *mdp5_kms_init(struct drm_device *dev) goto fail; } - mdp5_kms->aspace = aspace; + kms->aspace = aspace; ret = aspace->mmu->funcs->attach (aspace->mmu, iommu_ports,ARRAY_SIZE (iommu_ports));
@@ -746,9 +746,9 @@ struct msm_kms *mdp5_kms_init(struct drm_device *dev) aspace =NULL ;; } - mdp5_kms->id =msm_register_address_space (dev, aspace); -if (mdp5_kms->id <0 ) { - ret = mdp5_kms->id; + kms->id =msm_register_address_space (dev, aspace); +if (kms->id <0 ) { + ret = kms->id;dev_err (&pdev->dev,"failed to register mdp5 iommu: %d\n" , ret); goto fail; }
drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h +0 -4
@@ -55,10 +55,6 @@ struct mdp5_kms {struct mdp5_state *state;struct drm_modeset_lock state_lock; -/* mapper-id used to request GEM buffer mapped for scanout: */ -int id; -struct msm_gem_address_space *aspace; -struct mdp5_smp *smp;struct mdp5_ctl_manager *ctlm;
drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c +10 -6
@@ -270,26 +270,28 @@ static int mdp5_plane_prepare_fb(struct drm_plane *plane, struct drm_plane_state *new_state) {struct mdp5_kms *mdp5_kms =get_kms (plane); +struct msm_kms *kms = &mdp5_kms->base.base;struct drm_framebuffer *fb = new_state->fb;if (!new_state->fb)return 0 ;DBG ("%s: prepare: FB[%u]" , plane->name, fb->base.id); -return msm_framebuffer_prepare (fb, mdp5_kms->id); +return msm_framebuffer_prepare (fb, kms->id); }static void mdp5_plane_cleanup_fb (struct drm_plane *plane,struct drm_plane_state *old_state) {struct mdp5_kms *mdp5_kms =get_kms (plane); +struct msm_kms *kms = &mdp5_kms->base.base;struct drm_framebuffer *fb = old_state->fb;if (!fb)return ;DBG ("%s: cleanup: FB[%u]" , plane->name, fb->base.id); -msm_framebuffer_cleanup (fb, mdp5_kms->id); +msm_framebuffer_cleanup (fb, kms->id); }#define FRAC_16_16 (mult, div) (((mult) << 16) / (div))
@@ -492,6 +494,8 @@ static void set_scanout_locked(struct mdp5_kms *mdp5_kms,enum mdp5_pipe pipe, struct drm_framebuffer *fb) { + struct msm_kms *kms = &mdp5_kms->base.base; +mdp5_write (mdp5_kms,REG_MDP5_PIPE_SRC_STRIDE_A (pipe),MDP5_PIPE_SRC_STRIDE_A_P0 (fb->pitches[0 ]) |MDP5_PIPE_SRC_STRIDE_A_P1 (fb->pitches[1 ]));
@@ -501,13 +505,13 @@ static void set_scanout_locked(struct mdp5_kms *mdp5_kms, MDP5_PIPE_SRC_STRIDE_B_P3(fb->pitches[3]));mdp5_write (mdp5_kms,REG_MDP5_PIPE_SRC0_ADDR (pipe), -msm_framebuffer_iova (fb, mdp5_kms->id,0 )); +msm_framebuffer_iova (fb, kms->id,0 ));mdp5_write (mdp5_kms,REG_MDP5_PIPE_SRC1_ADDR (pipe), -msm_framebuffer_iova (fb, mdp5_kms->id,1 )); +msm_framebuffer_iova (fb, kms->id,1 ));mdp5_write (mdp5_kms,REG_MDP5_PIPE_SRC2_ADDR (pipe), -msm_framebuffer_iova (fb, mdp5_kms->id,2 )); +msm_framebuffer_iova (fb, kms->id,2 ));mdp5_write (mdp5_kms,REG_MDP5_PIPE_SRC3_ADDR (pipe), -msm_framebuffer_iova (fb, mdp5_kms->id,3 )); +msm_framebuffer_iova (fb, kms->id,3 )); }/* Note: mdp5_plane->pipe_lock must be locked */
drivers/gpu/drm/msm/msm_fbdev.c +3 -1
@@ -20,6 +20,7 @@#include "drm_crtc.h" #include "drm_fb_helper.h" #include "msm_gem.h" +#include "msm_kms.h" extern int msm_gem_mmap_obj (struct drm_gem_object *obj,struct vm_area_struct *vma);
@@ -73,6 +74,7 @@ static int msm_fbdev_create(struct drm_fb_helper *helper, {struct msm_fbdev *fbdev =to_msm_fbdev (helper);struct drm_device *dev = helper->dev; +struct msm_drm_private *priv = dev->dev_private;struct drm_framebuffer *fb =NULL ;struct fb_info *fbi =NULL ;struct drm_mode_fb_cmd2 mode_cmd = {0 };
@@ -124,7 +126,7 @@ static int msm_fbdev_create(struct drm_fb_helper *helper,* in panic (ie. lock-safe, etc) we could avoid pinning the * buffer now: */ - ret =msm_gem_get_iova_locked (fbdev->bo,0 , &paddr); + ret =msm_gem_get_iova_locked (fbdev->bo, priv->kms->id, &paddr);if (ret) {dev_err (dev->dev,"failed to get buffer obj iova: %d\n" , ret); goto fail_unlock;
drivers/gpu/drm/msm/msm_kms.h +4 -0
@@ -73,6 +73,10 @@ struct msm_kms {/* irq number to be passed on to drm_irq_install */ int irq; + +/* mapper-id used to request GEM buffer mapped for scanout: */ +int id; +struct msm_gem_address_space *aspace; };/**
Signature · 6 lines
2.9.4 _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH 3/6 drm/msm: pass address-space to _get_iova() and friends
In reply to a message not in the archiveNo functional change, that will come later. But this will make it easier to deal with dynamically created address spaces (ie. per- process pagetables for gpu).
--- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 8 ++++---- drivers/gpu/drm/msm/adreno/a5xx_power.c | 5 +++-- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 6 +++--- drivers/gpu/drm/msm/dsi/dsi_host.c | 4 ++-- drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 6 +++--- drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 4 ++-- drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c | 12 ++++++------ drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 4 ++-- drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 12 ++++++------ drivers/gpu/drm/msm/msm_drv.c | 5 ++++- drivers/gpu/drm/msm/msm_drv.h | 22 ++++++++++++++-------- drivers/gpu/drm/msm/msm_fb.c | 15 +++++++++------ drivers/gpu/drm/msm/msm_fbdev.c | 2 +- drivers/gpu/drm/msm/msm_gem.c | 18 ++++++++++++------ drivers/gpu/drm/msm/msm_gem.h | 1 + drivers/gpu/drm/msm/msm_gem_submit.c | 4 ++-- drivers/gpu/drm/msm/msm_gpu.c | 6 +++--- 17 files changed, 77 insertions(+), 57 deletions(-)
drivers/gpu/drm/msm/adreno/a5xx_gpu.c +4 -4
@@ -397,7 +397,7 @@ static struct drm_gem_object *a5xx_ucode_load_bo(struct msm_gpu *gpu, }if (iova) { -int ret =msm_gem_get_iova_locked (bo, gpu->id, iova); +int ret =msm_gem_get_iova_locked (bo, gpu->aspace, iova);if (ret) {drm_gem_object_unreference (bo);
@@ -765,19 +765,19 @@ static void a5xx_destroy(struct msm_gpu *gpu)if (a5xx_gpu->pm4_bo) {if (a5xx_gpu->pm4_iova) -msm_gem_put_iova (a5xx_gpu->pm4_bo, gpu->id); +msm_gem_put_iova (a5xx_gpu->pm4_bo, gpu->aspace);drm_gem_object_unreference_unlocked (a5xx_gpu->pm4_bo); }if (a5xx_gpu->pfp_bo) {if (a5xx_gpu->pfp_iova) -msm_gem_put_iova (a5xx_gpu->pfp_bo, gpu->id); +msm_gem_put_iova (a5xx_gpu->pfp_bo, gpu->aspace);drm_gem_object_unreference_unlocked (a5xx_gpu->pfp_bo); }if (a5xx_gpu->gpmu_bo) {if (a5xx_gpu->gpmu_iova) -msm_gem_put_iova (a5xx_gpu->gpmu_bo, gpu->id); +msm_gem_put_iova (a5xx_gpu->gpmu_bo, gpu->aspace);drm_gem_object_unreference_unlocked (a5xx_gpu->gpmu_bo); }
drivers/gpu/drm/msm/adreno/a5xx_power.c +3 -2
@@ -298,7 +298,8 @@ void a5xx_gpmu_ucode_init(struct msm_gpu *gpu)if (IS_ERR (a5xx_gpu->gpmu_bo)) goto err; -if (msm_gem_get_iova_locked (a5xx_gpu->gpmu_bo, gpu->id, &a5xx_gpu->gpmu_iova)) +if (msm_gem_get_iova_locked (a5xx_gpu->gpmu_bo, gpu->aspace, + &a5xx_gpu->gpmu_iova)) goto err; ptr =msm_gem_get_vaddr_locked (a5xx_gpu->gpmu_bo);
@@ -327,7 +328,7 @@ void a5xx_gpmu_ucode_init(struct msm_gpu *gpu) err:if (a5xx_gpu->gpmu_iova) -msm_gem_put_iova (a5xx_gpu->gpmu_bo, gpu->id); +msm_gem_put_iova (a5xx_gpu->gpmu_bo, gpu->aspace);if (a5xx_gpu->gpmu_bo)drm_gem_object_unreference (a5xx_gpu->gpmu_bo);
drivers/gpu/drm/msm/adreno/adreno_gpu.c +3 -3
@@ -64,7 +64,7 @@ int adreno_hw_init(struct msm_gpu *gpu)DBG ("%s" , gpu->name); - ret =msm_gem_get_iova_locked (gpu->rb->bo, gpu->id, &gpu->rb_iova); + ret =msm_gem_get_iova_locked (gpu->rb->bo, gpu->aspace, &gpu->rb_iova);if (ret) { gpu->rb_iova =0 ;dev_err (gpu->dev->dev,"could not map ringbuffer: %d\n" , ret);
@@ -409,7 +409,7 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev,return -ENOMEM ; } - ret =msm_gem_get_iova (adreno_gpu->memptrs_bo, gpu->id, + ret =msm_gem_get_iova (adreno_gpu->memptrs_bo, gpu->aspace, &adreno_gpu->memptrs_iova);if (ret) {dev_err (drm->dev,"could not map memptrs: %d\n" , ret);
@@ -428,7 +428,7 @@ void adreno_gpu_cleanup(struct adreno_gpu *adreno_gpu)msm_gem_put_vaddr (adreno_gpu->memptrs_bo);if (adreno_gpu->memptrs_iova) -msm_gem_put_iova (adreno_gpu->memptrs_bo, gpu->id); +msm_gem_put_iova (adreno_gpu->memptrs_bo, gpu->aspace);drm_gem_object_unreference_unlocked (adreno_gpu->memptrs_bo); }
drivers/gpu/drm/msm/dsi/dsi_host.c +2 -2
@@ -994,7 +994,7 @@ static int dsi_tx_buf_alloc(struct msm_dsi_host *msm_host, int size) } ret =msm_gem_get_iova_locked (msm_host->tx_gem_obj, - priv->kms->id, &iova); + priv->kms->aspace, &iova);mutex_unlock (&dev->struct_mutex);if (ret) {pr_err ("%s: failed to get iova, %d\n" , __func__, ret);
@@ -1152,7 +1152,7 @@ static int dsi_cmd_dma_tx(struct msm_dsi_host *msm_host, int len)if (cfg_hnd->major ==MSM_DSI_VER_MAJOR_6G ) { ret =msm_gem_get_iova (msm_host->tx_gem_obj, - priv->kms->id, &dma_base); + priv->kms->aspace, &dma_base);if (ret) {pr_err ("%s: failed to get iova: %d\n" , __func__, ret);return ret;
drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c +3 -3
@@ -128,7 +128,7 @@ static void unref_cursor_worker(struct drm_flip_work *work, void *val)struct mdp4_kms *mdp4_kms =get_kms (&mdp4_crtc->base);struct msm_kms *kms = &mdp4_kms->base.base; -msm_gem_put_iova (val, kms->id); +msm_gem_put_iova (val, kms->aspace);drm_gem_object_unreference_unlocked (val); }
@@ -374,7 +374,7 @@ static void update_cursor(struct drm_crtc *crtc)if (next_bo) {/* take a obj ref + iova ref when we start scanning out: */ drm_gem_object_reference (next_bo); -msm_gem_get_iova_locked (next_bo, kms->id, &iova); +msm_gem_get_iova_locked (next_bo, kms->aspace, &iova);/* enable cursor: */ mdp4_write(mdp4_kms, REG_MDP4_DMA_CURSOR_SIZE(dma),
@@ -432,7 +432,7 @@ static int mdp4_crtc_cursor_set(struct drm_crtc *crtc, }if (cursor_bo) { - ret =msm_gem_get_iova (cursor_bo, kms->id, &iova); + ret =msm_gem_get_iova (cursor_bo, kms->aspace, &iova);if (ret) goto fail; }else {
drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c +2 -2
@@ -163,7 +163,7 @@ static void mdp4_destroy(struct msm_kms *kms)struct msm_gem_address_space *aspace = kms->aspace;if (mdp4_kms->blank_cursor_iova) -msm_gem_put_iova (mdp4_kms->blank_cursor_bo, kms->id); +msm_gem_put_iova (mdp4_kms->blank_cursor_bo, kms->aspace);drm_gem_object_unreference_unlocked (mdp4_kms->blank_cursor_bo);if (aspace) {
@@ -571,7 +571,7 @@ struct msm_kms *mdp4_kms_init(struct drm_device *dev) goto fail; } - ret =msm_gem_get_iova (mdp4_kms->blank_cursor_bo, kms->id, + ret =msm_gem_get_iova (mdp4_kms->blank_cursor_bo, kms->aspace, &mdp4_kms->blank_cursor_iova);if (ret) {dev_err (dev->dev,"could not pin blank-cursor bo: %d\n" , ret);
drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c +6 -6
@@ -110,7 +110,7 @@ static int mdp4_plane_prepare_fb(struct drm_plane *plane,return 0 ;DBG ("%s: prepare: FB[%u]" , mdp4_plane->name, fb->base.id); -return msm_framebuffer_prepare (fb, kms->id); +return msm_framebuffer_prepare (fb, kms->aspace); } static void mdp4_plane_cleanup_fb(struct drm_plane *plane,
@@ -125,7 +125,7 @@ static void mdp4_plane_cleanup_fb(struct drm_plane *plane,return ;DBG ("%s: cleanup: FB[%u]" , mdp4_plane->name, fb->base.id); -msm_framebuffer_cleanup (fb, kms->id); +msm_framebuffer_cleanup (fb, kms->aspace); }
@@ -175,13 +175,13 @@ static void mdp4_plane_set_scanout(struct drm_plane *plane, MDP4_PIPE_SRC_STRIDE_B_P3(fb->pitches[3]));mdp4_write (mdp4_kms,REG_MDP4_PIPE_SRCP0_BASE (pipe), -msm_framebuffer_iova (fb, kms->id,0 )); +msm_framebuffer_iova (fb, kms->aspace,0 ));mdp4_write (mdp4_kms,REG_MDP4_PIPE_SRCP1_BASE (pipe), -msm_framebuffer_iova (fb, kms->id,1 )); +msm_framebuffer_iova (fb, kms->aspace,1 ));mdp4_write (mdp4_kms,REG_MDP4_PIPE_SRCP2_BASE (pipe), -msm_framebuffer_iova (fb, kms->id,2 )); +msm_framebuffer_iova (fb, kms->aspace,2 ));mdp4_write (mdp4_kms,REG_MDP4_PIPE_SRCP3_BASE (pipe), -msm_framebuffer_iova (fb, kms->id,3 )); +msm_framebuffer_iova (fb, kms->aspace,3 )); plane->fb = fb; }
drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c +2 -2
@@ -162,7 +162,7 @@ static void unref_cursor_worker(struct drm_flip_work *work, void *val)struct mdp5_kms *mdp5_kms =get_kms (&mdp5_crtc->base);struct msm_kms *kms = &mdp5_kms->base.base; -msm_gem_put_iova (val, kms->id); +msm_gem_put_iova (val, kms->aspace);drm_gem_object_unreference_unlocked (val); }
@@ -760,7 +760,7 @@ static int mdp5_crtc_cursor_set(struct drm_crtc *crtc,if (!cursor_bo)return -ENOENT ; - ret =msm_gem_get_iova (cursor_bo, kms->id, &cursor_addr); + ret =msm_gem_get_iova (cursor_bo, kms->aspace, &cursor_addr);if (ret)return -EINVAL ;
drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c +6 -6
@@ -277,7 +277,7 @@ static int mdp5_plane_prepare_fb(struct drm_plane *plane,return 0 ;DBG ("%s: prepare: FB[%u]" , plane->name, fb->base.id); -return msm_framebuffer_prepare (fb, kms->id); +return msm_framebuffer_prepare (fb, kms->aspace); } static void mdp5_plane_cleanup_fb(struct drm_plane *plane,
@@ -291,7 +291,7 @@ static void mdp5_plane_cleanup_fb(struct drm_plane *plane,return ;DBG ("%s: cleanup: FB[%u]" , plane->name, fb->base.id); -msm_framebuffer_cleanup (fb, kms->id); +msm_framebuffer_cleanup (fb, kms->aspace); }#define FRAC_16_16 (mult, div) (((mult) << 16) / (div))
@@ -505,13 +505,13 @@ static void set_scanout_locked(struct mdp5_kms *mdp5_kms, MDP5_PIPE_SRC_STRIDE_B_P3(fb->pitches[3]));mdp5_write (mdp5_kms,REG_MDP5_PIPE_SRC0_ADDR (pipe), -msm_framebuffer_iova (fb, kms->id,0 )); +msm_framebuffer_iova (fb, kms->aspace,0 ));mdp5_write (mdp5_kms,REG_MDP5_PIPE_SRC1_ADDR (pipe), -msm_framebuffer_iova (fb, kms->id,1 )); +msm_framebuffer_iova (fb, kms->aspace,1 ));mdp5_write (mdp5_kms,REG_MDP5_PIPE_SRC2_ADDR (pipe), -msm_framebuffer_iova (fb, kms->id,2 )); +msm_framebuffer_iova (fb, kms->aspace,2 ));mdp5_write (mdp5_kms,REG_MDP5_PIPE_SRC3_ADDR (pipe), -msm_framebuffer_iova (fb, kms->id,3 )); +msm_framebuffer_iova (fb, kms->aspace,3 )); }/* Note: mdp5_plane->pipe_lock must be locked */
drivers/gpu/drm/msm/msm_drv.c +4 -1
@@ -51,6 +51,7 @@ static const struct drm_mode_config_funcs mode_config_funcs = { .atomic_state_free = msm_atomic_state_free, }; +#include "msm_gem.h" /* temporary */ int msm_register_address_space (struct drm_device *dev,struct msm_gem_address_space *aspace) {
@@ -61,7 +62,9 @@ int msm_register_address_space(struct drm_device *dev, priv->aspace[priv->num_aspaces] = aspace; -return priv->num_aspaces++; + aspace->id = priv->num_aspaces++; + +return aspace->id; }#ifdef CONFIG_DRM_MSM_REGISTER_LOGGING
drivers/gpu/drm/msm/msm_drv.h +14 -8
@@ -209,13 +209,16 @@ int msm_gem_mmap_obj(struct drm_gem_object *obj,int msm_gem_mmap (struct file *filp,struct vm_area_struct *vma);int msm_gem_fault (struct vm_fault *vmf);uint64_t msm_gem_mmap_offset (struct drm_gem_object *obj); -int msm_gem_get_iova_locked (struct drm_gem_object *obj,int id, -uint64_t *iova); -int msm_gem_get_iova (struct drm_gem_object *obj,int id,uint64_t *iova); -uint64_t msm_gem_iova (struct drm_gem_object *obj,int id); +int msm_gem_get_iova_locked (struct drm_gem_object *obj, +struct msm_gem_address_space *aspace,uint64_t *iova); +int msm_gem_get_iova (struct drm_gem_object *obj, +struct msm_gem_address_space *aspace,uint64_t *iova); +uint64_t msm_gem_iova (struct drm_gem_object *obj, +struct msm_gem_address_space *aspace);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); +void msm_gem_put_iova (struct drm_gem_object *obj, +struct msm_gem_address_space *aspace);int msm_gem_dumb_create (struct drm_file *file,struct drm_device *dev,struct drm_mode_create_dumb *args); int msm_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev,
@@ -250,9 +253,12 @@ struct drm_gem_object *msm_gem_new(struct drm_device *dev,struct drm_gem_object *msm_gem_import (struct drm_device *dev,struct dma_buf *dmabuf,struct sg_table *sgt); -int msm_framebuffer_prepare (struct drm_framebuffer *fb,int id); -void msm_framebuffer_cleanup (struct drm_framebuffer *fb,int id); -uint32_t msm_framebuffer_iova (struct drm_framebuffer *fb,int id,int plane); +int msm_framebuffer_prepare (struct drm_framebuffer *fb, +struct msm_gem_address_space *aspace); +void msm_framebuffer_cleanup (struct drm_framebuffer *fb, +struct msm_gem_address_space *aspace); +uint32_t msm_framebuffer_iova (struct drm_framebuffer *fb, +struct msm_gem_address_space *aspace,int plane);struct drm_gem_object *msm_framebuffer_bo (struct drm_framebuffer *fb,int plane);const struct msm_format *msm_framebuffer_format (struct drm_framebuffer *fb); struct drm_framebuffer *msm_framebuffer_init(struct drm_device *dev,
drivers/gpu/drm/msm/msm_fb.c +9 -6
@@ -84,14 +84,15 @@ void msm_framebuffer_describe(struct drm_framebuffer *fb, struct seq_file *m)* should be fine, since only the scanout (mdpN) side of things needs * this, the gpu doesn't care about fb's. */ -int msm_framebuffer_prepare (struct drm_framebuffer *fb,int id) +int msm_framebuffer_prepare (struct drm_framebuffer *fb, +struct msm_gem_address_space *aspace) {struct msm_framebuffer *msm_fb =to_msm_framebuffer (fb);int ret, i, n = fb->format->num_planes;uint64_t iova;for (i =0 ; i < n; i++) { - ret =msm_gem_get_iova (msm_fb->planes[i], id, &iova); + ret =msm_gem_get_iova (msm_fb->planes[i], aspace, &iova);DBG ("FB[%u]: iova[%d]: %08llx (%d)" , fb->base.id, i, iova, ret);if (ret)return ret;
@@ -100,21 +101,23 @@ int msm_framebuffer_prepare(struct drm_framebuffer *fb, int id)return 0 ; } -void msm_framebuffer_cleanup (struct drm_framebuffer *fb,int id) +void msm_framebuffer_cleanup (struct drm_framebuffer *fb, +struct msm_gem_address_space *aspace) {struct msm_framebuffer *msm_fb =to_msm_framebuffer (fb);int i, n = fb->format->num_planes;for (i =0 ; i < n; i++) -msm_gem_put_iova (msm_fb->planes[i], id); +msm_gem_put_iova (msm_fb->planes[i], aspace); } -uint32_t msm_framebuffer_iova (struct drm_framebuffer *fb,int id,int plane) +uint32_t msm_framebuffer_iova (struct drm_framebuffer *fb, +struct msm_gem_address_space *aspace,int plane) {struct msm_framebuffer *msm_fb =to_msm_framebuffer (fb);if (!msm_fb->planes[plane])return 0 ; -return msm_gem_iova (msm_fb->planes[plane], id) + fb->offsets[plane]; +return msm_gem_iova (msm_fb->planes[plane], aspace) + fb->offsets[plane]; }struct drm_gem_object *msm_framebuffer_bo (struct drm_framebuffer *fb,int plane)
drivers/gpu/drm/msm/msm_fbdev.c +1 -1
@@ -126,7 +126,7 @@ static int msm_fbdev_create(struct drm_fb_helper *helper,* in panic (ie. lock-safe, etc) we could avoid pinning the * buffer now: */ - ret =msm_gem_get_iova_locked (fbdev->bo, priv->kms->id, &paddr); + ret =msm_gem_get_iova_locked (fbdev->bo, priv->kms->aspace, &paddr);if (ret) {dev_err (dev->dev,"failed to get buffer obj iova: %d\n" , ret); goto fail_unlock;
drivers/gpu/drm/msm/msm_gem.c +12 -6
@@ -308,10 +308,11 @@ put_iova(struct drm_gem_object *obj)* That means when I do eventually need to add support for unpinning * the refcnt counter needs to be atomic_t. */ -int msm_gem_get_iova_locked (struct drm_gem_object *obj,int id, -uint64_t *iova) +int msm_gem_get_iova_locked (struct drm_gem_object *obj, +struct msm_gem_address_space *aspace,uint64_t *iova) {struct msm_gem_object *msm_obj =to_msm_bo (obj); +int id = aspace ? aspace->id :0 ;int ret =0 ;WARN_ON (!mutex_is_locked (&obj->dev->struct_mutex));
@@ -338,9 +339,11 @@ int msm_gem_get_iova_locked(struct drm_gem_object *obj, int id, }/* get iova, taking a reference. Should have a matching put */ -int msm_gem_get_iova (struct drm_gem_object *obj,int id,uint64_t *iova) +int msm_gem_get_iova (struct drm_gem_object *obj, +struct msm_gem_address_space *aspace,uint64_t *iova) {struct msm_gem_object *msm_obj =to_msm_bo (obj); +int id = aspace ? aspace->id :0 ;int ret;/* this is safe right now because we don't unmap until the
@@ -353,7 +356,7 @@ int msm_gem_get_iova(struct drm_gem_object *obj, int id, uint64_t *iova) }mutex_lock (&obj->dev->struct_mutex); - ret =msm_gem_get_iova_locked (obj, id, iova); + ret =msm_gem_get_iova_locked (obj, aspace, iova);mutex_unlock (&obj->dev->struct_mutex);return ret; }
@@ -361,14 +364,17 @@ int msm_gem_get_iova(struct drm_gem_object *obj, int id, uint64_t *iova)/* get iova without taking a reference, used in places where you have * already done a 'msm_gem_get_iova()'. */ -uint64_t msm_gem_iova (struct drm_gem_object *obj,int id) +uint64_t msm_gem_iova (struct drm_gem_object *obj, +struct msm_gem_address_space *aspace) {struct msm_gem_object *msm_obj =to_msm_bo (obj); +int id = aspace ? aspace->id :0 ;WARN_ON (!msm_obj->domain[id].iova);return msm_obj->domain[id].iova; } -void msm_gem_put_iova (struct drm_gem_object *obj,int id) +void msm_gem_put_iova (struct drm_gem_object *obj, +struct msm_gem_address_space *aspace) {// XXX TODO .. // NOTE: probably don't need a _locked() version.. we wouldn't
drivers/gpu/drm/msm/msm_gem.h +1 -0
@@ -33,6 +33,7 @@ struct msm_gem_address_space {struct drm_mm mm;struct msm_mmu *mmu;struct kref kref; +int id;/* temporary */ };struct msm_gem_vma {
drivers/gpu/drm/msm/msm_gem_submit.c +2 -2
@@ -158,7 +158,7 @@ static void submit_unlock_unpin_bo(struct msm_gem_submit *submit, int i)struct msm_gem_object *msm_obj = submit->bos[i].obj;if (submit->bos[i].flags &BO_PINNED ) -msm_gem_put_iova (&msm_obj->base, submit->gpu->id); +msm_gem_put_iova (&msm_obj->base, submit->gpu->aspace);if (submit->bos[i].flags &BO_LOCKED )ww_mutex_unlock (&msm_obj->resv->lock);
@@ -246,7 +246,7 @@ static int submit_pin_objects(struct msm_gem_submit *submit)/* if locking succeeded, pin bo: */ ret =msm_gem_get_iova_locked (&msm_obj->base, - submit->gpu->id, &iova); + submit->gpu->aspace, &iova);if (ret)break ;
drivers/gpu/drm/msm/msm_gpu.c +3 -3
@@ -416,7 +416,7 @@ static void retire_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit)struct msm_gem_object *msm_obj = submit->bos[i].obj;/* move to inactive: */ msm_gem_move_to_inactive (&msm_obj->base); -msm_gem_put_iova (&msm_obj->base, gpu->id); +msm_gem_put_iova (&msm_obj->base, gpu->aspace);drm_gem_object_unreference (&msm_obj->base); }
@@ -498,7 +498,7 @@ void msm_gpu_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit,/* submit takes a reference to the bo and iova until retired: */ drm_gem_object_reference (&msm_obj->base);msm_gem_get_iova_locked (&msm_obj->base, - submit->gpu->id, &iova); + submit->gpu->aspace, &iova);if (submit->bos[i].flags &MSM_SUBMIT_BO_WRITE )msm_gem_move_to_active (&msm_obj->base, gpu, true, submit->fence);
@@ -695,7 +695,7 @@ void msm_gpu_cleanup(struct msm_gpu *gpu)if (gpu->rb) {if (gpu->rb_iova) -msm_gem_put_iova (gpu->rb->bo, gpu->id); +msm_gem_put_iova (gpu->rb->bo, gpu->aspace);msm_ringbuffer_destroy (gpu->rb); }
Signature · 6 lines
2.9.4 _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH 4/6 drm/msm: refactor how we handle vram carveout buffers
In reply to a message not in the archivePull some of the logic out into msm_gem_new() (since we don't need to care about the imported-bo case), and don't defer allocating pages. The latter is generally a good idea, since if we are using VRAM carveout to allocate contiguous buffers (ie. no IOMMU), the allocation is more likely to fail. So failing at allocation time is a more sane option. Plus this simplifies things in the next patch.
--- drivers/gpu/drm/msm/msm_gem.c | 48 ++++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 21 deletions(-)
drivers/gpu/drm/msm/msm_gem.c +27 -21
@@ -324,12 +324,8 @@ int msm_gem_get_iova_locked(struct drm_gem_object *obj,if (IS_ERR (pages))return PTR_ERR (pages); -if (iommu_present (&platform_bus_type)) { - ret =msm_gem_map_vma (priv->aspace[id], &msm_obj->domain[id], - msm_obj->sgt, obj->size >>PAGE_SHIFT ); - }else { - msm_obj->domain[id].iova =physaddr (obj); - } + ret =msm_gem_map_vma (priv->aspace[id], &msm_obj->domain[id], + msm_obj->sgt, obj->size >>PAGE_SHIFT ); }if (!ret)
@@ -765,7 +761,6 @@ static int msm_gem_new_impl(struct drm_device *dev, {struct msm_drm_private *priv = dev->dev_private;struct msm_gem_object *msm_obj; -bool use_vram = false;switch (flags &MSM_BO_CACHE_MASK ) {case MSM_BO_UNCACHED :
@@ -778,21 +773,10 @@ static int msm_gem_new_impl(struct drm_device *dev,return -EINVAL ; } -if (!iommu_present (&platform_bus_type)) - use_vram = true; -else if ((flags &MSM_BO_STOLEN ) && priv->vram.size) - use_vram = true; - -if (WARN_ON (use_vram && !priv->vram.size)) -return -EINVAL ; - msm_obj =kzalloc (sizeof (*msm_obj),GFP_KERNEL );if (!msm_obj)return -ENOMEM ; -if (use_vram) - msm_obj->vram_node = &msm_obj->domain[0 ].node; - msm_obj->flags = flags; msm_obj->madv =MSM_MADV_WILLNEED ;
@@ -814,13 +798,23 @@ static int msm_gem_new_impl(struct drm_device *dev,struct drm_gem_object *msm_gem_new (struct drm_device *dev,uint32_t size,uint32_t flags) { +struct msm_drm_private *priv = dev->dev_private;struct drm_gem_object *obj =NULL ; +bool use_vram = false;int ret;WARN_ON (!mutex_is_locked (&dev->struct_mutex)); size =PAGE_ALIGN (size); +if (!iommu_present (&platform_bus_type)) + use_vram = true; +else if ((flags &MSM_BO_STOLEN ) && priv->vram.size) + use_vram = true; + +if (WARN_ON (use_vram && !priv->vram.size)) +return ERR_PTR (-EINVAL ); +/* Disallow zero sized objects as they make the underlying * infrastructure grumpy */
@@ -831,12 +825,24 @@ struct drm_gem_object *msm_gem_new(struct drm_device *dev,if (ret) goto fail; -if (use_pages (obj)) { +if (use_vram) { +struct msm_gem_object *msm_obj =to_msm_bo (obj); +struct page **pages; + + msm_obj->vram_node = &msm_obj->domain[0 ].node; +drm_gem_private_object_init (dev, obj, size); + + msm_obj->pages =get_pages (obj); + pages =get_pages (obj); +if (IS_ERR (pages)) { + ret =PTR_ERR (pages); + goto fail; + } + msm_obj->domain[0 ].iova =physaddr (obj); + }else { ret =drm_gem_object_init (dev, obj, size);if (ret) goto fail; - }else { -drm_gem_private_object_init (dev, obj, size); }return obj;
Signature · 6 lines
2.9.4 _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH 5/6 drm/msm: support for an arbitrary number of address spaces
In reply to a message not in the archiveIt means we have to do a list traversal where we once had an index into a table. But the list will normally have one or two entries.
--- drivers/gpu/drm/msm/msm_gem.c | 138 +++++++++++++++++++++++++++++------------- drivers/gpu/drm/msm/msm_gem.h | 4 +- 2 files changed, 99 insertions(+), 43 deletions(-)
drivers/gpu/drm/msm/msm_gem.c +96 -42
@@ -283,21 +283,59 @@ uint64_t msm_gem_mmap_offset(struct drm_gem_object *obj)return offset; } +static struct msm_gem_vma *add_vma (struct drm_gem_object *obj, +struct msm_gem_address_space *aspace) +{ +struct msm_gem_object *msm_obj =to_msm_bo (obj); +struct msm_gem_vma *vma; + + vma =kzalloc (sizeof (*vma),GFP_KERNEL ); +if (!vma) +return ERR_PTR (-ENOMEM ); + + vma->aspace = aspace; + +list_add_tail (&vma->list, &msm_obj->vmas); + +return vma; +} + +static struct msm_gem_vma *lookup_vma (struct drm_gem_object *obj, +struct msm_gem_address_space *aspace) +{ +struct msm_gem_object *msm_obj =to_msm_bo (obj); +struct msm_gem_vma *vma; + +WARN_ON (!mutex_is_locked (&obj->dev->struct_mutex)); + +list_for_each_entry (vma, &msm_obj->vmas, list) { +if (vma->aspace == aspace) +return vma; + } + +return NULL ; +} + +static void del_vma (struct msm_gem_vma *vma) +{ +if (!vma) +return ; + +list_del (&vma->list); +kfree (vma); +} +static void put_iova (struct drm_gem_object *obj) { -struct drm_device *dev = obj->dev; -struct msm_drm_private *priv = obj->dev->dev_private;struct msm_gem_object *msm_obj =to_msm_bo (obj); -int id; +struct msm_gem_vma *vma, *tmp; -WARN_ON (!mutex_is_locked (&dev->struct_mutex)); +WARN_ON (!mutex_is_locked (&obj->dev->struct_mutex)); -for (id =0 ; id <ARRAY_SIZE (msm_obj->domain); id++) { -if (!priv->aspace[id]) -continue ; -msm_gem_unmap_vma (priv->aspace[id], - &msm_obj->domain[id], msm_obj->sgt); +list_for_each_entry_safe (vma, tmp, &msm_obj->vmas, list) { +msm_gem_unmap_vma (vma->aspace, vma, msm_obj->sgt); +del_vma (vma); } }
@@ -312,24 +350,37 @@ int msm_gem_get_iova_locked(struct drm_gem_object *obj, struct msm_gem_address_space *aspace, uint64_t *iova) { struct msm_gem_object *msm_obj = to_msm_bo(obj); -int id = aspace ? aspace->id :0 ; +struct msm_gem_vma *vma;int ret =0 ;WARN_ON (!mutex_is_locked (&obj->dev->struct_mutex)); -if (!msm_obj->domain[id].iova) { -struct msm_drm_private *priv = obj->dev->dev_private; -struct page **pages =get_pages (obj); + vma =lookup_vma (obj, aspace); -if (IS_ERR (pages)) -return PTR_ERR (pages); +if (!vma) { +struct page **pages; + + vma =add_vma (obj, aspace); +if (IS_ERR (vma)) +return PTR_ERR (vma); + + pages =get_pages (obj); +if (IS_ERR (pages)) { + ret =PTR_ERR (pages); + goto fail; + } - ret =msm_gem_map_vma (priv->aspace[id], &msm_obj->domain[id], - msm_obj->sgt, obj->size >>PAGE_SHIFT ); + ret =msm_gem_map_vma (aspace, vma, msm_obj->sgt, + obj->size >>PAGE_SHIFT ); +if (ret) + goto fail; } -if (!ret) - *iova = msm_obj->domain[id].iova; + *iova = vma->iova; +return 0 ; + +fail: +del_vma (vma);return ret; }
@@ -338,22 +389,12 @@ int msm_gem_get_iova_locked(struct drm_gem_object *obj,int msm_gem_get_iova (struct drm_gem_object *obj,struct msm_gem_address_space *aspace,uint64_t *iova) { -struct msm_gem_object *msm_obj =to_msm_bo (obj); -int id = aspace ? aspace->id :0 ;int ret; -/* this is safe right now because we don't unmap until the -* bo is deleted: -*/ -if (msm_obj->domain[id].iova) { -might_lock (&obj->dev->struct_mutex); - *iova = msm_obj->domain[id].iova; -return 0 ; - } -mutex_lock (&obj->dev->struct_mutex); ret =msm_gem_get_iova_locked (obj, aspace, iova);mutex_unlock (&obj->dev->struct_mutex); +return ret; }
@@ -363,10 +404,14 @@ int msm_gem_get_iova(struct drm_gem_object *obj,uint64_t msm_gem_iova (struct drm_gem_object *obj,struct msm_gem_address_space *aspace) { -struct msm_gem_object *msm_obj =to_msm_bo (obj); -int id = aspace ? aspace->id :0 ; -WARN_ON (!msm_obj->domain[id].iova); -return msm_obj->domain[id].iova; +struct msm_gem_vma *vma; + +mutex_lock (&obj->dev->struct_mutex); + vma =lookup_vma (obj, aspace); +mutex_unlock (&obj->dev->struct_mutex); +WARN_ON (!vma); + +return vma ? vma->iova :0 ; } void msm_gem_put_iova(struct drm_gem_object *obj,
@@ -624,11 +669,10 @@ void msm_gem_describe(struct drm_gem_object *obj, struct seq_file *m)struct msm_gem_object *msm_obj =to_msm_bo (obj);struct reservation_object *robj = msm_obj->resv;struct reservation_object_list *fobj; -struct msm_drm_private *priv = obj->dev->dev_private;struct dma_fence *fence; +struct msm_gem_vma *vma;uint64_t off =drm_vma_node_start (&obj->vma_node);const char *madv; -unsigned id;WARN_ON (!mutex_is_locked (&obj->dev->struct_mutex));
@@ -650,8 +694,9 @@ void msm_gem_describe(struct drm_gem_object *obj, struct seq_file *m) obj->name,kref_read (&obj->refcount), off, msm_obj->vaddr); -for (id =0 ; id < priv->num_aspaces; id++) -seq_printf (m," %08llx" , msm_obj->domain[id].iova); +/* FIXME: we need to print the address space here too */ +list_for_each_entry (vma, &msm_obj->vmas, list) +seq_printf (m," %08llx" , vma->iova);seq_printf (m," %zu%s\n" , obj->size, madv);
@@ -788,6 +833,8 @@ static int msm_gem_new_impl(struct drm_device *dev, }INIT_LIST_HEAD (&msm_obj->submit_entry); +INIT_LIST_HEAD (&msm_obj->vmas); +list_add_tail (&msm_obj->mm_list, &priv->inactive_list); *obj = &msm_obj->base;
@@ -826,19 +873,26 @@ struct drm_gem_object *msm_gem_new(struct drm_device *dev, goto fail;if (use_vram) { -struct msm_gem_object *msm_obj =to_msm_bo (obj); +struct msm_gem_vma *vma;struct page **pages; - msm_obj->vram_node = &msm_obj->domain[0 ].node; + vma =add_vma (obj,NULL ); +if (IS_ERR (vma)) { + ret =PTR_ERR (vma); + goto fail; + } + +to_msm_bo (obj)->vram_node = &vma->node; +drm_gem_private_object_init (dev, obj, size); - msm_obj->pages =get_pages (obj); pages =get_pages (obj);if (IS_ERR (pages)) { ret =PTR_ERR (pages); goto fail; } - msm_obj->domain[0 ].iova =physaddr (obj); + + vma->iova =physaddr (obj); }else { ret =drm_gem_object_init (dev, obj, size);if (ret)
drivers/gpu/drm/msm/msm_gem.h +3 -1
@@ -39,6 +39,8 @@ struct msm_gem_address_space {struct msm_gem_vma {struct drm_mm_node node;uint64_t iova; +struct msm_gem_address_space *aspace; +struct list_head list;/* node in msm_gem_object::vmas */ };struct msm_gem_object {
@@ -78,7 +80,7 @@ struct msm_gem_object {struct sg_table *sgt;void *vaddr; -struct msm_gem_vma domain[NUM_DOMAINS ]; +struct list_head vmas;/* list of msm_gem_vma */ /* normally (resv == &_resv) except for imported bo's */ struct reservation_object *resv;
Signature · 6 lines
2.9.4 _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH 6/6 drm/msm: remove address-space id
In reply to a message not in the archiveNow that the msm_gem supports an arbitrary number of vma's, we no longer need to assign an id (index) to each address space. So rip out the associated code.
--- drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 7 ------- drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 7 ------- drivers/gpu/drm/msm/msm_drv.c | 16 ---------------- drivers/gpu/drm/msm/msm_drv.h | 11 ----------- drivers/gpu/drm/msm/msm_gem.h | 1 - drivers/gpu/drm/msm/msm_gpu.c | 2 -- drivers/gpu/drm/msm/msm_gpu.h | 1 - drivers/gpu/drm/msm/msm_kms.h | 1 - 8 files changed, 46 deletions(-)
drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c +0 -7
@@ -548,13 +548,6 @@ struct msm_kms *mdp4_kms_init(struct drm_device *dev) aspace =NULL ; } - kms->id =msm_register_address_space (dev, aspace); -if (kms->id <0 ) { - ret = kms->id; -dev_err (dev->dev,"failed to register mdp4 iommu: %d\n" , ret); - goto fail; - } - ret =modeset_init (mdp4_kms);if (ret) {dev_err (dev->dev,"modeset_init failed: %d\n" , ret);
drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c +0 -7
@@ -746,13 +746,6 @@ struct msm_kms *mdp5_kms_init(struct drm_device *dev) aspace =NULL ;; } - kms->id =msm_register_address_space (dev, aspace); -if (kms->id <0 ) { - ret = kms->id; -dev_err (&pdev->dev,"failed to register mdp5 iommu: %d\n" , ret); - goto fail; - } - ret =modeset_init (mdp5_kms);if (ret) {dev_err (&pdev->dev,"modeset_init failed: %d\n" , ret);
drivers/gpu/drm/msm/msm_drv.c +0 -16
@@ -51,22 +51,6 @@ static const struct drm_mode_config_funcs mode_config_funcs = { .atomic_state_free = msm_atomic_state_free, }; -#include "msm_gem.h" /* temporary */ -int msm_register_address_space (struct drm_device *dev, -struct msm_gem_address_space *aspace) -{ -struct msm_drm_private *priv = dev->dev_private; - -if (WARN_ON (priv->num_aspaces >=ARRAY_SIZE (priv->aspace))) -return -EINVAL ; - - priv->aspace[priv->num_aspaces] = aspace; - - aspace->id = priv->num_aspaces++; - -return aspace->id; -} -#ifdef CONFIG_DRM_MSM_REGISTER_LOGGING static bool reglog = false;MODULE_PARM_DESC (reglog,"Enable register read/write logging" );
drivers/gpu/drm/msm/msm_drv.h +0 -11
@@ -123,14 +123,6 @@ struct msm_drm_private {uint32_t pending_crtcs;wait_queue_head_t pending_crtcs_event; -/* Registered address spaces.. currently this is fixed per # of -* iommu's. Ie. one for display block and one for gpu block. -* Eventually, to do per-process gpu pagetables, we'll want one -* of these per-process. -*/ -unsigned int num_aspaces; -struct msm_gem_address_space *aspace[NUM_DOMAINS ]; -unsigned int num_planes;struct drm_plane *planes[16 ];
@@ -183,9 +175,6 @@ struct drm_atomic_state *msm_atomic_state_alloc(struct drm_device *dev);void msm_atomic_state_clear (struct drm_atomic_state *state);void msm_atomic_state_free (struct drm_atomic_state *state); -int msm_register_address_space (struct drm_device *dev, -struct msm_gem_address_space *aspace); -void msm_gem_unmap_vma (struct msm_gem_address_space *aspace,struct msm_gem_vma *vma,struct sg_table *sgt); int msm_gem_map_vma(struct msm_gem_address_space *aspace,
drivers/gpu/drm/msm/msm_gem.h +0 -1
@@ -33,7 +33,6 @@ struct msm_gem_address_space {struct drm_mm mm;struct msm_mmu *mmu;struct kref kref; -int id;/* temporary */ };struct msm_gem_vma {
drivers/gpu/drm/msm/msm_gpu.c +0 -2
@@ -660,8 +660,6 @@ int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev, }else {dev_info (drm->dev,"%s: no IOMMU, fallback to VRAM carveout!\n" , name); } - gpu->id =msm_register_address_space (drm, gpu->aspace); -/* Create ringbuffer: */ mutex_lock (&drm->struct_mutex);
drivers/gpu/drm/msm/msm_gpu.h +0 -1
@@ -99,7 +99,6 @@ struct msm_gpu {int irq;struct msm_gem_address_space *aspace; -int id;/* Power Control: */ struct regulator *gpu_reg, *gpu_cx;
drivers/gpu/drm/msm/msm_kms.h +0 -1
@@ -75,7 +75,6 @@ struct msm_kms {int irq;/* mapper-id used to request GEM buffer mapped for scanout: */ -int id;struct msm_gem_address_space *aspace; };
Signature · 6 lines
2.9.4 _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
Jordan Crouse
Acked-byRe: [PATCH 1/6] drm/msm/mdp5: kill pipe_lock
In reply to a message not in the archiveQuoted 5 lines · Rob Clark
It serves no purpose, things should be sufficiently synchronized already by atomic framework. And it is somewhat awkward to be holding a spinlock when
msm_gem_iova()is going to start needing to grab a mutex.Signed-off-by Rob Clark <[email protected]>
Quoted 63 lines
--- drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 10 ---------- 1 file changed, 10 deletions(-)drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c +0
-10@@ -22,8 +22,6 @@struct mdp5_plane {struct drm_plane base; -spinlock_t pipe_lock;/* protect REG_MDP5_PIPE_* registers */ -uint32_t nformats;uint32_t formats[32 ]; };@@ -875,7 +873,6 @@ static int mdp5_plane_mode_set(struct drm_plane *plane, struct drm_crtc *crtc, struct drm_framebuffer *fb, struct drm_rect *src, struct drm_rect *dest) { - struct mdp5_plane *mdp5_plane = to_mdp5_plane(plane); struct drm_plane_state *pstate = plane->state;struct mdp5_hw_pipe *hwpipe =to_mdp5_plane_state (pstate)->hwpipe;struct mdp5_kms *mdp5_kms =get_kms (plane);@@ -896,7 +893,6 @@ static int mdp5_plane_mode_set(struct drm_plane *plane,uint32_t src_img_w, src_img_h;uint32_t src_x_r;int crtc_x_r; -unsigned long flags;int ret; nplanes = fb->format->num_planes;@@ -975,8 +971,6 @@ static int mdp5_plane_mode_set(struct drm_plane *plane, hflip = !!(rotation &DRM_REFLECT_X ); vflip = !!(rotation &DRM_REFLECT_Y ); -spin_lock_irqsave (&mdp5_plane->pipe_lock, flags); - mdp5_hwpipe_mode_set(mdp5_kms, hwpipe, fb, &step, &pe, config, hdecm, vdecm, hflip, vflip, crtc_x, crtc_y, crtc_w, crtc_h,@@ -989,8 +983,6 @@ static int mdp5_plane_mode_set(struct drm_plane *plane, src_img_w, src_img_h, src_x_r, src_y, src_w, src_h); -spin_unlock_irqrestore (&mdp5_plane->pipe_lock, flags); - plane->fb = fb;return ret;@@ -1132,8 +1124,6 @@ struct drm_plane *mdp5_plane_init(struct drm_device *dev, mdp5_plane->nformats =mdp_get_formats (mdp5_plane->formats,ARRAY_SIZE (mdp5_plane->formats), false); -spin_lock_init (&mdp5_plane->pipe_lock); -if (type ==DRM_PLANE_TYPE_CURSOR ) ret = drm_universal_plane_init(dev, plane, 0xff, &mdp5_cursor_plane_funcs,Signature · 1 line
2.9.4
Signature · 6 lines
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
Re: [PATCH 2/6] drm/msm/mdp4+5: move aspace/id to base class
In reply to Rob ClarkQuoted 2 lines · Rob Clark
Before we can shift to passing the address-space object to
_get_iova(), we need to fix a few places (dsi+fbdev) that were hard-coding the adress
nit - adress -> address. Otherwise,
Quoted 439 lines
space id. That gets somewhat easier if we just move these to the kms base class.
Prep work for next patch.
Signed-off-by Rob Clark <[email protected]>--- drivers/gpu/drm/msm/dsi/dsi_host.c | 10 ++++++++-- drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 9 ++++++--- drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 14 +++++++------- drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h | 4 ---- drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c | 15 +++++++++------ drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 6 ++++-- drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 10 +++++----- drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 4 ---- drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 16 ++++++++++------ drivers/gpu/drm/msm/msm_fbdev.c | 4 +++- drivers/gpu/drm/msm/msm_kms.h | 4 ++++ 11 files changed, 56 insertions(+), 40 deletions(-)drivers/gpu/drm/msm/dsi/dsi_host.c +8
-2@@ -32,6 +32,7 @@#include "dsi.xml.h" #include "sfpb.xml.h" #include "dsi_cfg.h" +#include "msm_kms.h" static int dsi_get_version (const void __iomem *base,u32 *major,u32 *minor) {@@ -975,6 +976,7 @@ static void dsi_wait4video_eng_busy(struct msm_dsi_host *msm_host)static int dsi_tx_buf_alloc (struct msm_dsi_host *msm_host,int size) {struct drm_device *dev = msm_host->dev; +struct msm_drm_private *priv = dev->dev_private;const struct msm_dsi_cfg_handler *cfg_hnd = msm_host->cfg_hnd;int ret;uint64_t iova;@@ -991,7 +993,8 @@ static int dsi_tx_buf_alloc(struct msm_dsi_host *msm_host, int size)return ret; } - ret =msm_gem_get_iova_locked (msm_host->tx_gem_obj,0 , &iova); + ret =msm_gem_get_iova_locked (msm_host->tx_gem_obj, + priv->kms->id, &iova);mutex_unlock (&dev->struct_mutex);if (ret) {pr_err ("%s: failed to get iova, %d\n" , __func__, ret);@@ -1141,12 +1144,15 @@ static int dsi_long_read_resp(u8 *buf, const struct mipi_dsi_msg *msg)static int dsi_cmd_dma_tx (struct msm_dsi_host *msm_host,int len) {const struct msm_dsi_cfg_handler *cfg_hnd = msm_host->cfg_hnd; +struct drm_device *dev = msm_host->dev; +struct msm_drm_private *priv = dev->dev_private;int ret;uint64_t dma_base;bool triggered;if (cfg_hnd->major ==MSM_DSI_VER_MAJOR_6G ) { - ret =msm_gem_get_iova (msm_host->tx_gem_obj,0 , &dma_base); + ret =msm_gem_get_iova (msm_host->tx_gem_obj, + priv->kms->id, &dma_base);if (ret) {pr_err ("%s: failed to get iova: %d\n" , __func__, ret);return ret;drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c +6
-3@@ -126,8 +126,9 @@ static void unref_cursor_worker(struct drm_flip_work *work, void *val)struct mdp4_crtc *mdp4_crtc = container_of(work, struct mdp4_crtc, unref_cursor_work);struct mdp4_kms *mdp4_kms =get_kms (&mdp4_crtc->base); +struct msm_kms *kms = &mdp4_kms->base.base; -msm_gem_put_iova (val, mdp4_kms->id); +msm_gem_put_iova (val, kms->id);drm_gem_object_unreference_unlocked (val); }@@ -360,6 +361,7 @@ static void update_cursor(struct drm_crtc *crtc) {struct mdp4_crtc *mdp4_crtc =to_mdp4_crtc (crtc);struct mdp4_kms *mdp4_kms =get_kms (crtc); +struct msm_kms *kms = &mdp4_kms->base.base;enum mdp4_dma dma = mdp4_crtc->dma;unsigned long flags;@@ -372,7 +374,7 @@ static void update_cursor(struct drm_crtc *crtc)if (next_bo) {/* take a obj ref + iova ref when we start scanning out: */ drm_gem_object_reference (next_bo); -msm_gem_get_iova_locked (next_bo, mdp4_kms->id, &iova); +msm_gem_get_iova_locked (next_bo, kms->id, &iova);/* enable cursor: */ mdp4_write(mdp4_kms, REG_MDP4_DMA_CURSOR_SIZE(dma),@@ -409,6 +411,7 @@ static int mdp4_crtc_cursor_set(struct drm_crtc *crtc, {struct mdp4_crtc *mdp4_crtc =to_mdp4_crtc (crtc);struct mdp4_kms *mdp4_kms =get_kms (crtc); +struct msm_kms *kms = &mdp4_kms->base.base;struct drm_device *dev = crtc->dev;struct drm_gem_object *cursor_bo, *old_bo;unsigned long flags;@@ -429,7 +432,7 @@ static int mdp4_crtc_cursor_set(struct drm_crtc *crtc, }if (cursor_bo) { - ret =msm_gem_get_iova (cursor_bo, mdp4_kms->id, &iova); + ret =msm_gem_get_iova (cursor_bo, kms->id, &iova);if (ret) goto fail; }else {drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c +7
-7@@ -160,10 +160,10 @@ static void mdp4_destroy(struct msm_kms *kms) {struct mdp4_kms *mdp4_kms =to_mdp4_kms (to_mdp_kms (kms));struct device *dev = mdp4_kms->dev->dev; -struct msm_gem_address_space *aspace = mdp4_kms->aspace; +struct msm_gem_address_space *aspace = kms->aspace;if (mdp4_kms->blank_cursor_iova) -msm_gem_put_iova (mdp4_kms->blank_cursor_bo, mdp4_kms->id); +msm_gem_put_iova (mdp4_kms->blank_cursor_bo, kms->id);drm_gem_object_unreference_unlocked (mdp4_kms->blank_cursor_bo);if (aspace) {@@ -536,7 +536,7 @@ struct msm_kms *mdp4_kms_init(struct drm_device *dev) goto fail; } - mdp4_kms->aspace = aspace; + kms->aspace = aspace; ret = aspace->mmu->funcs->attach (aspace->mmu, iommu_ports,ARRAY_SIZE (iommu_ports));@@ -548,9 +548,9 @@ struct msm_kms *mdp4_kms_init(struct drm_device *dev) aspace =NULL ; } - mdp4_kms->id =msm_register_address_space (dev, aspace); -if (mdp4_kms->id <0 ) { - ret = mdp4_kms->id; + kms->id =msm_register_address_space (dev, aspace); +if (kms->id <0 ) { + ret = kms->id;dev_err (dev->dev,"failed to register mdp4 iommu: %d\n" , ret); goto fail; }@@ -571,7 +571,7 @@ struct msm_kms *mdp4_kms_init(struct drm_device *dev) goto fail; } - ret =msm_gem_get_iova (mdp4_kms->blank_cursor_bo, mdp4_kms->id, + ret =msm_gem_get_iova (mdp4_kms->blank_cursor_bo, kms->id, &mdp4_kms->blank_cursor_iova);if (ret) {dev_err (dev->dev,"could not pin blank-cursor bo: %d\n" , ret);drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h +0
-4@@ -32,9 +32,6 @@ struct mdp4_kms {int rev; -/* mapper-id used to request GEM buffer mapped for scanout: */ -int id; -void __iomem *mmio;struct regulator *vdd;@@ -43,7 +40,6 @@ struct mdp4_kms {struct clk *pclk;struct clk *lut_clk;struct clk *axi_clk; -struct msm_gem_address_space *aspace;struct mdp_irq error_handler;drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c +9
-6@@ -103,13 +103,14 @@ static int mdp4_plane_prepare_fb(struct drm_plane *plane, {struct mdp4_plane *mdp4_plane =to_mdp4_plane (plane);struct mdp4_kms *mdp4_kms =get_kms (plane); +struct msm_kms *kms = &mdp4_kms->base.base;struct drm_framebuffer *fb = new_state->fb;if (!fb)return 0 ;DBG ("%s: prepare: FB[%u]" , mdp4_plane->name, fb->base.id); -return msm_framebuffer_prepare (fb, mdp4_kms->id); +return msm_framebuffer_prepare (fb, kms->id); } static void mdp4_plane_cleanup_fb(struct drm_plane *plane,@@ -117,13 +118,14 @@ static void mdp4_plane_cleanup_fb(struct drm_plane *plane, {struct mdp4_plane *mdp4_plane =to_mdp4_plane (plane);struct mdp4_kms *mdp4_kms =get_kms (plane); +struct msm_kms *kms = &mdp4_kms->base.base;struct drm_framebuffer *fb = old_state->fb;if (!fb)return ;DBG ("%s: cleanup: FB[%u]" , mdp4_plane->name, fb->base.id); -msm_framebuffer_cleanup (fb, mdp4_kms->id); +msm_framebuffer_cleanup (fb, kms->id); }@@ -161,6 +163,7 @@ static 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); +struct msm_kms *kms = &mdp4_kms->base.base;enum mdp4_pipe pipe = mdp4_plane->pipe; mdp4_write(mdp4_kms, REG_MDP4_PIPE_SRC_STRIDE_A(pipe),@@ -172,13 +175,13 @@ static void mdp4_plane_set_scanout(struct drm_plane *plane, MDP4_PIPE_SRC_STRIDE_B_P3(fb->pitches[3]));mdp4_write (mdp4_kms,REG_MDP4_PIPE_SRCP0_BASE (pipe), -msm_framebuffer_iova (fb, mdp4_kms->id,0 )); +msm_framebuffer_iova (fb, kms->id,0 ));mdp4_write (mdp4_kms,REG_MDP4_PIPE_SRCP1_BASE (pipe), -msm_framebuffer_iova (fb, mdp4_kms->id,1 )); +msm_framebuffer_iova (fb, kms->id,1 ));mdp4_write (mdp4_kms,REG_MDP4_PIPE_SRCP2_BASE (pipe), -msm_framebuffer_iova (fb, mdp4_kms->id,2 )); +msm_framebuffer_iova (fb, kms->id,2 ));mdp4_write (mdp4_kms,REG_MDP4_PIPE_SRCP3_BASE (pipe), -msm_framebuffer_iova (fb, mdp4_kms->id,3 )); +msm_framebuffer_iova (fb, kms->id,3 )); plane->fb = fb; }drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c +4
-2@@ -160,8 +160,9 @@ static void unref_cursor_worker(struct drm_flip_work *work, void *val)struct mdp5_crtc *mdp5_crtc = container_of(work, struct mdp5_crtc, unref_cursor_work);struct mdp5_kms *mdp5_kms =get_kms (&mdp5_crtc->base); +struct msm_kms *kms = &mdp5_kms->base.base; -msm_gem_put_iova (val, mdp5_kms->id); +msm_gem_put_iova (val, kms->id);drm_gem_object_unreference_unlocked (val); }@@ -724,6 +725,7 @@ static int mdp5_crtc_cursor_set(struct drm_crtc *crtc,struct mdp5_pipeline *pipeline = &mdp5_cstate->pipeline;struct drm_device *dev = crtc->dev;struct mdp5_kms *mdp5_kms =get_kms (crtc); +struct msm_kms *kms = &mdp5_kms->base.base;struct drm_gem_object *cursor_bo, *old_bo =NULL ;uint32_t blendcfg, stride;uint64_t cursor_addr;@@ -758,7 +760,7 @@ static int mdp5_crtc_cursor_set(struct drm_crtc *crtc,if (!cursor_bo)return -ENOENT ; - ret =msm_gem_get_iova (cursor_bo, mdp5_kms->id, &cursor_addr); + ret =msm_gem_get_iova (cursor_bo, kms->id, &cursor_addr);if (ret)return -EINVAL ;drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c +5
-5@@ -160,7 +160,7 @@ static void mdp5_set_encoder_mode(struct msm_kms *kms,static void mdp5_kms_destroy (struct msm_kms *kms) {struct mdp5_kms *mdp5_kms =to_mdp5_kms (to_mdp_kms (kms)); -struct msm_gem_address_space *aspace = mdp5_kms->aspace; +struct msm_gem_address_space *aspace = kms->aspace;int i;for (i =0 ; i < mdp5_kms->num_hwmixers; i++)@@ -731,7 +731,7 @@ struct msm_kms *mdp5_kms_init(struct drm_device *dev) goto fail; } - mdp5_kms->aspace = aspace; + kms->aspace = aspace; ret = aspace->mmu->funcs->attach (aspace->mmu, iommu_ports,ARRAY_SIZE (iommu_ports));@@ -746,9 +746,9 @@ struct msm_kms *mdp5_kms_init(struct drm_device *dev) aspace =NULL ;; } - mdp5_kms->id =msm_register_address_space (dev, aspace); -if (mdp5_kms->id <0 ) { - ret = mdp5_kms->id; + kms->id =msm_register_address_space (dev, aspace); +if (kms->id <0 ) { + ret = kms->id;dev_err (&pdev->dev,"failed to register mdp5 iommu: %d\n" , ret); goto fail; }drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h +0
-4@@ -55,10 +55,6 @@ struct mdp5_kms {struct mdp5_state *state;struct drm_modeset_lock state_lock; -/* mapper-id used to request GEM buffer mapped for scanout: */ -int id; -struct msm_gem_address_space *aspace; -struct mdp5_smp *smp;struct mdp5_ctl_manager *ctlm;drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c +10
-6@@ -270,26 +270,28 @@ static int mdp5_plane_prepare_fb(struct drm_plane *plane, struct drm_plane_state *new_state) {struct mdp5_kms *mdp5_kms =get_kms (plane); +struct msm_kms *kms = &mdp5_kms->base.base;struct drm_framebuffer *fb = new_state->fb;if (!new_state->fb)return 0 ;DBG ("%s: prepare: FB[%u]" , plane->name, fb->base.id); -return msm_framebuffer_prepare (fb, mdp5_kms->id); +return msm_framebuffer_prepare (fb, kms->id); }static void mdp5_plane_cleanup_fb (struct drm_plane *plane,struct drm_plane_state *old_state) {struct mdp5_kms *mdp5_kms =get_kms (plane); +struct msm_kms *kms = &mdp5_kms->base.base;struct drm_framebuffer *fb = old_state->fb;if (!fb)return ;DBG ("%s: cleanup: FB[%u]" , plane->name, fb->base.id); -msm_framebuffer_cleanup (fb, mdp5_kms->id); +msm_framebuffer_cleanup (fb, kms->id); }#define FRAC_16_16 (mult, div) (((mult) << 16) / (div))@@ -492,6 +494,8 @@ static void set_scanout_locked(struct mdp5_kms *mdp5_kms,enum mdp5_pipe pipe, struct drm_framebuffer *fb) { + struct msm_kms *kms = &mdp5_kms->base.base; +mdp5_write (mdp5_kms,REG_MDP5_PIPE_SRC_STRIDE_A (pipe),MDP5_PIPE_SRC_STRIDE_A_P0 (fb->pitches[0 ]) |MDP5_PIPE_SRC_STRIDE_A_P1 (fb->pitches[1 ]));@@ -501,13 +505,13 @@ static void set_scanout_locked(struct mdp5_kms *mdp5_kms, MDP5_PIPE_SRC_STRIDE_B_P3(fb->pitches[3]));mdp5_write (mdp5_kms,REG_MDP5_PIPE_SRC0_ADDR (pipe), -msm_framebuffer_iova (fb, mdp5_kms->id,0 )); +msm_framebuffer_iova (fb, kms->id,0 ));mdp5_write (mdp5_kms,REG_MDP5_PIPE_SRC1_ADDR (pipe), -msm_framebuffer_iova (fb, mdp5_kms->id,1 )); +msm_framebuffer_iova (fb, kms->id,1 ));mdp5_write (mdp5_kms,REG_MDP5_PIPE_SRC2_ADDR (pipe), -msm_framebuffer_iova (fb, mdp5_kms->id,2 )); +msm_framebuffer_iova (fb, kms->id,2 ));mdp5_write (mdp5_kms,REG_MDP5_PIPE_SRC3_ADDR (pipe), -msm_framebuffer_iova (fb, mdp5_kms->id,3 )); +msm_framebuffer_iova (fb, kms->id,3 )); }/* Note: mdp5_plane->pipe_lock must be locked */ drivers/gpu/drm/msm/msm_fbdev.c +3
-1@@ -20,6 +20,7 @@#include "drm_crtc.h" #include "drm_fb_helper.h" #include "msm_gem.h" +#include "msm_kms.h" extern int msm_gem_mmap_obj (struct drm_gem_object *obj,struct vm_area_struct *vma);@@ -73,6 +74,7 @@ static int msm_fbdev_create(struct drm_fb_helper *helper, {struct msm_fbdev *fbdev =to_msm_fbdev (helper);struct drm_device *dev = helper->dev; +struct msm_drm_private *priv = dev->dev_private;struct drm_framebuffer *fb =NULL ;struct fb_info *fbi =NULL ;struct drm_mode_fb_cmd2 mode_cmd = {0 };@@ -124,7 +126,7 @@ static int msm_fbdev_create(struct drm_fb_helper *helper,* in panic (ie. lock-safe, etc) we could avoid pinning the * buffer now: */ - ret =msm_gem_get_iova_locked (fbdev->bo,0 , &paddr); + ret =msm_gem_get_iova_locked (fbdev->bo, priv->kms->id, &paddr);if (ret) {dev_err (dev->dev,"failed to get buffer obj iova: %d\n" , ret); goto fail_unlock;drivers/gpu/drm/msm/msm_kms.h +4
-0@@ -73,6 +73,10 @@ struct msm_kms {/* irq number to be passed on to drm_irq_install */ int irq; + +/* mapper-id used to request GEM buffer mapped for scanout: */ +int id; +struct msm_gem_address_space *aspace; };/** Signature · 1 line
2.9.4
Signature · 6 lines
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 3/6] drm/msm: pass address-space to _get_iova() and friends
In reply to Rob ClarkQuoted 5 lines · Rob Clark
No functional change, that will come later. But this will make it easier to deal with dynamically created address spaces (ie. per- process pagetables for gpu).
Signed-off-by Rob Clark <[email protected]>
Quoted 543 lines
--- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 8 ++++---- drivers/gpu/drm/msm/adreno/a5xx_power.c | 5 +++-- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 6 +++--- drivers/gpu/drm/msm/dsi/dsi_host.c | 4 ++-- drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 6 +++--- drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 4 ++-- drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c | 12 ++++++------ drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 4 ++-- drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 12 ++++++------ drivers/gpu/drm/msm/msm_drv.c | 5 ++++- drivers/gpu/drm/msm/msm_drv.h | 22 ++++++++++++++-------- drivers/gpu/drm/msm/msm_fb.c | 15 +++++++++------ drivers/gpu/drm/msm/msm_fbdev.c | 2 +- drivers/gpu/drm/msm/msm_gem.c | 18 ++++++++++++------ drivers/gpu/drm/msm/msm_gem.h | 1 + drivers/gpu/drm/msm/msm_gem_submit.c | 4 ++-- drivers/gpu/drm/msm/msm_gpu.c | 6 +++--- 17 files changed, 77 insertions(+), 57 deletions(-)drivers/gpu/drm/msm/adreno/a5xx_gpu.c +4
-4@@ -397,7 +397,7 @@ static struct drm_gem_object *a5xx_ucode_load_bo(struct msm_gpu *gpu, }if (iova) { -int ret =msm_gem_get_iova_locked (bo, gpu->id, iova); +int ret =msm_gem_get_iova_locked (bo, gpu->aspace, iova);if (ret) {drm_gem_object_unreference (bo);@@ -765,19 +765,19 @@ static void a5xx_destroy(struct msm_gpu *gpu)if (a5xx_gpu->pm4_bo) {if (a5xx_gpu->pm4_iova) -msm_gem_put_iova (a5xx_gpu->pm4_bo, gpu->id); +msm_gem_put_iova (a5xx_gpu->pm4_bo, gpu->aspace);drm_gem_object_unreference_unlocked (a5xx_gpu->pm4_bo); }if (a5xx_gpu->pfp_bo) {if (a5xx_gpu->pfp_iova) -msm_gem_put_iova (a5xx_gpu->pfp_bo, gpu->id); +msm_gem_put_iova (a5xx_gpu->pfp_bo, gpu->aspace);drm_gem_object_unreference_unlocked (a5xx_gpu->pfp_bo); }if (a5xx_gpu->gpmu_bo) {if (a5xx_gpu->gpmu_iova) -msm_gem_put_iova (a5xx_gpu->gpmu_bo, gpu->id); +msm_gem_put_iova (a5xx_gpu->gpmu_bo, gpu->aspace);drm_gem_object_unreference_unlocked (a5xx_gpu->gpmu_bo); }drivers/gpu/drm/msm/adreno/a5xx_power.c +3
-2@@ -298,7 +298,8 @@ void a5xx_gpmu_ucode_init(struct msm_gpu *gpu)if (IS_ERR (a5xx_gpu->gpmu_bo)) goto err; -if (msm_gem_get_iova_locked (a5xx_gpu->gpmu_bo, gpu->id, &a5xx_gpu->gpmu_iova)) +if (msm_gem_get_iova_locked (a5xx_gpu->gpmu_bo, gpu->aspace, + &a5xx_gpu->gpmu_iova)) goto err; ptr =msm_gem_get_vaddr_locked (a5xx_gpu->gpmu_bo);@@ -327,7 +328,7 @@ void a5xx_gpmu_ucode_init(struct msm_gpu *gpu) err:if (a5xx_gpu->gpmu_iova) -msm_gem_put_iova (a5xx_gpu->gpmu_bo, gpu->id); +msm_gem_put_iova (a5xx_gpu->gpmu_bo, gpu->aspace);if (a5xx_gpu->gpmu_bo)drm_gem_object_unreference (a5xx_gpu->gpmu_bo);drivers/gpu/drm/msm/adreno/adreno_gpu.c +3
-3@@ -64,7 +64,7 @@ int adreno_hw_init(struct msm_gpu *gpu)DBG ("%s" , gpu->name); - ret =msm_gem_get_iova_locked (gpu->rb->bo, gpu->id, &gpu->rb_iova); + ret =msm_gem_get_iova_locked (gpu->rb->bo, gpu->aspace, &gpu->rb_iova);if (ret) { gpu->rb_iova =0 ;dev_err (gpu->dev->dev,"could not map ringbuffer: %d\n" , ret);@@ -409,7 +409,7 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev,return -ENOMEM ; } - ret =msm_gem_get_iova (adreno_gpu->memptrs_bo, gpu->id, + ret =msm_gem_get_iova (adreno_gpu->memptrs_bo, gpu->aspace, &adreno_gpu->memptrs_iova);if (ret) {dev_err (drm->dev,"could not map memptrs: %d\n" , ret);@@ -428,7 +428,7 @@ void adreno_gpu_cleanup(struct adreno_gpu *adreno_gpu)msm_gem_put_vaddr (adreno_gpu->memptrs_bo);if (adreno_gpu->memptrs_iova) -msm_gem_put_iova (adreno_gpu->memptrs_bo, gpu->id); +msm_gem_put_iova (adreno_gpu->memptrs_bo, gpu->aspace);drm_gem_object_unreference_unlocked (adreno_gpu->memptrs_bo); }drivers/gpu/drm/msm/dsi/dsi_host.c +2
-2@@ -994,7 +994,7 @@ static int dsi_tx_buf_alloc(struct msm_dsi_host *msm_host, int size) } ret =msm_gem_get_iova_locked (msm_host->tx_gem_obj, - priv->kms->id, &iova); + priv->kms->aspace, &iova);mutex_unlock (&dev->struct_mutex);if (ret) {pr_err ("%s: failed to get iova, %d\n" , __func__, ret);@@ -1152,7 +1152,7 @@ static int dsi_cmd_dma_tx(struct msm_dsi_host *msm_host, int len)if (cfg_hnd->major ==MSM_DSI_VER_MAJOR_6G ) { ret =msm_gem_get_iova (msm_host->tx_gem_obj, - priv->kms->id, &dma_base); + priv->kms->aspace, &dma_base);if (ret) {pr_err ("%s: failed to get iova: %d\n" , __func__, ret);return ret;drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c +3
-3@@ -128,7 +128,7 @@ static void unref_cursor_worker(struct drm_flip_work *work, void *val)struct mdp4_kms *mdp4_kms =get_kms (&mdp4_crtc->base);struct msm_kms *kms = &mdp4_kms->base.base; -msm_gem_put_iova (val, kms->id); +msm_gem_put_iova (val, kms->aspace);drm_gem_object_unreference_unlocked (val); }@@ -374,7 +374,7 @@ static void update_cursor(struct drm_crtc *crtc)if (next_bo) {/* take a obj ref + iova ref when we start scanning out: */ drm_gem_object_reference (next_bo); -msm_gem_get_iova_locked (next_bo, kms->id, &iova); +msm_gem_get_iova_locked (next_bo, kms->aspace, &iova);/* enable cursor: */ mdp4_write(mdp4_kms, REG_MDP4_DMA_CURSOR_SIZE(dma),@@ -432,7 +432,7 @@ static int mdp4_crtc_cursor_set(struct drm_crtc *crtc, }if (cursor_bo) { - ret =msm_gem_get_iova (cursor_bo, kms->id, &iova); + ret =msm_gem_get_iova (cursor_bo, kms->aspace, &iova);if (ret) goto fail; }else {drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c +2
-2@@ -163,7 +163,7 @@ static void mdp4_destroy(struct msm_kms *kms)struct msm_gem_address_space *aspace = kms->aspace;if (mdp4_kms->blank_cursor_iova) -msm_gem_put_iova (mdp4_kms->blank_cursor_bo, kms->id); +msm_gem_put_iova (mdp4_kms->blank_cursor_bo, kms->aspace);drm_gem_object_unreference_unlocked (mdp4_kms->blank_cursor_bo);if (aspace) {@@ -571,7 +571,7 @@ struct msm_kms *mdp4_kms_init(struct drm_device *dev) goto fail; } - ret =msm_gem_get_iova (mdp4_kms->blank_cursor_bo, kms->id, + ret =msm_gem_get_iova (mdp4_kms->blank_cursor_bo, kms->aspace, &mdp4_kms->blank_cursor_iova);if (ret) {dev_err (dev->dev,"could not pin blank-cursor bo: %d\n" , ret);drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c +6
-6@@ -110,7 +110,7 @@ static int mdp4_plane_prepare_fb(struct drm_plane *plane,return 0 ;DBG ("%s: prepare: FB[%u]" , mdp4_plane->name, fb->base.id); -return msm_framebuffer_prepare (fb, kms->id); +return msm_framebuffer_prepare (fb, kms->aspace); } static void mdp4_plane_cleanup_fb(struct drm_plane *plane,@@ -125,7 +125,7 @@ static void mdp4_plane_cleanup_fb(struct drm_plane *plane,return ;DBG ("%s: cleanup: FB[%u]" , mdp4_plane->name, fb->base.id); -msm_framebuffer_cleanup (fb, kms->id); +msm_framebuffer_cleanup (fb, kms->aspace); }@@ -175,13 +175,13 @@ static void mdp4_plane_set_scanout(struct drm_plane *plane, MDP4_PIPE_SRC_STRIDE_B_P3(fb->pitches[3]));mdp4_write (mdp4_kms,REG_MDP4_PIPE_SRCP0_BASE (pipe), -msm_framebuffer_iova (fb, kms->id,0 )); +msm_framebuffer_iova (fb, kms->aspace,0 ));mdp4_write (mdp4_kms,REG_MDP4_PIPE_SRCP1_BASE (pipe), -msm_framebuffer_iova (fb, kms->id,1 )); +msm_framebuffer_iova (fb, kms->aspace,1 ));mdp4_write (mdp4_kms,REG_MDP4_PIPE_SRCP2_BASE (pipe), -msm_framebuffer_iova (fb, kms->id,2 )); +msm_framebuffer_iova (fb, kms->aspace,2 ));mdp4_write (mdp4_kms,REG_MDP4_PIPE_SRCP3_BASE (pipe), -msm_framebuffer_iova (fb, kms->id,3 )); +msm_framebuffer_iova (fb, kms->aspace,3 )); plane->fb = fb; }drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c +2
-2@@ -162,7 +162,7 @@ static void unref_cursor_worker(struct drm_flip_work *work, void *val)struct mdp5_kms *mdp5_kms =get_kms (&mdp5_crtc->base);struct msm_kms *kms = &mdp5_kms->base.base; -msm_gem_put_iova (val, kms->id); +msm_gem_put_iova (val, kms->aspace);drm_gem_object_unreference_unlocked (val); }@@ -760,7 +760,7 @@ static int mdp5_crtc_cursor_set(struct drm_crtc *crtc,if (!cursor_bo)return -ENOENT ; - ret =msm_gem_get_iova (cursor_bo, kms->id, &cursor_addr); + ret =msm_gem_get_iova (cursor_bo, kms->aspace, &cursor_addr);if (ret)return -EINVAL ;drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c +6
-6@@ -277,7 +277,7 @@ static int mdp5_plane_prepare_fb(struct drm_plane *plane,return 0 ;DBG ("%s: prepare: FB[%u]" , plane->name, fb->base.id); -return msm_framebuffer_prepare (fb, kms->id); +return msm_framebuffer_prepare (fb, kms->aspace); } static void mdp5_plane_cleanup_fb(struct drm_plane *plane,@@ -291,7 +291,7 @@ static void mdp5_plane_cleanup_fb(struct drm_plane *plane,return ;DBG ("%s: cleanup: FB[%u]" , plane->name, fb->base.id); -msm_framebuffer_cleanup (fb, kms->id); +msm_framebuffer_cleanup (fb, kms->aspace); }#define FRAC_16_16 (mult, div) (((mult) << 16) / (div))@@ -505,13 +505,13 @@ static void set_scanout_locked(struct mdp5_kms *mdp5_kms, MDP5_PIPE_SRC_STRIDE_B_P3(fb->pitches[3]));mdp5_write (mdp5_kms,REG_MDP5_PIPE_SRC0_ADDR (pipe), -msm_framebuffer_iova (fb, kms->id,0 )); +msm_framebuffer_iova (fb, kms->aspace,0 ));mdp5_write (mdp5_kms,REG_MDP5_PIPE_SRC1_ADDR (pipe), -msm_framebuffer_iova (fb, kms->id,1 )); +msm_framebuffer_iova (fb, kms->aspace,1 ));mdp5_write (mdp5_kms,REG_MDP5_PIPE_SRC2_ADDR (pipe), -msm_framebuffer_iova (fb, kms->id,2 )); +msm_framebuffer_iova (fb, kms->aspace,2 ));mdp5_write (mdp5_kms,REG_MDP5_PIPE_SRC3_ADDR (pipe), -msm_framebuffer_iova (fb, kms->id,3 )); +msm_framebuffer_iova (fb, kms->aspace,3 )); }/* Note: mdp5_plane->pipe_lock must be locked */ drivers/gpu/drm/msm/msm_drv.c +4
-1@@ -51,6 +51,7 @@ static const struct drm_mode_config_funcs mode_config_funcs = { .atomic_state_free = msm_atomic_state_free, }; +#include "msm_gem.h" /* temporary */ int msm_register_address_space (struct drm_device *dev,struct msm_gem_address_space *aspace) {@@ -61,7 +62,9 @@ int msm_register_address_space(struct drm_device *dev, priv->aspace[priv->num_aspaces] = aspace; -return priv->num_aspaces++; + aspace->id = priv->num_aspaces++; + +return aspace->id; }#ifdef CONFIG_DRM_MSM_REGISTER_LOGGING drivers/gpu/drm/msm/msm_drv.h +14
-8@@ -209,13 +209,16 @@ int msm_gem_mmap_obj(struct drm_gem_object *obj,int msm_gem_mmap (struct file *filp,struct vm_area_struct *vma);int msm_gem_fault (struct vm_fault *vmf);uint64_t msm_gem_mmap_offset (struct drm_gem_object *obj); -int msm_gem_get_iova_locked (struct drm_gem_object *obj,int id, -uint64_t *iova); -int msm_gem_get_iova (struct drm_gem_object *obj,int id,uint64_t *iova); -uint64_t msm_gem_iova (struct drm_gem_object *obj,int id); +int msm_gem_get_iova_locked (struct drm_gem_object *obj, +struct msm_gem_address_space *aspace,uint64_t *iova); +int msm_gem_get_iova (struct drm_gem_object *obj, +struct msm_gem_address_space *aspace,uint64_t *iova); +uint64_t msm_gem_iova (struct drm_gem_object *obj, +struct msm_gem_address_space *aspace);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); +void msm_gem_put_iova (struct drm_gem_object *obj, +struct msm_gem_address_space *aspace);int msm_gem_dumb_create (struct drm_file *file,struct drm_device *dev,struct drm_mode_create_dumb *args); int msm_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev,@@ -250,9 +253,12 @@ struct drm_gem_object *msm_gem_new(struct drm_device *dev,struct drm_gem_object *msm_gem_import (struct drm_device *dev,struct dma_buf *dmabuf,struct sg_table *sgt); -int msm_framebuffer_prepare (struct drm_framebuffer *fb,int id); -void msm_framebuffer_cleanup (struct drm_framebuffer *fb,int id); -uint32_t msm_framebuffer_iova (struct drm_framebuffer *fb,int id,int plane); +int msm_framebuffer_prepare (struct drm_framebuffer *fb, +struct msm_gem_address_space *aspace); +void msm_framebuffer_cleanup (struct drm_framebuffer *fb, +struct msm_gem_address_space *aspace); +uint32_t msm_framebuffer_iova (struct drm_framebuffer *fb, +struct msm_gem_address_space *aspace,int plane);struct drm_gem_object *msm_framebuffer_bo (struct drm_framebuffer *fb,int plane);const struct msm_format *msm_framebuffer_format (struct drm_framebuffer *fb); struct drm_framebuffer *msm_framebuffer_init(struct drm_device *dev,drivers/gpu/drm/msm/msm_fb.c +9
-6@@ -84,14 +84,15 @@ void msm_framebuffer_describe(struct drm_framebuffer *fb, struct seq_file *m)* should be fine, since only the scanout (mdpN) side of things needs * this, the gpu doesn't care about fb's. */ -int msm_framebuffer_prepare (struct drm_framebuffer *fb,int id) +int msm_framebuffer_prepare (struct drm_framebuffer *fb, +struct msm_gem_address_space *aspace) {struct msm_framebuffer *msm_fb =to_msm_framebuffer (fb);int ret, i, n = fb->format->num_planes;uint64_t iova;for (i =0 ; i < n; i++) { - ret =msm_gem_get_iova (msm_fb->planes[i], id, &iova); + ret =msm_gem_get_iova (msm_fb->planes[i], aspace, &iova);DBG ("FB[%u]: iova[%d]: %08llx (%d)" , fb->base.id, i, iova, ret);if (ret)return ret;@@ -100,21 +101,23 @@ int msm_framebuffer_prepare(struct drm_framebuffer *fb, int id)return 0 ; } -void msm_framebuffer_cleanup (struct drm_framebuffer *fb,int id) +void msm_framebuffer_cleanup (struct drm_framebuffer *fb, +struct msm_gem_address_space *aspace) {struct msm_framebuffer *msm_fb =to_msm_framebuffer (fb);int i, n = fb->format->num_planes;for (i =0 ; i < n; i++) -msm_gem_put_iova (msm_fb->planes[i], id); +msm_gem_put_iova (msm_fb->planes[i], aspace); } -uint32_t msm_framebuffer_iova (struct drm_framebuffer *fb,int id,int plane) +uint32_t msm_framebuffer_iova (struct drm_framebuffer *fb, +struct msm_gem_address_space *aspace,int plane) {struct msm_framebuffer *msm_fb =to_msm_framebuffer (fb);if (!msm_fb->planes[plane])return 0 ; -return msm_gem_iova (msm_fb->planes[plane], id) + fb->offsets[plane]; +return msm_gem_iova (msm_fb->planes[plane], aspace) + fb->offsets[plane]; }struct drm_gem_object *msm_framebuffer_bo (struct drm_framebuffer *fb,int plane)drivers/gpu/drm/msm/msm_fbdev.c +1
-1@@ -126,7 +126,7 @@ static int msm_fbdev_create(struct drm_fb_helper *helper,* in panic (ie. lock-safe, etc) we could avoid pinning the * buffer now: */ - ret =msm_gem_get_iova_locked (fbdev->bo, priv->kms->id, &paddr); + ret =msm_gem_get_iova_locked (fbdev->bo, priv->kms->aspace, &paddr);if (ret) {dev_err (dev->dev,"failed to get buffer obj iova: %d\n" , ret); goto fail_unlock;drivers/gpu/drm/msm/msm_gem.c +12
-6@@ -308,10 +308,11 @@ put_iova(struct drm_gem_object *obj)* That means when I do eventually need to add support for unpinning * the refcnt counter needs to be atomic_t. */ -int msm_gem_get_iova_locked (struct drm_gem_object *obj,int id, -uint64_t *iova) +int msm_gem_get_iova_locked (struct drm_gem_object *obj, +struct msm_gem_address_space *aspace,uint64_t *iova) {struct msm_gem_object *msm_obj =to_msm_bo (obj); +int id = aspace ? aspace->id :0 ;int ret =0 ;WARN_ON (!mutex_is_locked (&obj->dev->struct_mutex));@@ -338,9 +339,11 @@ int msm_gem_get_iova_locked(struct drm_gem_object *obj, int id, }/* get iova, taking a reference. Should have a matching put */ -int msm_gem_get_iova (struct drm_gem_object *obj,int id,uint64_t *iova) +int msm_gem_get_iova (struct drm_gem_object *obj, +struct msm_gem_address_space *aspace,uint64_t *iova) {struct msm_gem_object *msm_obj =to_msm_bo (obj); +int id = aspace ? aspace->id :0 ;int ret;/* this is safe right now because we don't unmap until the @@ -353,7 +356,7 @@ int msm_gem_get_iova(struct drm_gem_object *obj, int id, uint64_t *iova) }mutex_lock (&obj->dev->struct_mutex); - ret =msm_gem_get_iova_locked (obj, id, iova); + ret =msm_gem_get_iova_locked (obj, aspace, iova);mutex_unlock (&obj->dev->struct_mutex);return ret; }@@ -361,14 +364,17 @@ int msm_gem_get_iova(struct drm_gem_object *obj, int id, uint64_t *iova)/* get iova without taking a reference, used in places where you have * already done a 'msm_gem_get_iova()'. */ -uint64_t msm_gem_iova (struct drm_gem_object *obj,int id) +uint64_t msm_gem_iova (struct drm_gem_object *obj, +struct msm_gem_address_space *aspace) {struct msm_gem_object *msm_obj =to_msm_bo (obj); +int id = aspace ? aspace->id :0 ;WARN_ON (!msm_obj->domain[id].iova);return msm_obj->domain[id].iova; } -void msm_gem_put_iova (struct drm_gem_object *obj,int id) +void msm_gem_put_iova (struct drm_gem_object *obj, +struct msm_gem_address_space *aspace) {// XXX TODO .. // NOTE: probably don't need a _locked() version.. we wouldn't drivers/gpu/drm/msm/msm_gem.h +1
-0@@ -33,6 +33,7 @@ struct msm_gem_address_space {struct drm_mm mm;struct msm_mmu *mmu;struct kref kref; +int id;/* temporary */ };struct msm_gem_vma {drivers/gpu/drm/msm/msm_gem_submit.c +2
-2@@ -158,7 +158,7 @@ static void submit_unlock_unpin_bo(struct msm_gem_submit *submit, int i)struct msm_gem_object *msm_obj = submit->bos[i].obj;if (submit->bos[i].flags &BO_PINNED ) -msm_gem_put_iova (&msm_obj->base, submit->gpu->id); +msm_gem_put_iova (&msm_obj->base, submit->gpu->aspace);if (submit->bos[i].flags &BO_LOCKED )ww_mutex_unlock (&msm_obj->resv->lock);@@ -246,7 +246,7 @@ static int submit_pin_objects(struct msm_gem_submit *submit)/* if locking succeeded, pin bo: */ ret =msm_gem_get_iova_locked (&msm_obj->base, - submit->gpu->id, &iova); + submit->gpu->aspace, &iova);if (ret)break ;drivers/gpu/drm/msm/msm_gpu.c +3
-3@@ -416,7 +416,7 @@ static void retire_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit)struct msm_gem_object *msm_obj = submit->bos[i].obj;/* move to inactive: */ msm_gem_move_to_inactive (&msm_obj->base); -msm_gem_put_iova (&msm_obj->base, gpu->id); +msm_gem_put_iova (&msm_obj->base, gpu->aspace);drm_gem_object_unreference (&msm_obj->base); }@@ -498,7 +498,7 @@ void msm_gpu_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit,/* submit takes a reference to the bo and iova until retired: */ drm_gem_object_reference (&msm_obj->base);msm_gem_get_iova_locked (&msm_obj->base, - submit->gpu->id, &iova); + submit->gpu->aspace, &iova);if (submit->bos[i].flags &MSM_SUBMIT_BO_WRITE )msm_gem_move_to_active (&msm_obj->base, gpu, true, submit->fence);@@ -695,7 +695,7 @@ void msm_gpu_cleanup(struct msm_gpu *gpu)if (gpu->rb) {if (gpu->rb_iova) -msm_gem_put_iova (gpu->rb->bo, gpu->id); +msm_gem_put_iova (gpu->rb->bo, gpu->aspace);msm_ringbuffer_destroy (gpu->rb); }Signature · 1 line
2.9.4
Signature · 6 lines
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 4/6] drm/msm: refactor how we handle vram carveout buffers
In reply to Rob ClarkQuoted 72 lines · Rob Clark
Pull some of the logic out into
msm_gem_new()(since we don't need to care about the imported-bo case), and don't defer allocating pages. The latter is generally a good idea, since if we are using VRAM carveout to allocate contiguous buffers (ie. no IOMMU), the allocation is more likely to fail. So failing at allocation time is a more sane option. Plus this simplifies things in the next patch.Signed-off-by Rob Clark <[email protected]>--- drivers/gpu/drm/msm/msm_gem.c | 48 ++++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 21 deletions(-)drivers/gpu/drm/msm/msm_gem.c +4
-18@@ -324,12 +324,8 @@ int msm_gem_get_iova_locked(struct drm_gem_object *obj,if (IS_ERR (pages))return PTR_ERR (pages); -if (iommu_present (&platform_bus_type)) { - ret =msm_gem_map_vma (priv->aspace[id], &msm_obj->domain[id], - msm_obj->sgt, obj->size >>PAGE_SHIFT ); - }else { - msm_obj->domain[id].iova =physaddr (obj); - } + ret =msm_gem_map_vma (priv->aspace[id], &msm_obj->domain[id], + msm_obj->sgt, obj->size >>PAGE_SHIFT ); }if (!ret)@@ -765,7 +761,6 @@ static int msm_gem_new_impl(struct drm_device *dev, {struct msm_drm_private *priv = dev->dev_private;struct msm_gem_object *msm_obj; -bool use_vram = false;switch (flags &MSM_BO_CACHE_MASK ) {case MSM_BO_UNCACHED :@@ -778,21 +773,10 @@ static int msm_gem_new_impl(struct drm_device *dev,return -EINVAL ; } -if (!iommu_present (&platform_bus_type)) - use_vram = true; -else if ((flags &MSM_BO_STOLEN ) && priv->vram.size) - use_vram = true; - -if (WARN_ON (use_vram && !priv->vram.size)) -return -EINVAL ; - msm_obj =kzalloc (sizeof (*msm_obj),GFP_KERNEL );if (!msm_obj)return -ENOMEM ; -if (use_vram) - msm_obj->vram_node = &msm_obj->domain[0 ].node; - msm_obj->flags = flags; msm_obj->madv =MSM_MADV_WILLNEED ;@@ -814,13 +798,23 @@ static int msm_gem_new_impl(struct drm_device *dev,struct drm_gem_object *msm_gem_new (struct drm_device *dev,uint32_t size,uint32_t flags) { +struct msm_drm_private *priv = dev->dev_private;struct drm_gem_object *obj =NULL ; +bool use_vram = false;int ret;WARN_ON (!mutex_is_locked (&dev->struct_mutex));
drivers/gpu/drm/msm/msm_gem.c static int msm_gem_new_impl(struct drm_device *dev, · line 817
Quoted 10 lines
drivers/gpu/drm/msm/msm_gem.c +8
-0size =PAGE_ALIGN (size); +if (!iommu_present (&platform_bus_type)) + use_vram = true; +else if ((flags &MSM_BO_STOLEN ) && priv->vram.size) + use_vram = true; + +if (WARN_ON (use_vram && !priv->vram.size)) +return ERR_PTR (-EINVAL ); +
I would say WARN_ONCE here but I guess if the first allocation fails we aren't making any more. This might be worth a nastygram to the log.
Quoted 34 lines
drivers/gpu/drm/msm/msm_gem.c +15
-3/* Disallow zero sized objects as they make the underlying * infrastructure grumpy */ @@ -831,12 +825,24 @@ struct drm_gem_object *msm_gem_new(struct drm_device *dev,if (ret) goto fail; -if (use_pages (obj)) { +if (use_vram) { +struct msm_gem_object *msm_obj =to_msm_bo (obj); +struct page **pages; + + msm_obj->vram_node = &msm_obj->domain[0 ].node; +drm_gem_private_object_init (dev, obj, size); + + msm_obj->pages =get_pages (obj); + pages =get_pages (obj); +if (IS_ERR (pages)) { + ret =PTR_ERR (pages); + goto fail; + } + msm_obj->domain[0 ].iova =physaddr (obj); + }else { ret =drm_gem_object_init (dev, obj, size);if (ret) goto fail; - }else { -drm_gem_private_object_init (dev, obj, size); }return obj;Signature · 1 line
2.9.4
Otherwise,
Signature · 6 lines
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Jordan Crouse
Acked-byRe: [PATCH 5/6] drm/msm: support for an arbitrary number of address spaces
In reply to a message not in the archiveQuoted 4 lines · Rob Clark
It means we have to do a list traversal where we once had an index into a table. But the list will normally have one or two entries.
Signed-off-by Rob Clark <[email protected]>
I dig the rename - makes more sense.
Quoted 259 lines
--- drivers/gpu/drm/msm/msm_gem.c | 138 +++++++++++++++++++++++++++++------------- drivers/gpu/drm/msm/msm_gem.h | 4 +- 2 files changed, 99 insertions(+), 43 deletions(-)drivers/gpu/drm/msm/msm_gem.c +96
-42@@ -283,21 +283,59 @@ uint64_t msm_gem_mmap_offset(struct drm_gem_object *obj)return offset; } +static struct msm_gem_vma *add_vma (struct drm_gem_object *obj, +struct msm_gem_address_space *aspace) +{ +struct msm_gem_object *msm_obj =to_msm_bo (obj); +struct msm_gem_vma *vma; + + vma =kzalloc (sizeof (*vma),GFP_KERNEL ); +if (!vma) +return ERR_PTR (-ENOMEM ); + + vma->aspace = aspace; + +list_add_tail (&vma->list, &msm_obj->vmas); + +return vma; +} + +static struct msm_gem_vma *lookup_vma (struct drm_gem_object *obj, +struct msm_gem_address_space *aspace) +{ +struct msm_gem_object *msm_obj =to_msm_bo (obj); +struct msm_gem_vma *vma; + +WARN_ON (!mutex_is_locked (&obj->dev->struct_mutex)); + +list_for_each_entry (vma, &msm_obj->vmas, list) { +if (vma->aspace == aspace) +return vma; + } + +return NULL ; +} + +static void del_vma (struct msm_gem_vma *vma) +{ +if (!vma) +return ; + +list_del (&vma->list); +kfree (vma); +} +static void put_iova (struct drm_gem_object *obj) { -struct drm_device *dev = obj->dev; -struct msm_drm_private *priv = obj->dev->dev_private;struct msm_gem_object *msm_obj =to_msm_bo (obj); -int id; +struct msm_gem_vma *vma, *tmp; -WARN_ON (!mutex_is_locked (&dev->struct_mutex)); +WARN_ON (!mutex_is_locked (&obj->dev->struct_mutex)); -for (id =0 ; id <ARRAY_SIZE (msm_obj->domain); id++) { -if (!priv->aspace[id]) -continue ; -msm_gem_unmap_vma (priv->aspace[id], - &msm_obj->domain[id], msm_obj->sgt); +list_for_each_entry_safe (vma, tmp, &msm_obj->vmas, list) { +msm_gem_unmap_vma (vma->aspace, vma, msm_obj->sgt); +del_vma (vma); } }@@ -312,24 +350,37 @@ int msm_gem_get_iova_locked(struct drm_gem_object *obj, struct msm_gem_address_space *aspace, uint64_t *iova) { struct msm_gem_object *msm_obj = to_msm_bo(obj); -int id = aspace ? aspace->id :0 ; +struct msm_gem_vma *vma;int ret =0 ;WARN_ON (!mutex_is_locked (&obj->dev->struct_mutex)); -if (!msm_obj->domain[id].iova) { -struct msm_drm_private *priv = obj->dev->dev_private; -struct page **pages =get_pages (obj); + vma =lookup_vma (obj, aspace); -if (IS_ERR (pages)) -return PTR_ERR (pages); +if (!vma) { +struct page **pages; + + vma =add_vma (obj, aspace); +if (IS_ERR (vma)) +return PTR_ERR (vma); + + pages =get_pages (obj); +if (IS_ERR (pages)) { + ret =PTR_ERR (pages); + goto fail; + } - ret =msm_gem_map_vma (priv->aspace[id], &msm_obj->domain[id], - msm_obj->sgt, obj->size >>PAGE_SHIFT ); + ret =msm_gem_map_vma (aspace, vma, msm_obj->sgt, + obj->size >>PAGE_SHIFT ); +if (ret) + goto fail; } -if (!ret) - *iova = msm_obj->domain[id].iova; + *iova = vma->iova; +return 0 ; + +fail: +del_vma (vma);return ret; }@@ -338,22 +389,12 @@ int msm_gem_get_iova_locked(struct drm_gem_object *obj,int msm_gem_get_iova (struct drm_gem_object *obj,struct msm_gem_address_space *aspace,uint64_t *iova) { -struct msm_gem_object *msm_obj =to_msm_bo (obj); -int id = aspace ? aspace->id :0 ;int ret; -/* this is safe right now because we don't unmap until the -* bo is deleted: -*/ -if (msm_obj->domain[id].iova) { -might_lock (&obj->dev->struct_mutex); - *iova = msm_obj->domain[id].iova; -return 0 ; - } -mutex_lock (&obj->dev->struct_mutex); ret =msm_gem_get_iova_locked (obj, aspace, iova);mutex_unlock (&obj->dev->struct_mutex); +return ret; }@@ -363,10 +404,14 @@ int msm_gem_get_iova(struct drm_gem_object *obj,uint64_t msm_gem_iova (struct drm_gem_object *obj,struct msm_gem_address_space *aspace) { -struct msm_gem_object *msm_obj =to_msm_bo (obj); -int id = aspace ? aspace->id :0 ; -WARN_ON (!msm_obj->domain[id].iova); -return msm_obj->domain[id].iova; +struct msm_gem_vma *vma; + +mutex_lock (&obj->dev->struct_mutex); + vma =lookup_vma (obj, aspace); +mutex_unlock (&obj->dev->struct_mutex); +WARN_ON (!vma); + +return vma ? vma->iova :0 ; } void msm_gem_put_iova(struct drm_gem_object *obj,@@ -624,11 +669,10 @@ void msm_gem_describe(struct drm_gem_object *obj, struct seq_file *m)struct msm_gem_object *msm_obj =to_msm_bo (obj);struct reservation_object *robj = msm_obj->resv;struct reservation_object_list *fobj; -struct msm_drm_private *priv = obj->dev->dev_private;struct dma_fence *fence; +struct msm_gem_vma *vma;uint64_t off =drm_vma_node_start (&obj->vma_node);const char *madv; -unsigned id;WARN_ON (!mutex_is_locked (&obj->dev->struct_mutex));@@ -650,8 +694,9 @@ void msm_gem_describe(struct drm_gem_object *obj, struct seq_file *m) obj->name,kref_read (&obj->refcount), off, msm_obj->vaddr); -for (id =0 ; id < priv->num_aspaces; id++) -seq_printf (m," %08llx" , msm_obj->domain[id].iova); +/* FIXME: we need to print the address space here too */ +list_for_each_entry (vma, &msm_obj->vmas, list) +seq_printf (m," %08llx" , vma->iova);seq_printf (m," %zu%s\n" , obj->size, madv);@@ -788,6 +833,8 @@ static int msm_gem_new_impl(struct drm_device *dev, }INIT_LIST_HEAD (&msm_obj->submit_entry); +INIT_LIST_HEAD (&msm_obj->vmas); +list_add_tail (&msm_obj->mm_list, &priv->inactive_list); *obj = &msm_obj->base;@@ -826,19 +873,26 @@ struct drm_gem_object *msm_gem_new(struct drm_device *dev, goto fail;if (use_vram) { -struct msm_gem_object *msm_obj =to_msm_bo (obj); +struct msm_gem_vma *vma;struct page **pages; - msm_obj->vram_node = &msm_obj->domain[0 ].node; + vma =add_vma (obj,NULL ); +if (IS_ERR (vma)) { + ret =PTR_ERR (vma); + goto fail; + } + +to_msm_bo (obj)->vram_node = &vma->node; +drm_gem_private_object_init (dev, obj, size); - msm_obj->pages =get_pages (obj); pages =get_pages (obj);if (IS_ERR (pages)) { ret =PTR_ERR (pages); goto fail; } - msm_obj->domain[0 ].iova =physaddr (obj); + + vma->iova =physaddr (obj); }else { ret =drm_gem_object_init (dev, obj, size);if (ret)drivers/gpu/drm/msm/msm_gem.h +3
-1@@ -39,6 +39,8 @@ struct msm_gem_address_space {struct msm_gem_vma {struct drm_mm_node node;uint64_t iova; +struct msm_gem_address_space *aspace; +struct list_head list;/* node in msm_gem_object::vmas */ };struct msm_gem_object {@@ -78,7 +80,7 @@ struct msm_gem_object {struct sg_table *sgt;void *vaddr; -struct msm_gem_vma domain[NUM_DOMAINS ]; +struct list_head vmas;/* list of msm_gem_vma */ /* normally (resv == &_resv) except for imported bo's */ struct reservation_object *resv;Signature · 1 line
2.9.4
Signature · 6 lines
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
Re: [PATCH 6/6] drm/msm: remove address-space id
In reply to Rob ClarkQuoted 5 lines · Rob Clark
Now that the
msm_gemsupports an arbitrary number of vma's, we no longer need to assign an id (index) to each address space. So rip out the associated code.Signed-off-by Rob Clark <[email protected]>
Quoted 155 lines
--- drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 7 ------- drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 7 ------- drivers/gpu/drm/msm/msm_drv.c | 16 ---------------- drivers/gpu/drm/msm/msm_drv.h | 11 ----------- drivers/gpu/drm/msm/msm_gem.h | 1 - drivers/gpu/drm/msm/msm_gpu.c | 2 -- drivers/gpu/drm/msm/msm_gpu.h | 1 - drivers/gpu/drm/msm/msm_kms.h | 1 - 8 files changed, 46 deletions(-)drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c +0
-7@@ -548,13 +548,6 @@ struct msm_kms *mdp4_kms_init(struct drm_device *dev) aspace =NULL ; } - kms->id =msm_register_address_space (dev, aspace); -if (kms->id <0 ) { - ret = kms->id; -dev_err (dev->dev,"failed to register mdp4 iommu: %d\n" , ret); - goto fail; - } - ret =modeset_init (mdp4_kms);if (ret) {dev_err (dev->dev,"modeset_init failed: %d\n" , ret);drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c +0
-7@@ -746,13 +746,6 @@ struct msm_kms *mdp5_kms_init(struct drm_device *dev) aspace =NULL ;; } - kms->id =msm_register_address_space (dev, aspace); -if (kms->id <0 ) { - ret = kms->id; -dev_err (&pdev->dev,"failed to register mdp5 iommu: %d\n" , ret); - goto fail; - } - ret =modeset_init (mdp5_kms);if (ret) {dev_err (&pdev->dev,"modeset_init failed: %d\n" , ret);drivers/gpu/drm/msm/msm_drv.c +0
-16@@ -51,22 +51,6 @@ static const struct drm_mode_config_funcs mode_config_funcs = { .atomic_state_free = msm_atomic_state_free, }; -#include "msm_gem.h" /* temporary */ -int msm_register_address_space (struct drm_device *dev, -struct msm_gem_address_space *aspace) -{ -struct msm_drm_private *priv = dev->dev_private; - -if (WARN_ON (priv->num_aspaces >=ARRAY_SIZE (priv->aspace))) -return -EINVAL ; - - priv->aspace[priv->num_aspaces] = aspace; - - aspace->id = priv->num_aspaces++; - -return aspace->id; -} -#ifdef CONFIG_DRM_MSM_REGISTER_LOGGING static bool reglog = false;MODULE_PARM_DESC (reglog,"Enable register read/write logging" );drivers/gpu/drm/msm/msm_drv.h +0
-11@@ -123,14 +123,6 @@ struct msm_drm_private {uint32_t pending_crtcs;wait_queue_head_t pending_crtcs_event; -/* Registered address spaces.. currently this is fixed per # of -* iommu's. Ie. one for display block and one for gpu block. -* Eventually, to do per-process gpu pagetables, we'll want one -* of these per-process. -*/ -unsigned int num_aspaces; -struct msm_gem_address_space *aspace[NUM_DOMAINS ]; -unsigned int num_planes;struct drm_plane *planes[16 ];@@ -183,9 +175,6 @@ struct drm_atomic_state *msm_atomic_state_alloc(struct drm_device *dev);void msm_atomic_state_clear (struct drm_atomic_state *state);void msm_atomic_state_free (struct drm_atomic_state *state); -int msm_register_address_space (struct drm_device *dev, -struct msm_gem_address_space *aspace); -void msm_gem_unmap_vma (struct msm_gem_address_space *aspace,struct msm_gem_vma *vma,struct sg_table *sgt); int msm_gem_map_vma(struct msm_gem_address_space *aspace,drivers/gpu/drm/msm/msm_gem.h +0
-1@@ -33,7 +33,6 @@ struct msm_gem_address_space {struct drm_mm mm;struct msm_mmu *mmu;struct kref kref; -int id;/* temporary */ };struct msm_gem_vma {drivers/gpu/drm/msm/msm_gpu.c +0
-2@@ -660,8 +660,6 @@ int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev, }else {dev_info (drm->dev,"%s: no IOMMU, fallback to VRAM carveout!\n" , name); } - gpu->id =msm_register_address_space (drm, gpu->aspace); -/* Create ringbuffer: */ mutex_lock (&drm->struct_mutex);drivers/gpu/drm/msm/msm_gpu.h +0
-1@@ -99,7 +99,6 @@ struct msm_gpu {int irq;struct msm_gem_address_space *aspace; -int id;/* Power Control: */ struct regulator *gpu_reg, *gpu_cx;drivers/gpu/drm/msm/msm_kms.h +0
-1@@ -75,7 +75,6 @@ struct msm_kms {int irq;/* mapper-id used to request GEM buffer mapped for scanout: */ -int id;struct msm_gem_address_space *aspace; };Signature · 1 line
2.9.4
Signature · 6 lines
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel