From: Jani Nikula Date: Mon, 28 Oct 2024 19:48:47 +0000 (+0200) Subject: drm/i915/vga: use display->platform. instead of IS_() X-Git-Tag: v6.13-rc1~122^2~7^2~28 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ac87b7a5a0336154f3330ad4858e895ae647520e;p=thirdparty%2Fkernel%2Flinux.git drm/i915/vga: use display->platform. instead of IS_() Switch to using the new display->platform. members for platform identification in display code. Reviewed-by: Rodrigo Vivi Link: https://patchwork.freedesktop.org/patch/msgid/ee09546f217723a5f869749562eea7d6e97472f7.1730144869.git.jani.nikula@intel.com Signed-off-by: Jani Nikula --- diff --git a/drivers/gpu/drm/i915/display/intel_vga.c b/drivers/gpu/drm/i915/display/intel_vga.c index 2c76a0176a357..fd18dd07ae491 100644 --- a/drivers/gpu/drm/i915/display/intel_vga.c +++ b/drivers/gpu/drm/i915/display/intel_vga.c @@ -16,9 +16,7 @@ static i915_reg_t intel_vga_cntrl_reg(struct intel_display *display) { - struct drm_i915_private *i915 = to_i915(display->drm); - - if (IS_VALLEYVIEW(i915) || IS_CHERRYVIEW(i915)) + if (display->platform.valleyview || display->platform.cherryview) return VLV_VGACNTRL; else if (DISPLAY_VER(display) >= 5) return CPU_VGACNTRL;