From: Jani Nikula Date: Wed, 6 Aug 2025 16:55:03 +0000 (+0300) Subject: drm/i915/fb: pass display to HAS_GMCH() and DISPLAY_VER() X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5064edaa3446abe8bc649e0c206cc1c4897fd6a9;p=users%2Fhch%2Fmisc.git drm/i915/fb: pass display to HAS_GMCH() and DISPLAY_VER() Convert some leftover i915 usages to struct intel_display. Reviewed-by: Gustavo Sousa Link: https://lore.kernel.org/r/8a209e3f60039986794123e6b1631185c9234f8f.1754499175.git.jani.nikula@intel.com Signed-off-by: Jani Nikula --- diff --git a/drivers/gpu/drm/i915/display/intel_fb_pin.c b/drivers/gpu/drm/i915/display/intel_fb_pin.c index d598a005f847..45af04cb0fb2 100644 --- a/drivers/gpu/drm/i915/display/intel_fb_pin.c +++ b/drivers/gpu/drm/i915/display/intel_fb_pin.c @@ -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 @@ retry: * 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; }