git.kernelconcepts.de Git - karo-tx-linux.git/log

drm: virtio-gpu: set atomic flag

Advertise atomic mode setting capability to user space.

Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>

commit | commitdiff | tree

Rob Herring [Wed, 13 Jan 2016 21:52:09 +0000 (15:52 -0600)]

drm: virtio-gpu: transfer dumb buffers to host on plane update

For dumb buffers, we need to transfer them to the host when updating a
plane.

Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>

commit | commitdiff | tree

Rob Herring [Wed, 13 Jan 2016 21:52:08 +0000 (15:52 -0600)]

drm: virtio-gpu: ensure plane is flushed to host on atomic update

This fixes drawing updates when updating planes with atomic API.

Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>

commit | commitdiff | tree

Rob Herring [Wed, 13 Jan 2016 21:52:07 +0000 (15:52 -0600)]

drm: virtio-gpu: get the fb from the plane state for atomic updates

When using the atomic API, plane->fb is not set when calling
virtio_gpu_plane_atomic_update. Use plane->state->fb instead.

Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>

commit | commitdiff | tree

Stephen Rothwell [Wed, 10 Feb 2016 22:55:37 +0000 (09:55 +1100)]

Merge remote-tracking branch 'drm-intel-fixes/for-linux-next-fixes'

commit | commitdiff | tree

Stephen Rothwell [Wed, 10 Feb 2016 22:55:30 +0000 (09:55 +1100)]

Merge remote-tracking branch 'char-misc.current/char-misc-linus'

commit | commitdiff | tree

Stephen Rothwell [Wed, 10 Feb 2016 22:55:28 +0000 (09:55 +1100)]

Merge remote-tracking branch 'tty.current/tty-linus'

commit | commitdiff | tree

Stephen Rothwell [Wed, 10 Feb 2016 22:55:27 +0000 (09:55 +1100)]

Merge remote-tracking branch 'driver-core.current/driver-core-linus'

commit | commitdiff | tree

Stephen Rothwell [Wed, 10 Feb 2016 22:55:26 +0000 (09:55 +1100)]

Merge remote-tracking branch 'pci-current/for-linus'

commit | commitdiff | tree

Stephen Rothwell [Wed, 10 Feb 2016 22:55:25 +0000 (09:55 +1100)]

Merge remote-tracking branch 'sound-current/for-linus'

commit | commitdiff | tree

Stephen Rothwell [Wed, 10 Feb 2016 22:55:24 +0000 (09:55 +1100)]

Merge remote-tracking branch 'mac80211/master'

commit | commitdiff | tree

Stephen Rothwell [Wed, 10 Feb 2016 22:55:23 +0000 (09:55 +1100)]

Merge remote-tracking branch 'wireless-drivers/master'

commit | commitdiff | tree

Stephen Rothwell [Wed, 10 Feb 2016 22:55:20 +0000 (09:55 +1100)]

Merge remote-tracking branch 'net/master'

commit | commitdiff | tree

Stephen Rothwell [Wed, 10 Feb 2016 22:55:19 +0000 (09:55 +1100)]

Merge remote-tracking branch 'sparc/master'

commit | commitdiff | tree

Stephen Rothwell [Wed, 10 Feb 2016 22:55:17 +0000 (09:55 +1100)]

Merge remote-tracking branch 'powerpc-fixes/fixes'

commit | commitdiff | tree

Stephen Rothwell [Wed, 10 Feb 2016 22:55:12 +0000 (09:55 +1100)]

Merge remote-tracking branch 'm68k-current/for-linus'

commit | commitdiff | tree

Stephen Rothwell [Wed, 10 Feb 2016 22:55:11 +0000 (09:55 +1100)]

Merge remote-tracking branch 'arm-current/fixes'

commit | commitdiff | tree

Dave Airlie [Wed, 10 Feb 2016 22:32:39 +0000 (08:32 +1000)]

Merge git://linux-arm.org/linux-ld into drm-next

Pull upstream HDLCD driver.

* git://linux-arm.org/linux-ld:
MAINTAINERS: Add Liviu Dudau as maintainer for ARM HDLCD driver.
drm: Add support for ARM's HDLCD controller.

commit | commitdiff | tree

Daniel Borkmann [Wed, 10 Feb 2016 15:47:11 +0000 (16:47 +0100)]

bpf: fix branch offset adjustment on backjumps after patching ctx expansion

When ctx access is used, the kernel often needs to expand/rewrite
instructions, so after that patching, branch offsets have to be
adjusted for both forward and backward jumps in the new eBPF program,
but for backward jumps it fails to account the delta. Meaning, for
example, if the expansion happens exactly on the insn that sits at
the jump target, it doesn't fix up the back jump offset.

Analysis on what the check in adjust_branches() is currently doing:

  /* adjust offset of jmps if necessary */
  if (i < pos && i + insn->off + 1 > pos)
    insn->off += delta;
  else if (i > pos && i + insn->off + 1 < pos)
    insn->off -= delta;

First condition (forward jumps):

  Before:                         After:

  insns[0]                        insns[0]
  insns[1] <--- i/insn            insns[1] <--- i/insn
  insns[2] <--- pos               insns[P] <--- pos
  insns[3]                        insns[P]  `------| delta
  insns[4] <--- target_X          insns[P]   `-----|
  insns[5]                        insns[3]
                                  insns[4] <--- target_X
                                  insns[5]

First case is if we cross pos-boundary and the jump instruction was
before pos. This is handeled correctly. I.e. if i == pos, then this
would mean our jump that we currently check was the patchlet itself
that we just injected. Since such patchlets are self-contained and
have no awareness of any insns before or after the patched one, the
delta is correctly not adjusted. Also, for the second condition in
case of i + insn->off + 1 == pos, means we jump to that newly patched
instruction, so no offset adjustment are needed. That part is correct.

Second condition (backward jumps):

  Before:                         After:

  insns[0]                        insns[0]
  insns[1] <--- target_X          insns[1] <--- target_X
  insns[2] <--- pos <-- target_Y  insns[P] <--- pos <-- target_Y
  insns[3]                        insns[P]  `------| delta
  insns[4] <--- i/insn            insns[P]   `-----|
  insns[5]                        insns[3]
                                  insns[4] <--- i/insn
                                  insns[5]

Second interesting case is where we cross pos-boundary and the jump
instruction was after pos. Backward jump with i == pos would be
impossible and pose a bug somewhere in the patchlet, so the first
condition checking i > pos is okay only by itself. However, i +
insn->off + 1 < pos does not always work as intended to trigger the
adjustment. It works when jump targets would be far off where the
delta wouldn't matter. But, for example, where the fixed insn->off
before pointed to pos (target_Y), it now points to pos + delta, so
that additional room needs to be taken into account for the check.
This means that i) both tests here need to be adjusted into pos + delta,
and ii) for the second condition, the test needs to be <= as pos
itself can be a target in the backjump, too.

Fixes: 9bac3d6d548e ("bpf: allow extended BPF programs access skb fields")
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

commit | commitdiff | tree

Jens Axboe [Wed, 10 Feb 2016 21:22:49 +0000 (14:22 -0700)]

Merge branch 'for-4.6/drivers' into for-next

commit | commitdiff | tree

Ming Lin [Wed, 10 Feb 2016 18:03:32 +0000 (10:03 -0800)]

nvme: split pci module out of core module

NVMe over Fabrics drivers are going to reuse the core,
so splits nvme.ko into 2 modules:

nvme-core.ko: the core part
nvme.ko: the PCI driver

Export symbols from nvme-core.ko.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Ming Lin <ming.l@ssi.samsung.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

commit | commitdiff | tree

Ming Lin [Wed, 10 Feb 2016 18:03:31 +0000 (10:03 -0800)]

nvme: split dev_list_lock

Split dev_list_lock into one in the core and one in the PCI driver.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Sagi Grimberg <sagig@mellanox.com>
Signed-off-by: Ming Lin <ming.l@ssi.samsung.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

Linux kernel for KaRo TX COM modules

RSS Atom