mbox series

[v2,0/8] RPM Encapsulation

Message ID 20190612183748.7693-1-daniele.ceraolospurio@intel.com (mailing list archive)
Headers show
Series RPM Encapsulation | expand

Message

Daniele Ceraolo Spurio June 12, 2019, 6:37 p.m. UTC
Rebased series after the display power code has been split out.
Mostly the same as V1, just small fixes based on review comments
and CI results. The last patch is new.

The series grows the code a bit, but I believe it is worth it for the
extra logical encapsulation. With all debug options disabled:

add/remove: 0/0 grow/shrink: 92/14 up/down: 1225/-162 (1063)
Total: Before=1266893, After=1267956, chg +0.08%

Daniele Ceraolo Spurio (8):
  drm/i915: prefer i915_runtime_pm in intel_runtime function
  drm/i915: Remove rpm asserts that use i915
  drm/i915: make enable/disable rpm assert function use the rpm
    structure
  drm/i915: move and rename i915_runtime_pm
  drm/i915: move a few more functions to accept the rpm structure
  drm/i915: update rpm_get/put to use the rpm structure
  drm/i915: update with_intel_runtime_pm to use the rpm structure
  drm/i915: make intel_wakeref work on the rpm struct

 drivers/gpu/drm/i915/gem/i915_gem_mman.c      |  11 +-
 drivers/gpu/drm/i915/gem/i915_gem_object.c    |   4 +-
 drivers/gpu/drm/i915/gem/i915_gem_shrinker.c  |  12 +-
 .../gpu/drm/i915/gem/selftests/huge_pages.c   |   4 +-
 .../i915/gem/selftests/i915_gem_coherency.c   |   4 +-
 .../drm/i915/gem/selftests/i915_gem_context.c |  18 +-
 .../drm/i915/gem/selftests/i915_gem_mman.c    |   4 +-
 drivers/gpu/drm/i915/gt/intel_context.c       |   2 +-
 drivers/gpu/drm/i915/gt/intel_engine_cs.c     |   8 +-
 drivers/gpu/drm/i915/gt/intel_engine_pm.c     |   4 +-
 drivers/gpu/drm/i915/gt/intel_gt_pm.c         |   4 +-
 drivers/gpu/drm/i915/gt/intel_hangcheck.c     |   4 +-
 drivers/gpu/drm/i915/gt/intel_reset.c         |   6 +-
 drivers/gpu/drm/i915/gt/selftest_hangcheck.c  |  12 +-
 drivers/gpu/drm/i915/gt/selftest_lrc.c        |  36 ++--
 drivers/gpu/drm/i915/gt/selftest_reset.c      |   6 +-
 .../gpu/drm/i915/gt/selftest_workarounds.c    |  16 +-
 drivers/gpu/drm/i915/gvt/aperture_gm.c        |  17 +-
 drivers/gpu/drm/i915/gvt/gvt.h                |   4 +-
 drivers/gpu/drm/i915/gvt/sched_policy.c       |   4 +-
 drivers/gpu/drm/i915/gvt/scheduler.c          |   4 +-
 drivers/gpu/drm/i915/i915_debugfs.c           |  75 +++----
 drivers/gpu/drm/i915/i915_drv.c               |  62 +++---
 drivers/gpu/drm/i915/i915_drv.h               |  50 +----
 drivers/gpu/drm/i915/i915_gem.c               |  19 +-
 drivers/gpu/drm/i915/i915_gem_fence_reg.c     |   6 +-
 drivers/gpu/drm/i915/i915_gem_gtt.c           |  14 +-
 drivers/gpu/drm/i915/i915_irq.c               |  38 ++--
 drivers/gpu/drm/i915/i915_perf.c              |   6 +-
 drivers/gpu/drm/i915/i915_pmu.c               |  15 +-
 drivers/gpu/drm/i915/i915_sysfs.c             |  14 +-
 drivers/gpu/drm/i915/i915_vma.c               |   2 +-
 drivers/gpu/drm/i915/intel_csr.c              |   2 +-
 drivers/gpu/drm/i915/intel_display.c          |  12 +-
 drivers/gpu/drm/i915/intel_display_power.c    |  39 ++--
 drivers/gpu/drm/i915/intel_drv.h              | 105 ----------
 drivers/gpu/drm/i915/intel_fbdev.c            |   6 +-
 drivers/gpu/drm/i915/intel_guc_log.c          |   6 +-
 drivers/gpu/drm/i915/intel_hotplug.c          |   4 +-
 drivers/gpu/drm/i915/intel_huc.c              |   2 +-
 drivers/gpu/drm/i915/intel_panel.c            |   2 +-
 drivers/gpu/drm/i915/intel_pm.c               |   8 +-
 drivers/gpu/drm/i915/intel_runtime_pm.c       | 162 +++++++--------
 drivers/gpu/drm/i915/intel_runtime_pm.h       | 191 ++++++++++++++++--
 drivers/gpu/drm/i915/intel_uc.c               |   2 +-
 drivers/gpu/drm/i915/intel_uncore.c           |  26 +--
 drivers/gpu/drm/i915/intel_uncore.h           |   4 +-
 drivers/gpu/drm/i915/intel_wakeref.c          |  32 +--
 drivers/gpu/drm/i915/intel_wakeref.h          |  18 +-
 drivers/gpu/drm/i915/selftests/i915_active.c  |   8 +-
 drivers/gpu/drm/i915/selftests/i915_gem.c     |  10 +-
 .../gpu/drm/i915/selftests/i915_gem_evict.c   |   6 +-
 drivers/gpu/drm/i915/selftests/i915_gem_gtt.c |   8 +-
 drivers/gpu/drm/i915/selftests/i915_request.c |  22 +-
 .../gpu/drm/i915/selftests/i915_timeline.c    |  16 +-
 drivers/gpu/drm/i915/selftests/i915_vma.c     |   4 +-
 drivers/gpu/drm/i915/selftests/intel_guc.c    |   8 +-
 drivers/gpu/drm/i915/selftests/intel_uncore.c |   4 +-
 .../gpu/drm/i915/selftests/mock_gem_device.c  |   4 +-
 59 files changed, 594 insertions(+), 602 deletions(-)

Comments

Chris Wilson June 12, 2019, 10:24 p.m. UTC | #1
Quoting Daniele Ceraolo Spurio (2019-06-12 19:37:39)
> Rebased series after the display power code has been split out.
> Mostly the same as V1, just small fixes based on review comments
> and CI results. The last patch is new.
> 
> The series grows the code a bit, but I believe it is worth it for the
> extra logical encapsulation. With all debug options disabled:
> 
> add/remove: 0/0 grow/shrink: 92/14 up/down: 1225/-162 (1063)
> Total: Before=1266893, After=1267956, chg +0.08%
> 
> Daniele Ceraolo Spurio (8):
>   drm/i915: prefer i915_runtime_pm in intel_runtime function
>   drm/i915: Remove rpm asserts that use i915
>   drm/i915: make enable/disable rpm assert function use the rpm
>     structure
>   drm/i915: move and rename i915_runtime_pm
>   drm/i915: move a few more functions to accept the rpm structure
>   drm/i915: update rpm_get/put to use the rpm structure
>   drm/i915: update with_intel_runtime_pm to use the rpm structure
>   drm/i915: make intel_wakeref work on the rpm struct

Looks fine. I can't think of any neat way to avoid the extra offsets, so
we'll just have to think of a better way of dividing up the driver to
avoid loading unneeded code.

Preemptive Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
on the series as nothing leapt out at me from the mechanical churn. 
Please cc Imre on the rebase in case he has a good reason to restructure
it differently.
-Chris