Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa03cc2e authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: move i915_vgacntrl_reg() where needed 



Reduce clutter from i915_drv.h.

Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/d30a79d008b875f708f5acf7924f9ca8ab06b575.1556809195.git.jani.nikula@intel.com
parent 2126d3e9

drivers/gpu/drm/i915/i915_drv.h

+0 −10
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/i915/intel_display.c

+10 −0
Original line number Diff line number Diff line
@@ -15486,6 +15486,16 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv) 
		dev_priv->display.update_crtcs = intel_update_crtcs;

}



static 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;

}



/* Disable the VGA plane that we never use */

static void i915_disable_vga(struct drm_i915_private *dev_priv)

{