Hi Daniel
On Wed, Dec 11, 2013 at 11:35 AM, Daniel Vetter <daniel.vetter@xxxxxxxx> wrote:
> This was hidden in a generic void * dev->mm_private. But only ever
> used for gem. But thanks to this fake generic pretension no one
> noticed that Rob's drm drivers are now all broken.
>
> So just give the offset manager a type pointer and fix up msm, omapdrm
> and tilcdc.
>
> v2: Fixup compile fail.
>
> Cc: David Herrmann <dh.herrmann@xxxxxxxxx>
> Cc: Rob Clark <robdclark@xxxxxxxxx>
> Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxx>
> ---
> drivers/gpu/drm/drm_gem.c | 27 ++++++++++++---------------
> drivers/gpu/drm/gma500/psb_intel_drv.h | 5 -----
> drivers/gpu/drm/msm/msm_drv.c | 2 +-
> drivers/gpu/drm/omapdrm/omap_debugfs.c | 2 +-
> drivers/gpu/drm/tilcdc/tilcdc_drv.c | 2 +-
> include/drm/drmP.h | 14 ++++++--------
> 6 files changed, 21 insertions(+), 31 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
> index 4761adedad2a..32525b0a473a 100644
> --- a/drivers/gpu/drm/drm_gem.c
> +++ b/drivers/gpu/drm/drm_gem.c
> @@ -91,19 +91,19 @@
> int
> drm_gem_init(struct drm_device *dev)
> {
> - struct drm_gem_mm *mm;
> + struct drm_vma_offset_manager *vma_offset_manager;
>
> mutex_init(&dev->object_name_lock);
> idr_init(&dev->object_name_idr);
>
> - mm = kzalloc(sizeof(struct drm_gem_mm), GFP_KERNEL);
> - if (!mm) {
> + vma_offset_manager = kzalloc(sizeof(*vma_offset_manager), GFP_KERNEL);
> + if (!vma_offset_manager) {
> DRM_ERROR("out of memory\n");
> return -ENOMEM;
> }
>
> - dev->mm_private = mm;
> - drm_vma_offset_manager_init(&mm->vma_manager,
> + dev->vma_offset_manager = vma_offset_manager;
> + drm_vma_offset_manager_init(vma_offset_manager,
> DRM_FILE_PAGE_OFFSET_START,
> DRM_FILE_PAGE_OFFSET_SIZE);
>
> @@ -113,11 +113,10 @@ drm_gem_init(struct drm_device *dev)
> void
> drm_gem_destroy(struct drm_device *dev)
> {
> - struct drm_gem_mm *mm = dev->mm_private;
>
> - drm_vma_offset_manager_destroy(&mm->vma_manager);
> - kfree(mm);
> - dev->mm_private = NULL;
> + drm_vma_offset_manager_destroy(dev->vma_offset_manager);
> + kfree(dev->vma_offset_manager);
> + dev->vma_offset_manager = NULL;
> }
>
> /**
> @@ -374,9 +373,8 @@ void
> drm_gem_free_mmap_offset(struct drm_gem_object *obj)
> {
> struct drm_device *dev = obj->dev;
> - struct drm_gem_mm *mm = dev->mm_private;
>
> - drm_vma_offset_remove(&mm->vma_manager, &obj->vma_node);
> + drm_vma_offset_remove(dev->vma_offset_manager, &obj->vma_node);
> }
> EXPORT_SYMBOL(drm_gem_free_mmap_offset);
>
> @@ -398,9 +396,8 @@ int
> drm_gem_create_mmap_offset_size(struct drm_gem_object *obj, size_t size)
> {
> struct drm_device *dev = obj->dev;
> - struct drm_gem_mm *mm = dev->mm_private;
>
> - return drm_vma_offset_add(&mm->vma_manager, &obj->vma_node,
> + return drm_vma_offset_add(dev->vma_offset_manager, &obj->vma_node,
> size / PAGE_SIZE);
> }
> EXPORT_SYMBOL(drm_gem_create_mmap_offset_size);
> @@ -833,7 +830,6 @@ int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma)
> {
> struct drm_file *priv = filp->private_data;
> struct drm_device *dev = priv->minor->dev;
> - struct drm_gem_mm *mm = dev->mm_private;
> struct drm_gem_object *obj;
> struct drm_vma_offset_node *node;
> int ret = 0;
> @@ -843,7 +839,8 @@ int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma)
>
> mutex_lock(&dev->struct_mutex);
>
> - node = drm_vma_offset_exact_lookup(&mm->vma_manager, vma->vm_pgoff,
> + node = drm_vma_offset_exact_lookup(dev->vma_offset_manager,
> + vma->vm_pgoff,
> vma_pages(vma));
> if (!node) {
> mutex_unlock(&dev->struct_mutex);
> diff --git a/drivers/gpu/drm/gma500/psb_intel_drv.h b/drivers/gpu/drm/gma500/psb_intel_drv.h
> index bde27fdb41bf..dc2c8eb030fa 100644
> --- a/drivers/gpu/drm/gma500/psb_intel_drv.h
> +++ b/drivers/gpu/drm/gma500/psb_intel_drv.h
> @@ -250,11 +250,6 @@ extern void psb_intel_sdvo_set_hotplug(struct drm_connector *connector,
> extern int intelfb_probe(struct drm_device *dev);
> extern int intelfb_remove(struct drm_device *dev,
> struct drm_framebuffer *fb);
> -extern struct drm_framebuffer *psb_intel_framebuffer_create(struct drm_device
> - *dev, struct
> - drm_mode_fb_cmd
> - *mode_cmd,
> - void *mm_private);
Where does that come from?
> extern bool psb_intel_lvds_mode_fixup(struct drm_encoder *encoder,
> const struct drm_display_mode *mode,
> struct drm_display_mode *adjusted_mode);
> diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
> index 233246641ae9..177169ce01f0 100644
> --- a/drivers/gpu/drm/msm/msm_drv.c
> +++ b/drivers/gpu/drm/msm/msm_drv.c
> @@ -415,7 +415,7 @@ static int msm_gem_show(struct drm_device *dev, struct seq_file *m)
>
> static int msm_mm_show(struct drm_device *dev, struct seq_file *m)
> {
> - return drm_mm_dump_table(m, dev->mm_private);
> + return drm_mm_dump_table(m, &dev->vma_offset_manager->vm_addr_space_mm);
> }
>
> static int msm_fb_show(struct drm_device *dev, struct seq_file *m)
> diff --git a/drivers/gpu/drm/omapdrm/omap_debugfs.c b/drivers/gpu/drm/omapdrm/omap_debugfs.c
> index c27f59da7f29..d4c04d69fc4d 100644
> --- a/drivers/gpu/drm/omapdrm/omap_debugfs.c
> +++ b/drivers/gpu/drm/omapdrm/omap_debugfs.c
> @@ -48,7 +48,7 @@ static int mm_show(struct seq_file *m, void *arg)
> {
> struct drm_info_node *node = (struct drm_info_node *) m->private;
> struct drm_device *dev = node->minor->dev;
> - return drm_mm_dump_table(m, dev->mm_private);
> + return drm_mm_dump_table(m, &dev->vma_offset_manager->vm_addr_space_mm);
> }
>
> static int fb_show(struct seq_file *m, void *arg)
> diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.c b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
> index 4fad1efbce03..b20b69488dc9 100644
> --- a/drivers/gpu/drm/tilcdc/tilcdc_drv.c
> +++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
> @@ -444,7 +444,7 @@ static int tilcdc_mm_show(struct seq_file *m, void *arg)
> {
> struct drm_info_node *node = (struct drm_info_node *) m->private;
> struct drm_device *dev = node->minor->dev;
> - return drm_mm_dump_table(m, dev->mm_private);
> + return drm_mm_dump_table(m, &dev->vma_offset_manager->vm_addr_space_mm);
> }
>
> static struct drm_info_list tilcdc_debugfs_list[] = {
> diff --git a/include/drm/drmP.h b/include/drm/drmP.h
> index 3b946beba2e0..610eb5c221c4 100644
> --- a/include/drm/drmP.h
> +++ b/include/drm/drmP.h
> @@ -601,13 +601,6 @@ struct drm_ati_pcigart_info {
> };
>
> /**
> - * GEM specific mm private for tracking GEM objects
> - */
> -struct drm_gem_mm {
> - struct drm_vma_offset_manager vma_manager;
> -};
> -
> -/**
> * This structure defines the drm_mm memory object, which will be used by the
> * DRM for its buffer objects.
> */
> @@ -972,6 +965,11 @@ struct drm_driver {
> const struct drm_ioctl_desc *ioctls;
> int num_ioctls;
> const struct file_operations *fops;
> + union {
> + struct pci_driver *pci;
> + struct platform_device *platform_device;
> + struct usb_driver *usb;
> + } kdriver;
Ugh? I think you got some rebase issues in the series. Otherwise, this
patch looks good.
Thanks
David
> struct drm_bus *bus;
>
> /* List of devices hanging off this driver with stealth attach. */
> @@ -1156,7 +1154,6 @@ struct drm_device {
> struct drm_sg_mem *sg; /**< Scatter gather memory */
> unsigned int num_crtcs; /**< Number of CRTCs on this device */
> void *dev_private; /**< device private data */
> - void *mm_private;
> struct address_space *dev_mapping;
> struct drm_sigdata sigdata; /**< For block_all_signals */
> sigset_t sigmask;
> @@ -1174,6 +1171,7 @@ struct drm_device {
> /*@{ */
> struct mutex object_name_lock;
> struct idr object_name_idr;
> + struct drm_vma_offset_manager *vma_offset_manager;
> /*@} */
> int switch_power_state;
>
> --
> 1.8.4.3
>
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/dri-devel
