From: Ville Syrjälä <[email protected]> Replace the hardcoded PTE vs. memory region is_local checks in the BIOS FB takeover with intel_memory_region_type_is_local().
Signed-off-by: Ville Syrjälä <[email protected]> --- drivers/gpu/drm/i915/display/intel_plane_initial.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_plane_initial.c b/drivers/gpu/drm/i915/display/intel_plane_initial.c index d522da7000ff..6abe17be0add 100644 --- a/drivers/gpu/drm/i915/display/intel_plane_initial.c +++ b/drivers/gpu/drm/i915/display/intel_plane_initial.c @@ -94,9 +94,10 @@ initial_plane_phys_lmem(struct intel_display *display, return false; } - if (!is_local) { + if (intel_memory_type_is_local(mem->type) != is_local) { drm_err(display->drm, - "Initial plane FB PTE not LMEM\n"); + "Initial plane FB PTE unsuitable for %s\n", + mem->region.name); return false; } @@ -152,9 +153,10 @@ initial_plane_phys_smem(struct intel_display *display, return false; } - if (is_local) { + if (intel_memory_type_is_local(mem->type) != is_local) { drm_err(display->drm, - "Initial plane FB PTE LMEM\n"); + "Initial plane FB PTE unsuitable for %s\n", + mem->region.name); return false; } -- 2.45.3
