<html>
<head>
<base href="https://bugs.freedesktop.org/" />
</head>
<body>
<p>
<div>
<b><a class="bz_bug_link
bz_status_NEEDINFO "
title="NEEDINFO - Flickering Screen on Dell XPS13 9350"
href="https://bugs.freedesktop.org/show_bug.cgi?id=94593#c14">Comment # 14</a>
on <a class="bz_bug_link
bz_status_NEEDINFO "
title="NEEDINFO - Flickering Screen on Dell XPS13 9350"
href="https://bugs.freedesktop.org/show_bug.cgi?id=94593">bug 94593</a>
from <span class="vcard"><a class="email" href="mailto:thomas.bonfort@gmail.com" title="thomas bonfort <thomas.bonfort@gmail.com>"> <span class="fn">thomas bonfort</span></a>
</span></b>
<pre>using 3-way:
/**
* i915_driver_init_mmio - setup device MMIO
* @dev_priv: device private
*
* Setup minimal device state necessary for MMIO accesses later in the
* initialization sequence. The setup here should avoid any other device-wide
* side effects or exposing the driver via kernel internal or user space
* interfaces.
*/
static int i915_driver_init_mmio(struct drm_i915_private *dev_priv)
{
struct drm_device *dev = dev_priv->dev;
int ret;
<<<<<<< ours
if (i915_inject_load_failure())
return -ENODEV;
=======
/* walk the dmi device table for getting platform memory information */
dev_priv->dmi.valid = true;
dmi_walk(dmi_decode_memory_info, dev_priv);
if (!dev_priv->dmi.mem_speed)
dev_priv->dmi.valid = false;
/* Setup the write-once "constant" device info */
device_info = (struct intel_device_info *)&dev_priv->info;
memcpy(device_info, info, sizeof(dev_priv->info));
device_info->device_id = dev->pdev->device;
<span class="quote">>>>>>>> theirs</span >
if (i915_get_bridge_dev(dev))
return -EIO;
ret = i915_mmio_setup(dev);
if (ret < 0)
goto put_bridge;
intel_uncore_init(dev);
return 0;
put_bridge:
pci_dev_put(dev_priv->bridge_dev);
return ret;
}</pre>
</div>
</p>
<hr>
<span>You are receiving this mail because:</span>
<ul>
<li>You are the QA Contact for the bug.</li>
<li>You are on the CC list for the bug.</li>
</ul>
</body>
</html>