Re: [PATCH 04/12] drm/i915/bdw: Add ppgtt info for dynamic pages

[Michel Thierry <michel.thierry@intel.com>]

On 3/3/2015 12:23 PM, akash goel wrote:
> On Fri, Feb 20, 2015 at 11:15 PM, Michel Thierry
> <michel.thierry@intel.com>  wrote:
>> From: Ben Widawsky<benjamin.widawsky@intel.com>
>>
>> Note that there is no gen8 ppgtt debug_dump function yet.
>>
>> Signed-off-by: Ben Widawsky<ben@bwidawsk.net>
>> Signed-off-by: Michel Thierry<michel.thierry@intel.com>
>> ---
>>   drivers/gpu/drm/i915/i915_debugfs.c | 19 ++++++++++---------
>>   drivers/gpu/drm/i915/i915_gem_gtt.c | 32 ++++++++++++++++++++++++++++++++
>>   drivers/gpu/drm/i915/i915_gem_gtt.h |  9 +++++++++
>>   3 files changed, 51 insertions(+), 9 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
>> index 40630bd..93c34ab 100644
>> --- a/drivers/gpu/drm/i915/i915_debugfs.c
>> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
>> @@ -2165,7 +2165,6 @@ static void gen6_ppgtt_info(struct seq_file *m, struct drm_device *dev)
>>   {
>>          struct drm_i915_private *dev_priv = dev->dev_private;
>>          struct intel_engine_cs *ring;
>> -       struct drm_file *file;
>>          int i;
>>
>>          if (INTEL_INFO(dev)->gen == 6)
>> @@ -2189,14 +2188,6 @@ static void gen6_ppgtt_info(struct seq_file *m, struct drm_device *dev)
>>
>>                  ppgtt->debug_dump(ppgtt, m);
>>          }
>> -
>> -       list_for_each_entry_reverse(file, &dev->filelist, lhead) {
>> -               struct drm_i915_file_private *file_priv = file->driver_priv;
>> -
>> -               seq_printf(m, "proc: %s\n",
>> -                          get_pid_task(file->pid, PIDTYPE_PID)->comm);
>> -               idr_for_each(&file_priv->context_idr, per_file_ctx, m);
>> -       }
>>   }
>>
>>   static int i915_ppgtt_info(struct seq_file *m, void *data)
>> @@ -2204,6 +2195,7 @@ static int i915_ppgtt_info(struct seq_file *m, void *data)
>>          struct drm_info_node *node = m->private;
>>          struct drm_device *dev = node->minor->dev;
>>          struct drm_i915_private *dev_priv = dev->dev_private;
>> +       struct drm_file *file;
>>
>>          int ret = mutex_lock_interruptible(&dev->struct_mutex);
>>          if (ret)
>> @@ -2215,6 +2207,15 @@ static int i915_ppgtt_info(struct seq_file *m, void *data)
>>          else if (INTEL_INFO(dev)->gen >= 6)
>>                  gen6_ppgtt_info(m, dev);
>>
>> +       list_for_each_entry_reverse(file, &dev->filelist, lhead) {
>> +               struct drm_i915_file_private *file_priv = file->driver_priv;
>> +
>> +               seq_printf(m, "\nproc: %s\n",
>> +                          get_pid_task(file->pid, PIDTYPE_PID)->comm);
>> +               idr_for_each(&file_priv->context_idr, per_file_ctx,
>> +                            (void *)(unsigned long)m);
>> +       }
>> +
>>          intel_runtime_pm_put(dev_priv);
>>          mutex_unlock(&dev->struct_mutex);
>>
>> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
>> index ecfb62a..1edcc17 100644
>> --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
>> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
>> @@ -2125,6 +2125,38 @@ static void gen8_ggtt_clear_range(struct i915_address_space *vm,
>>          readl(gtt_base);
>>   }
>>
>> +void gen8_for_every_pdpe_pde(struct i915_hw_ppgtt *ppgtt,
>> +                            void (*callback)(struct i915_page_directory_pointer_entry *pdp,
>> +                                             struct i915_page_directory_entry *pd,
>> +                                             struct i915_page_table_entry *pt,
>> +                                             unsigned pdpe,
>> +                                             unsigned pde,
>> +                                             void *data),
>> +                            void *data)
>> +{
>> +       uint64_t start = ppgtt->base.start;
>> +       uint64_t length = ppgtt->base.total;
>> +       uint64_t pdpe, pde, temp;
>> +
>> +       struct i915_page_directory_entry *pd;
>> +       struct i915_page_table_entry *pt;
>> +
>> +       gen8_for_each_pdpe(pd, &ppgtt->pdp, start, length, temp, pdpe) {
>> +               uint64_t pd_start = start, pd_length = length;
>> +               int i;
>> +
>> +               if (pd == NULL) {
>> +                       for (i = 0; i < GEN8_PDES_PER_PAGE; i++)
>> +                               callback(&ppgtt->pdp, NULL, NULL, pdpe, i, data);
>> +                       continue;
>> +               }
>> +
>> +               gen8_for_each_pde(pt, pd, pd_start, pd_length, temp, pde) {
>> +                       callback(&ppgtt->pdp, pd, pt, pdpe, pde, data);
>> +               }
>> +       }
>> +}
>> +
>>   static void gen6_ggtt_clear_range(struct i915_address_space *vm,
>>                                    uint64_t start,
>>                                    uint64_t length,
>> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.h b/drivers/gpu/drm/i915/i915_gem_gtt.h
>> index a33c6e9..144858e 100644
>> --- a/drivers/gpu/drm/i915/i915_gem_gtt.h
>> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.h
>> @@ -483,6 +483,15 @@ static inline size_t gen8_pde_count(uint64_t addr, uint64_t length)
>>          return i915_pde_index(end, GEN8_PDE_SHIFT) - i915_pde_index(addr, GEN8_PDE_SHIFT);
>>   }
>>
>> +void gen8_for_every_pdpe_pde(struct i915_hw_ppgtt *ppgtt,
>> +                            void (*callback)(struct i915_page_directory_pointer_entry *pdp,
>> +                                             struct i915_page_directory_entry *pd,
>> +                                             struct i915_page_table_entry *pt,
>> +                                             unsigned pdpe,
>> +                                             unsigned pde,
>> +                                             void *data),
>> +                            void *data);
>> +
> Caller of gen8_for_every_pdpe_pde is not there.
> What is the (envisaged) usage of this function ?
Stale code from a previous rebase. I'll remove it.
>>   int i915_gem_gtt_init(struct drm_device *dev);
>>   void i915_gem_init_global_gtt(struct drm_device *dev);
>>   void i915_global_gtt_cleanup(struct drm_device *dev);
>> --
>> 2.1.1
>>
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx