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

drm/i915/gmch: pass display to DISPLAY_VER() 



Underneath, DISPLAY_VER() really expects struct intel_display. Switch to
it in preparation for removing the transitional __to_intel_display()
macro.

Reviewed-by: default avatarGustavo Sousa <gustavo.sousa@intel.com>
Link: https://lore.kernel.org/r/1f951102b3d073fd58c5211f399750aa80b51548.1754499175.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 7eb94966

drivers/gpu/drm/i915/soc/intel_gmch.c

+2 −1
Original line number Diff line number Diff line
@@ -148,7 +148,8 @@ void intel_gmch_bar_teardown(struct drm_i915_private *i915) 


int intel_gmch_vga_set_state(struct drm_i915_private *i915, bool enable_decode)

{

	unsigned int reg = DISPLAY_VER(i915) >= 6 ? SNB_GMCH_CTRL : INTEL_GMCH_CTRL;

	struct intel_display *display = i915->display;

	unsigned int reg = DISPLAY_VER(display) >= 6 ? SNB_GMCH_CTRL : INTEL_GMCH_CTRL;

	u16 gmch_ctrl;



	if (pci_read_config_word(i915->gmch.pdev, reg, &gmch_ctrl)) {