Commit 5064edaa authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/fb: pass display to HAS_GMCH() and DISPLAY_VER() 



Convert some leftover i915 usages to struct intel_display.

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


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

drivers/gpu/drm/i915/display/intel_fb_pin.c

+2 −2
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ intel_fb_pin_to_ggtt(const struct drm_framebuffer *fb, 
	 * happy to scanout from anywhere within its global aperture.

	 */

	pinctl = 0;

	if (HAS_GMCH(dev_priv))

	if (HAS_GMCH(display))

		pinctl |= PIN_MAPPABLE;



	i915_gem_ww_ctx_init(&ww, true);
@@ -193,7 +193,7 @@ intel_fb_pin_to_ggtt(const struct drm_framebuffer *fb, 
		 * mode that matches the user configuration.

		 */

		ret = i915_vma_pin_fence(vma);

		if (ret != 0 && DISPLAY_VER(dev_priv) < 4) {

		if (ret != 0 && DISPLAY_VER(display) < 4) {

			i915_vma_unpin(vma);

			goto err_unpin;

		}