diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2019-05-02 18:02:44 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2019-05-03 10:06:44 +0300 |
| commit | fa03cc2e8cc3ec15472591ff07440bf436c4a2c6 (patch) | |
| tree | dc88de6ca0b5b2320c0ad3fd71966608ec51adbb /drivers/gpu/drm/i915/i915_drv.h | |
| parent | 2126d3e990a56c4cc4824c449bae0e98225fcbe0 (diff) | |
| download | linux-stable-fa03cc2e8cc3ec15472591ff07440bf436c4a2c6.tar.gz linux-stable-fa03cc2e8cc3ec15472591ff07440bf436c4a2c6.tar.bz2 linux-stable-fa03cc2e8cc3ec15472591ff07440bf436c4a2c6.zip | |
drm/i915: move i915_vgacntrl_reg() where needed
Reduce clutter from i915_drv.h.
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/d30a79d008b875f708f5acf7924f9ca8ab06b575.1556809195.git.jani.nikula@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index a4ae6ed23620..5f65c75594ef 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -3357,16 +3357,6 @@ extern void intel_display_print_error_state(struct drm_i915_error_state_buf *e, #define INTEL_BROADCAST_RGB_FULL 1 #define INTEL_BROADCAST_RGB_LIMITED 2 -static inline i915_reg_t i915_vgacntrl_reg(struct drm_i915_private *dev_priv) -{ - if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) - return VLV_VGACNTRL; - else if (INTEL_GEN(dev_priv) >= 5) - return CPU_VGACNTRL; - else - return VGACNTRL; -} - static inline unsigned long msecs_to_jiffies_timeout(const unsigned int m) { unsigned long j = msecs_to_jiffies(m); |