leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Make Paulo happier.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Jani Nikula 2015-06-18 13:06:17 +03:00 committed by Daniel Vetter
parent 77913b39ad
commit 8c841e57ca
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/gpu/drm/i915/i915_irq.c
View File

@ -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. */ /* 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, 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; int i;
*pin_mask = 0; *pin_mask = 0;
@ -1268,12 +1270,14 @@ static void pch_get_hpd_pins(u32 *pin_mask, u32 *long_mask,
return; return;
for_each_hpd_pin(i) { for_each_hpd_pin(i) {
if (hpd[i] & hotplug_trigger) { if ((hpd[i] & hotplug_trigger) == 0)
*pin_mask |= BIT(i); continue;
if (pch_port_hotplug_long_detect(intel_hpd_pin_to_port(i), dig_hotplug_reg)) *pin_mask |= BIT(i);
*long_mask |= BIT(i);
} 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", DRM_DEBUG_DRIVER("hotplug event received, stat 0x%08x, dig 0x%08x, pins 0x%08x\n",
@ -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, static void i9xx_get_hpd_pins(u32 *pin_mask, u32 *long_mask,
u32 hotplug_trigger, const u32 hpd[HPD_NUM_PINS]) u32 hotplug_trigger, const u32 hpd[HPD_NUM_PINS])
{ {
enum port port;
int i; int i;
*pin_mask = 0; *pin_mask = 0;
@ -1294,12 +1299,14 @@ static void i9xx_get_hpd_pins(u32 *pin_mask, u32 *long_mask,
return; return;
for_each_hpd_pin(i) { for_each_hpd_pin(i) {
if (hpd[i] & hotplug_trigger) { if ((hpd[i] & hotplug_trigger) == 0)
*pin_mask |= BIT(i); continue;
if (i9xx_port_hotplug_long_detect(intel_hpd_pin_to_port(i), hotplug_trigger)) *pin_mask |= BIT(i);
*long_mask |= BIT(i);
} 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", DRM_DEBUG_DRIVER("hotplug event received, stat 0x%08x, pins 0x%08x\n",