Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c841e57 authored by Jani Nikula's avatar Jani Nikula Committed by Daniel Vetter
Browse files

drm/i915: reduce line width in {pch, i9xx}_get_hpd_pins() 



Make Paulo happier.

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 77913b39

drivers/gpu/drm/i915/i915_irq.c

+18 −11
Original line number Diff line number Diff line
@@ -1257,8 +1257,10 @@ static bool i9xx_port_hotplug_long_detect(enum port port, u32 val) 


/* Get a bit mask of pins that have triggered, and which ones may be long. */

static void pch_get_hpd_pins(u32 *pin_mask, u32 *long_mask,

			     u32 hotplug_trigger, u32 dig_hotplug_reg, const u32 hpd[HPD_NUM_PINS])

			     u32 hotplug_trigger, u32 dig_hotplug_reg,

			     const u32 hpd[HPD_NUM_PINS])

{

	enum port port;

	int i;



	*pin_mask = 0;
@@ -1268,13 +1270,15 @@ static void pch_get_hpd_pins(u32 *pin_mask, u32 *long_mask, 
		return;



	for_each_hpd_pin(i) {

		if (hpd[i] & hotplug_trigger) {

		if ((hpd[i] & hotplug_trigger) == 0)

			continue;



		*pin_mask |= BIT(i);



			if (pch_port_hotplug_long_detect(intel_hpd_pin_to_port(i), dig_hotplug_reg))

		port = intel_hpd_pin_to_port(i);

		if (pch_port_hotplug_long_detect(port, dig_hotplug_reg))

			*long_mask |= BIT(i);

	}

	}



	DRM_DEBUG_DRIVER("hotplug event received, stat 0x%08x, dig 0x%08x, pins 0x%08x\n",

			 hotplug_trigger, dig_hotplug_reg, *pin_mask);
@@ -1285,6 +1289,7 @@ static void pch_get_hpd_pins(u32 *pin_mask, u32 *long_mask, 
static void i9xx_get_hpd_pins(u32 *pin_mask, u32 *long_mask,

			      u32 hotplug_trigger, const u32 hpd[HPD_NUM_PINS])

{

	enum port port;

	int i;



	*pin_mask = 0;
@@ -1294,13 +1299,15 @@ static void i9xx_get_hpd_pins(u32 *pin_mask, u32 *long_mask, 
		return;



	for_each_hpd_pin(i) {

		if (hpd[i] & hotplug_trigger) {

		if ((hpd[i] & hotplug_trigger) == 0)

			continue;



		*pin_mask |= BIT(i);



			if (i9xx_port_hotplug_long_detect(intel_hpd_pin_to_port(i), hotplug_trigger))

		port = intel_hpd_pin_to_port(i);

		if (i9xx_port_hotplug_long_detect(port, hotplug_trigger))

			*long_mask |= BIT(i);

	}

	}



	DRM_DEBUG_DRIVER("hotplug event received, stat 0x%08x, pins 0x%08x\n",

			 hotplug_trigger, *pin_mask);