From: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx> A few small patches towards the goal of getting rid of the __I915__ polymorphism. Series starts with three patches to convert some more IS/HAS macros to accepting dev_priv only, and continues with a patch to make all users of INTEL_INFO pass in dev_priv, apart from the ones which can be replaced with INTEL_GEN. This leaves the disruptive conversion to the latter as the only remaining bit before the __I915__ can be completely eliminated. To start with that, last patch converts i915_drv.c, going with the idea to do this gradually over time on a file by file basis. When all this is done at some point in the future, we can also tackle the opportunities to change some local function signatures to take dev_priv and so make further cleanups where appropriate. Tvrtko Ursulin (5): drm/i915: Assorted dev_priv cleanups drm/i915: More assorted dev_priv cleanups drm/i915: Further assorted dev_priv cleanups drm/i915: Pass dev_priv to INTEL_INFO everywhere apart from the gen use drm/i915: Convert i915_drv.c to INTEL_GEN drivers/gpu/drm/i915/i915_drv.c | 18 ++++---- drivers/gpu/drm/i915/i915_drv.h | 70 +++++++++++++++--------------- drivers/gpu/drm/i915/i915_gem.c | 13 +++--- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 6 +-- drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +- drivers/gpu/drm/i915/i915_gem_stolen.c | 3 +- drivers/gpu/drm/i915/i915_gem_userptr.c | 3 +- drivers/gpu/drm/i915/i915_gpu_error.c | 4 +- drivers/gpu/drm/i915/i915_irq.c | 8 ++-- drivers/gpu/drm/i915/intel_color.c | 31 ++++++------- drivers/gpu/drm/i915/intel_crt.c | 8 ++-- drivers/gpu/drm/i915/intel_display.c | 32 +++++++------- drivers/gpu/drm/i915/intel_dp.c | 8 ++-- drivers/gpu/drm/i915/intel_fbdev.c | 10 ++--- drivers/gpu/drm/i915/intel_guc_loader.c | 10 ++--- drivers/gpu/drm/i915/intel_hotplug.c | 2 +- drivers/gpu/drm/i915/intel_pm.c | 7 +-- drivers/gpu/drm/i915/intel_psr.c | 2 +- 18 files changed, 118 insertions(+), 119 deletions(-) -- 2.7.4 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx