drm/i915/display: rename I915_HAS_HOTPLUG() to HAS_HOTPLUG

Most of the other display feature check macros are just
HAS_<something>. Follow suit with hotplug check.

Reviewed-by: Uma Shankar <uma.shankar@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://lore.kernel.org/r/c386ef007ae8bdda1bb9b1b353b1cd2957897842.1742481923.git.jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_crt.c b/drivers/gpu/drm/i915/display/intel_crt.c
index a7f360f89410f3462716602d4858f5b307d6e5f4..cca22d2402e88984f3255c4761c26b4854f8f6e7 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_crt.c
+++ b/drivers/gpu/drm/i915/display/intel_crt.c
@@ -877,7 +877,7 @@ intel_crt_detect(struct drm_connector *connector,
 
        wakeref = intel_display_power_get(display, encoder->power_domain);
 
-       if (I915_HAS_HOTPLUG(display)) {
+       if (HAS_HOTPLUG(display)) {
                /* We can not rely on the HPD pin always being correctly wired
                 * up, for example many KVM do not pass it through, and so
                 * only trust an assertion that the monitor is connected.
@@ -901,7 +901,7 @@ intel_crt_detect(struct drm_connector *connector,
         * broken monitor (without edid) to work behind a broken kvm (that fails
         * to have the right resistors for HP detection) needs to fix this up.
         * For now just bail out. */
-       if (I915_HAS_HOTPLUG(display)) {
+       if (HAS_HOTPLUG(display)) {
                status = connector_status_disconnected;
                goto out;
        }
@@ -1081,7 +1081,7 @@ void intel_crt_init(struct intel_display *display)
 
        crt->base.power_domain = POWER_DOMAIN_PORT_CRT;
 
-       if (I915_HAS_HOTPLUG(display) &&
+       if (HAS_HOTPLUG(display) &&
            !dmi_check_system(intel_spurious_crt_detect)) {
                crt->base.hpd_pin = HPD_CRT;
                crt->base.hotplug = intel_encoder_hotplug;

diff --git a/drivers/gpu/drm/i915/display/intel_display_device.h b/drivers/gpu/drm/i915/display/intel_display_device.h
index 4e9630f65af63f62171dc2bd28d312fcbeba63f8..368b0d3417c26f6977946918f906f6c62c2dadfc 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_device.h
+++ b/drivers/gpu/drm/i915/display/intel_display_device.h
@@ -171,6 +171,7 @@ struct intel_display_platforms {
 #define HAS_GMBUS_BURST_READ(__display)        (DISPLAY_VER(__display) >= 10 || (__display)->platform.kabylake)
 #define HAS_GMBUS_IRQ(__display)       (DISPLAY_VER(__display) >= 4)
 #define HAS_GMCH(__display)            (DISPLAY_INFO(__display)->has_gmch)
+#define HAS_HOTPLUG(__display)         (DISPLAY_INFO(__display)->has_hotplug)
 #define HAS_HW_SAGV_WM(__display)      (DISPLAY_VER(__display) >= 13 && !(__display)->platform.dgfx)
 #define HAS_IPC(__display)             (DISPLAY_INFO(__display)->has_ipc)
 #define HAS_IPS(__display)             ((__display)->platform.haswell_ult || (__display)->platform.broadwell)
@@ -192,7 +193,6 @@ struct intel_display_platforms {
                                         HAS_DSC(__display))
 #define HAS_VRR(__display)             (DISPLAY_VER(__display) >= 11)
 #define INTEL_NUM_PIPES(__display)     (hweight8(DISPLAY_RUNTIME_INFO(__display)->pipe_mask))
-#define I915_HAS_HOTPLUG(__display)    (DISPLAY_INFO(__display)->has_hotplug)
 #define OVERLAY_NEEDS_PHYSICAL(__display)      (DISPLAY_INFO(__display)->overlay_needs_physical)
 #define SUPPORTS_TV(__display)         (DISPLAY_INFO(__display)->supports_tv)
 

diff --git a/drivers/gpu/drm/i915/display/intel_display_irq.c b/drivers/gpu/drm/i915/display/intel_display_irq.c
index 6f78fe6de06a1c93d9339eebd235df606768225c..d9f9b9f78abb1882a714f608f15ef7f18815117e 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_irq.c
+++ b/drivers/gpu/drm/i915/display/intel_display_irq.c
@@ -1900,7 +1900,7 @@ void vlv_display_irq_reset(struct intel_display *display)
 
 void i9xx_display_irq_reset(struct intel_display *display)
 {
-       if (I915_HAS_HOTPLUG(display)) {
+       if (HAS_HOTPLUG(display)) {
                i915_hotplug_interrupt_update(display, 0xffffffff, 0);
                intel_de_rmw(display, PORT_HOTPLUG_STAT(display), 0, 0);
        }

diff --git a/drivers/gpu/drm/i915/display/intel_hotplug_irq.c b/drivers/gpu/drm/i915/display/intel_hotplug_irq.c
index 1bcff3a47745cf916c4d5ad4d57e937d7134f461..2463e61e7802b2a7b36f1fe3ae7162ec5630187c 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_hotplug_irq.c
+++ b/drivers/gpu/drm/i915/display/intel_hotplug_irq.c
@@ -1481,7 +1481,7 @@ void intel_hotplug_irq_init(struct intel_display *display)
        intel_hpd_init_early(display);
 
        if (HAS_GMCH(display)) {
-               if (I915_HAS_HOTPLUG(display))
+               if (HAS_HOTPLUG(display))
                        display->funcs.hotplug = &i915_hpd_funcs;
        } else {
                if (HAS_PCH_DG2(i915))

diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
index 6e2d9929b4d7257ba60484ee035c11b966e024f3..757b9ce7e3b1c9ac0eb4040626db8d25f1dcffb6 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
@@ -2036,7 +2036,7 @@ static u16 intel_sdvo_get_hotplug_support(struct intel_sdvo *intel_sdvo)
        struct intel_display *display = to_intel_display(&intel_sdvo->base);
        u16 hotplug;
 
-       if (!I915_HAS_HOTPLUG(display))
+       if (!HAS_HOTPLUG(display))
                return 0;
 
        /*

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index ba3afc7e38aceff97b96e07da9c7810dafba6b21..c1f938a1da44e78fd755183196b7d8a438eb88ec 100644 (file)
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -954,7 +954,7 @@ static void i915_irq_postinstall(struct drm_i915_private *dev_priv)
                enable_mask |= I915_ASLE_INTERRUPT;
        }
 
-       if (I915_HAS_HOTPLUG(dev_priv)) {
+       if (HAS_HOTPLUG(dev_priv)) {
                dev_priv->irq_mask &= ~I915_DISPLAY_PORT_INTERRUPT;
                enable_mask |= I915_DISPLAY_PORT_INTERRUPT;
        }
@@ -995,7 +995,7 @@ static irqreturn_t i915_irq_handler(int irq, void *arg)
 
                ret = IRQ_HANDLED;
 
-               if (I915_HAS_HOTPLUG(dev_priv) &&
+               if (HAS_HOTPLUG(dev_priv) &&
                    iir & I915_DISPLAY_PORT_INTERRUPT)
                        hotplug_status = i9xx_hpd_irq_ack(display);