Re: [Intel-gfx] [PATCH 0/7] drm/i915: i915_drv.h & i915_gem.h header refactoring

[Jani Nikula <jani.nikula@intel.com>]

On Mon, 06 Jun 2022, Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> wrote:
> On 03/06/2022 14:05, Jani Nikula wrote:
>> Turn i915_gem.h into a useful header that contains stuff the name
>> implies, and clean up i915_drv.h a bit.
>> 
>> Jani Nikula (7):
>>    drm/i915/tasklet: separate local hacks around struct tasklet_struct
>>    drm/i915/debug: add new i915_debug.h for debug asserts
>>    drm/i915: un-inline i915_gem_drain_* functions
>>    drm/i915/gem: split out the gem stuff from i915_drv.h
>>    drm/i915/drv: drop intel_bios.h include
>>    drm/i915/client: only include what's needed
>>    drm/i915/utils: throw out unused stuff
>
> Read through it all and it looks good. For the series:
>
> Acked-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

And again conflicts badly between our -next branches. I wonder how we'll
move this forward. Maybe I need to split out the low hanging fruit first
and send them separately.

BR,
Jani.


>
> Regards,
>
> Tvrtko
>
>>   drivers/gpu/drm/i915/TODO.txt                 |   2 +-
>>   drivers/gpu/drm/i915/display/intel_dpt.c      |   1 +
>>   drivers/gpu/drm/i915/display/intel_dsb.c      |   1 +
>>   drivers/gpu/drm/i915/display/intel_overlay.c  |   1 +
>>   drivers/gpu/drm/i915/gem/i915_gem_context.h   |   1 -
>>   drivers/gpu/drm/i915/gem/i915_gem_domain.c    |   1 +
>>   .../gpu/drm/i915/gem/i915_gem_execbuffer.c    |   1 +
>>   drivers/gpu/drm/i915/gem/i915_gem_internal.c  |   1 -
>>   drivers/gpu/drm/i915/gem/i915_gem_mman.c      |   5 +-
>>   drivers/gpu/drm/i915/gem/i915_gem_object.c    |   1 +
>>   drivers/gpu/drm/i915/gem/i915_gem_object.h    |   5 +-
>>   drivers/gpu/drm/i915/gem/i915_gem_phys.c      |   1 +
>>   drivers/gpu/drm/i915/gem/i915_gem_pm.c        |   1 +
>>   drivers/gpu/drm/i915/gem/i915_gem_shrinker.c  |   1 +
>>   drivers/gpu/drm/i915/gem/i915_gem_tiling.c    |   1 -
>>   drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c  |   1 +
>>   drivers/gpu/drm/i915/gem/i915_gem_userptr.c   |   1 +
>>   .../i915/gem/selftests/i915_gem_coherency.c   |   1 +
>>   .../drm/i915/gem/selftests/i915_gem_context.c |   1 +
>>   .../drm/i915/gem/selftests/i915_gem_mman.c    |   1 +
>>   drivers/gpu/drm/i915/gt/gen8_engine_cs.h      |   2 +-
>>   drivers/gpu/drm/i915/gt/intel_engine_stats.h  |   2 +-
>>   drivers/gpu/drm/i915/gt/intel_engine_types.h  |   1 -
>>   drivers/gpu/drm/i915/gt/intel_ggtt.c          |  10 +-
>>   drivers/gpu/drm/i915/gt/intel_gt.c            |   1 +
>>   drivers/gpu/drm/i915/gt/intel_gt_sysfs.h      |   2 -
>>   drivers/gpu/drm/i915/gt/intel_renderstate.h   |   2 +-
>>   drivers/gpu/drm/i915/gt/intel_ring.h          |   2 +-
>>   drivers/gpu/drm/i915/gt/intel_sseu.h          |   5 +-
>>   drivers/gpu/drm/i915/gt/selftest_migrate.c    |   2 +
>>   drivers/gpu/drm/i915/gt/selftest_timeline.c   |   1 +
>>   drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h   |   2 +
>>   drivers/gpu/drm/i915/gt/uc/intel_guc_log.h    |   1 -
>>   drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h      |   1 -
>>   drivers/gpu/drm/i915/gvt/scheduler.c          |   1 +
>>   drivers/gpu/drm/i915/i915_debug.h             |  63 ++++++++++
>>   drivers/gpu/drm/i915/i915_debugfs.c           |   1 +
>>   drivers/gpu/drm/i915/i915_driver.c            |   3 +-
>>   drivers/gpu/drm/i915/i915_drm_client.c        |   1 -
>>   drivers/gpu/drm/i915/i915_drm_client.h        |   2 +-
>>   drivers/gpu/drm/i915/i915_drv.h               |  75 ------------
>>   drivers/gpu/drm/i915/i915_gem.c               |  39 ++++++
>>   drivers/gpu/drm/i915/i915_gem.h               | 114 ++++++------------
>>   drivers/gpu/drm/i915/i915_gpu_error.h         |   1 -
>>   drivers/gpu/drm/i915/i915_ioctl.c             |   1 -
>>   drivers/gpu/drm/i915/i915_perf.c              |   1 +
>>   drivers/gpu/drm/i915/i915_request.h           |   1 -
>>   drivers/gpu/drm/i915/i915_scatterlist.h       |   2 +-
>>   drivers/gpu/drm/i915/i915_scheduler.h         |   1 +
>>   drivers/gpu/drm/i915/i915_syncmap.c           |   5 +-
>>   drivers/gpu/drm/i915/i915_tasklet.h           |  43 +++++++
>>   drivers/gpu/drm/i915/i915_ttm_buddy_manager.c |   3 +-
>>   drivers/gpu/drm/i915/i915_utils.h             |  40 ------
>>   drivers/gpu/drm/i915/i915_vma_resource.h      |   1 -
>>   drivers/gpu/drm/i915/intel_gvt.c              |   1 +
>>   .../gpu/drm/i915/selftests/i915_gem_evict.c   |   2 +-
>>   drivers/gpu/drm/i915/selftests/i915_gem_gtt.c |   4 +-
>>   .../gpu/drm/i915/selftests/i915_selftest.c    |   1 +
>>   drivers/gpu/drm/i915/selftests/i915_vma.c     |   2 +-
>>   .../drm/i915/selftests/intel_memory_region.c  |   1 +
>>   60 files changed, 236 insertions(+), 236 deletions(-)
>>   create mode 100644 drivers/gpu/drm/i915/i915_debug.h
>>   create mode 100644 drivers/gpu/drm/i915/i915_tasklet.h
>> 

-- 
Jani Nikula, Intel Open Source Graphics Center