kernel-packages team mailing list archive

[Thomas Bonfort <thomas.bonfort@xxxxxxxxx>]

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;
>>>>>>> theirs

        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;
}

-- 
You received this bug notification because you are a member of Kernel
Packages, which is subscribed to linux in Ubuntu.
https://bugs.launchpad.net/bugs/1554613

Title:
  screen flickering on XPS13 9350

Status in Linux:
  Incomplete
Status in linux package in Ubuntu:
  Triaged

Bug description:
  see LP: #1552304

  does not affect 4.4.0-8
  affects 4.4.0-9 to 4.4.0-16

  ProblemType: Bug
  DistroRelease: Ubuntu 16.04
  Package: linux-image-generic 4.4.0.11.12
  ProcVersionSignature: Ubuntu 4.4.0-8.23-generic 4.4.2
  Uname: Linux 4.4.0-8-generic x86_64
  ApportVersion: 2.20-0ubuntu3
  Architecture: amd64
  AudioDevicesInUse:
   USER        PID ACCESS COMMAND
   /dev/snd/controlC0:  tbonfort   1498 F.... pulseaudio
  CurrentDesktop: KDE
  Date: Tue Mar  8 09:57:12 2016
  HibernationDevice: RESUME=UUID=3248e0d7-0dac-4ccc-8982-b5ac5ce6ed5e
  InstallationDate: Installed on 2016-01-07 (61 days ago)
  InstallationMedia: Ubuntu 15.10 "Wily Werewolf" - Release amd64 (20151021)
  Lsusb:
   Bus 002 Device 001: ID 1d6b:0003 Linux Foundation 3.0 root hub
   Bus 001 Device 003: ID 0c45:670c Microdia
   Bus 001 Device 002: ID 0a5c:6412 Broadcom Corp.
   Bus 001 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub
  MachineType: Dell Inc. XPS 13 9350
  ProcFB: 0 inteldrmfb
  ProcKernelCmdLine: BOOT_IMAGE=/boot/vmlinuz-4.4.0-8-generic root=UUID=757547b8-d0e4-4eb8-8afd-920b743f99a4 ro quiet splash vt.handoff=7
  RelatedPackageVersions:
   linux-restricted-modules-4.4.0-8-generic N/A
   linux-backports-modules-4.4.0-8-generic  N/A
   linux-firmware                           1.156
  SourcePackage: linux
  UpgradeStatus: Upgraded to xenial on 2016-02-28 (9 days ago)
  dmi.bios.date: 01/08/2016
  dmi.bios.vendor: Dell Inc.
  dmi.bios.version: 1.2.3
  dmi.board.name: 07TYC2
  dmi.board.vendor: Dell Inc.
  dmi.board.version: A01
  dmi.chassis.type: 9
  dmi.chassis.vendor: Dell Inc.
  dmi.modalias: dmi:bvnDellInc.:bvr1.2.3:bd01/08/2016:svnDellInc.:pnXPS139350:pvr:rvnDellInc.:rn07TYC2:rvrA01:cvnDellInc.:ct9:cvr:
  dmi.product.name: XPS 13 9350
  dmi.sys.vendor: Dell Inc.

To manage notifications about this bug go to:
https://bugs.launchpad.net/linux/+bug/1554613/+subscriptions