[v3,0/3] Make GEN macros more similar

Message

Lucas De Marchi Dec. 6, 2018, 6:11 a.m. UTC

Third version of the series trying to make GEN checks more similar. It's
basically a dial down from what was done in v2 to get the points we have
rough consensus that should be done. Hopefully.

Changes from v2:
  - Don't use GT, but continue with IS_ prefix. If we ever add a check
    for display version (which we are uncertain is actually necessary),
    we can document the convention of using IS_GEN for GT and
    IS_DISPLAY_GEN for display

  - Don't port comparisons using >, >=, <, <=, == over to the macro:
    minimize code churn and in most cases it makes the code more
    difficult to read

  - Don't bring GEN_FOREVER back since we are not covering unbound
    checks anymore with the macros

  - Don't remove INTEL_GEN

Lucas De Marchi (3):
  drm/i915: Rename IS_GEN to IS_GEN_RANGE
  drm/i915: replace IS_GEN<N> with IS_GEN(..., N)
  drm/i915: merge gen checks to use range

 drivers/gpu/drm/i915/gvt/vgpu.c            |  4 +-
 drivers/gpu/drm/i915/i915_cmd_parser.c     |  2 +-
 drivers/gpu/drm/i915/i915_debugfs.c        | 16 ++---
 drivers/gpu/drm/i915/i915_drv.c            | 18 +++---
 drivers/gpu/drm/i915/i915_drv.h            | 31 +++------
 drivers/gpu/drm/i915/i915_gem.c            | 14 ++--
 drivers/gpu/drm/i915/i915_gem_context.c    |  2 +-
 drivers/gpu/drm/i915/i915_gem_execbuffer.c |  4 +-
 drivers/gpu/drm/i915/i915_gem_fence_reg.c  | 10 +--
 drivers/gpu/drm/i915/i915_gem_gtt.c        |  6 +-
 drivers/gpu/drm/i915/i915_gem_stolen.c     |  7 +-
 drivers/gpu/drm/i915/i915_gem_tiling.c     |  4 +-
 drivers/gpu/drm/i915/i915_gpu_error.c      | 18 +++---
 drivers/gpu/drm/i915/i915_irq.c            | 24 +++----
 drivers/gpu/drm/i915/i915_perf.c           |  8 +--
 drivers/gpu/drm/i915/i915_suspend.c        | 12 ++--
 drivers/gpu/drm/i915/intel_atomic.c        |  2 +-
 drivers/gpu/drm/i915/intel_audio.c         |  2 +-
 drivers/gpu/drm/i915/intel_bios.c          |  2 +-
 drivers/gpu/drm/i915/intel_cdclk.c         | 10 +--
 drivers/gpu/drm/i915/intel_crt.c           |  6 +-
 drivers/gpu/drm/i915/intel_device_info.c   | 16 ++---
 drivers/gpu/drm/i915/intel_display.c       | 74 +++++++++++-----------
 drivers/gpu/drm/i915/intel_dp.c            | 24 +++----
 drivers/gpu/drm/i915/intel_engine_cs.c     |  6 +-
 drivers/gpu/drm/i915/intel_fbc.c           | 24 +++----
 drivers/gpu/drm/i915/intel_fifo_underrun.c |  6 +-
 drivers/gpu/drm/i915/intel_guc_fw.c        |  2 +-
 drivers/gpu/drm/i915/intel_hangcheck.c     |  4 +-
 drivers/gpu/drm/i915/intel_lrc.c           |  4 +-
 drivers/gpu/drm/i915/intel_lvds.c          |  4 +-
 drivers/gpu/drm/i915/intel_mocs.c          |  2 +-
 drivers/gpu/drm/i915/intel_overlay.c       | 10 +--
 drivers/gpu/drm/i915/intel_panel.c         |  8 +--
 drivers/gpu/drm/i915/intel_pipe_crc.c      |  8 +--
 drivers/gpu/drm/i915/intel_pm.c            | 60 +++++++++---------
 drivers/gpu/drm/i915/intel_psr.c           |  4 +-
 drivers/gpu/drm/i915/intel_ringbuffer.c    | 36 +++++------
 drivers/gpu/drm/i915/intel_ringbuffer.h    |  4 +-
 drivers/gpu/drm/i915/intel_runtime_pm.c    |  4 +-
 drivers/gpu/drm/i915/intel_sprite.c        |  6 +-
 drivers/gpu/drm/i915/intel_uc.c            |  2 +-
 drivers/gpu/drm/i915/intel_uncore.c        | 30 ++++-----
 drivers/gpu/drm/i915/intel_wopcm.c         |  4 +-
 drivers/gpu/drm/i915/intel_workarounds.c   |  4 +-
 45 files changed, 268 insertions(+), 280 deletions(-)