~kamalmostafa/ubuntu/+source/linux/+git/cosmic:cosmic-stable

Last commit made on 2019-01-08
Get this branch:
git clone -b cosmic-stable https://git.launchpad.net/~kamalmostafa/ubuntu/+source/linux/+git/cosmic
Only Kamal Mostafa can upload to this branch. If you are Kamal Mostafa please log in for upload directions.

Branch merges

Branch information

Name:
cosmic-stable
Repository:
lp:~kamalmostafa/ubuntu/+source/linux/+git/cosmic

Recent commits

fa0bf0d... by Greg Kroah-Hartman <email address hidden>

Linux 4.18.20

BugLink: http://bugs.launchpad.net/bugs/1810821

Signed-off-by: Kamal Mostafa <email address hidden>

5d4622d... by Stefano Stabellini <email address hidden>

CONFIG_XEN_PV breaks xen_create_contiguous_region on ARM

BugLink: http://bugs.launchpad.net/bugs/1810821

commit f9005571701920551bcf54a500973fb61f2e1eda upstream.

xen_create_contiguous_region has now only an implementation if
CONFIG_XEN_PV is defined. However, on ARM we never set CONFIG_XEN_PV but
we do have an implementation of xen_create_contiguous_region which is
required for swiotlb-xen to work correctly (although it just sets
*dma_handle).

[backport: remove change to xen_remap_pfn]

Cc: <email address hidden> # 4.12
Fixes: 16624390816c ("xen: create xen_create/destroy_contiguous_region() stubs for PVHVM only builds")
Signed-off-by: Stefano Stabellini <email address hidden>
Reviewed-by: Juergen Gross <email address hidden>
CC: <email address hidden>
CC: <email address hidden>
CC: <email address hidden>
CC: <email address hidden>
CC: <email address hidden>
CC: <email address hidden>
CC: <email address hidden>
Signed-off-by: Juergen Gross <email address hidden>
Signed-off-by: Greg Kroah-Hartman <email address hidden>
Signed-off-by: Kamal Mostafa <email address hidden>

b747cd7... by Lyude Paul <email address hidden>

drm/i915: Fix possible race in intel_dp_add_mst_connector()

BugLink: http://bugs.launchpad.net/bugs/1810821

commit 7c4512300cfa5a4dcc8c1c52ae61e3fa4bd11a39 upstream.

This hasn't caused any issues yet that I'm aware of, but as Ville
Syrjälä pointed out - we need to make sure that
intel_connector->mst_port is set before initializing MST connectors,
since in theory we could potentially check intel_connector->mst_port in
i915_hpd_poll_init_work() after registering the connector but before
having written it's value.

Signed-off-by: Lyude Paul <email address hidden>
Reviewed-by: Ville Syrjälä <email address hidden>
Cc: Rodrigo Vivi <email address hidden>
Cc: <email address hidden>
Link: https://patchwork<email address hidden>
(cherry picked from commit 66a5ab1034be801630816d1fa6cfc30db1a2f0b0)
Signed-off-by: Joonas Lahtinen <email address hidden>
Signed-off-by: Greg Kroah-Hartman <email address hidden>
Signed-off-by: Kamal Mostafa <email address hidden>

f0c6d07... by Chris Wilson

drm/i915/execlists: Force write serialisation into context image vs execution

BugLink: http://bugs.launchpad.net/bugs/1810821

commit 0a823e8fd4fd67726697854578f3584ee3a49b1d upstream.

Ensure that the writes into the context image are completed prior to the
register mmio to trigger execution. Although previously we were assured
by the SDM that all writes are flushed before an uncached memory
transaction (our mmio write to submit the context to HW for execution),
we have empirical evidence to believe that this is not actually the
case.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108656
References: https://bugs.freedesktop.org/show_bug.cgi?id=108315
References: https://bugs.freedesktop.org/show_bug.cgi?id=106887
Signed-off-by: Chris Wilson <email address hidden>
Cc: Mika Kuoppala <email address hidden>
Cc: Tvrtko Ursulin <email address hidden>
Acked-by: Mika Kuoppala <email address hidden>
Link: https://patchwork<email address hidden>
Cc: <email address hidden>
(cherry picked from commit 987abd5c62f92ee4970b45aa077f47949974e615)
Signed-off-by: Joonas Lahtinen <email address hidden>
Signed-off-by: Greg Kroah-Hartman <email address hidden>
Signed-off-by: Kamal Mostafa <email address hidden>

a253449... by Chris Wilson

drm/i915/ringbuffer: Delay after EMIT_INVALIDATE for gen4/gen5

BugLink: http://bugs.launchpad.net/bugs/1810821

commit fb5bbae9b1333d44023713946fdd28db0cd85751 upstream.

Exercising the gpu reloc path strenuously revealed an issue where the
updated relocations (from MI_STORE_DWORD_IMM) were not being observed
upon execution. After some experiments with adding pipecontrols (a lot
of pipecontrols (32) as gen4/5 do not have a bit to wait on earlier pipe
controls or even the current on), it was discovered that we merely
needed to delay the EMIT_INVALIDATE by several flushes. It is important
to note that it is the EMIT_INVALIDATE as opposed to the EMIT_FLUSH that
needs the delay as opposed to what one might first expect -- that the
delay is required for the TLB invalidation to take effect (one presumes
to purge any CS buffers) as opposed to a delay after flushing to ensure
the writes have landed before triggering invalidation.

Testcase: igt/gem_tiled_fence_blits
Signed-off-by: Chris Wilson <email address hidden>
Cc: <email address hidden>
Reviewed-by: Ville Syrjälä <email address hidden>
Link: https://patchwork<email address hidden>
(cherry picked from commit 55f99bf2a9c331838c981694bc872cd1ec4070b2)
Signed-off-by: Joonas Lahtinen <email address hidden>
Signed-off-by: Greg Kroah-Hartman <email address hidden>
Signed-off-by: Kamal Mostafa <email address hidden>

9b6a75c... by Chris Wilson

drm/i915: Mark pin flags as u64

BugLink: http://bugs.launchpad.net/bugs/1810821

commit 0014868b9c3c1dda1de6711cf58c3486fb422d07 upstream.

Since the flags are being used to operate on a u64 variable, they too
need to be marked as such so that the inverses are full width (and not
zero extended on 32b kernels and bdw+).

Reported-by: Sergii Romantsov <email address hidden>
Signed-off-by: Chris Wilson <email address hidden>
Cc: <email address hidden>
Reviewed-by: Lionel Landwerlin <email address hidden>
Reviewed-by: Michal Wajdeczko <email address hidden>
Link: https://patchwork<email address hidden>
(cherry picked from commit 83b466b1dc5f0b4d33f0a901e8b00197a8f3582d)
Signed-off-by: Joonas Lahtinen <email address hidden>
Signed-off-by: Greg Kroah-Hartman <email address hidden>
Signed-off-by: Kamal Mostafa <email address hidden>

6f28d51... by =?utf-8?b?VmlsbGUgU3lyasOkbMOk?= <email address hidden>

drm/i915: Don't oops during modeset shutdown after lpe audio deinit

BugLink: http://bugs.launchpad.net/bugs/1810821

commit 6a8915d0f8cf323e1beb792a33095cf652db4056 upstream.

We deinit the lpe audio device before we call
drm_atomic_helper_shutdown(), which means the platform device
may already be gone when it comes time to shut down the crtc.
As we don't know when the last reference to the platform
device gets dropped by the audio driver we can't assume that
the device and its data are still around when turning off the
crtc. Mark the platform device as gone as soon as we do the
audio deinit.

Cc: <email address hidden>
Signed-off-by: Ville Syrjälä <email address hidden>
Link: https://patchwork<email address hidden>
Reviewed-by: Chris Wilson <email address hidden>
(cherry picked from commit f45a7977d1140c11f334e01a9f77177ed68e3bfa)
Signed-off-by: Joonas Lahtinen <email address hidden>
Signed-off-by: Greg Kroah-Hartman <email address hidden>
Signed-off-by: Kamal Mostafa <email address hidden>

ed0d143... by Chris Wilson

drm/i915: Compare user's 64b GTT offset even on 32b

BugLink: http://bugs.launchpad.net/bugs/1810821

commit 085603287452fc96376ed4888bf29f8c095d2b40 upstream.

Beware mixing unsigned long constants and 64b values, as on 32b the
constant will be zero extended and discard the high 32b when used as
a mask!

Reported-by: Sergii Romantsov <email address hidden>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108282
Signed-off-by: Chris Wilson <email address hidden>
Cc: Joonas Lahtinen <email address hidden>
Cc: <email address hidden>
Reviewed-by: Matthew Auld <email address hidden>
Link: https://patchwork<email address hidden>
(cherry picked from commit 6fc4e48f9ed46e9adff236a0c350074aafa3b7fa)
Signed-off-by: Joonas Lahtinen <email address hidden>
Signed-off-by: Greg Kroah-Hartman <email address hidden>
Signed-off-by: Kamal Mostafa <email address hidden>

9ab7ecc... by =?utf-8?b?VmlsbGUgU3lyasOkbMOk?= <email address hidden>

drm/i915: Fix ilk+ watermarks when disabling pipes

BugLink: http://bugs.launchpad.net/bugs/1810821

commit df5e31c204b34e8d9e5ec33f5b28e960c4f25e14 upstream.

We're no longer programming any watermarks when we're disabling
a pipe. That means ilk_wm_merge() & co. will keep considering
the any pipe that is getting disabled as still enabled. Thus we
either get no LP1+ watermakrs (ilk-ivb), or we get suboptimal
ones (hsw-bdw).

This seems to have been broken by commit b6b178a77210 ("drm/i915:
Calculate ironlake intermediate watermarks correctly, v2."). Before
that we apparently had some difference between the intermediate
and optimal watermarks and so we would program the optiomal ones.
Now intermediate and optimal are identical for disabled pipes
and so we don't program either.

Fix this by programming the intermediate watermarks even for
disabled pipes. We were already doing that for skl+. We'll
leave out gmch platforms for now since those do the merging
in a different manner and should work as is. We'll want to
unify this eventually, but play it safe for now and just put
in a FIXME.

Cc: <email address hidden>
Cc: Matt Roper <email address hidden>
Cc: Maarten Lankhorst <email address hidden>
Fixes: b6b178a77210 ("drm/i915: Calculate ironlake intermediate watermarks correctly, v2.")
Signed-off-by: Ville Syrjälä <email address hidden>
Link: https://patchwork.<email address hidden>
Reviewed-by: Maarten Lankhorst <email address hidden> #irc
(cherry picked from commit a748faea3bfd7fd1d1485bc1c426c7d460cc6503)
Signed-off-by: Joonas Lahtinen <email address hidden>
Signed-off-by: Greg Kroah-Hartman <email address hidden>
Signed-off-by: Kamal Mostafa <email address hidden>

f9be912... by =?utf-8?b?VmlsbGUgU3lyasOkbMOk?= <email address hidden>

drm/i915: Fix error handling for the NV12 fb dimensions check

BugLink: http://bugs.launchpad.net/bugs/1810821

commit f42f343887016330b321dd40eebc68c7292e4f1b upstream.

Let's not leak obj->framebuffer_references when we decide that
the framebuffer domensions are not suitable for NV12.

Cc: <email address hidden>
Cc: Maarten Lankhorst <email address hidden>
Cc: Vidya Srinivas <email address hidden>
Fixes: e44134f2673c ("drm/i915: Add NV12 support to intel_framebuffer_init")
Signed-off-by: Ville Syrjälä <email address hidden>
Link: https://patchwork.<email address hidden>
Reviewed-by: Matt Roper <email address hidden>
(cherry picked from commit 3b90946fcb6f13b65888c380461793a9dea9d1f4)
Signed-off-by: Joonas Lahtinen <email address hidden>
Signed-off-by: Greg Kroah-Hartman <email address hidden>
Signed-off-by: Kamal Mostafa <email address hidden>