4.20-stable patches

added patches:
	bluetooth-fix-unnecessary-error-message-for-hci-request-completion.patch
	drm-amd-display-fix-disabled-cursor-on-top-screen-edge.patch

diff --git a/queue-4.20/bluetooth-fix-unnecessary-error-message-for-hci-request-completion.patch b/queue-4.20/bluetooth-fix-unnecessary-error-message-for-hci-request-completion.patch
new file mode 100644 (file)
index 0000000..99eb408
--- /dev/null
+++ b/queue-4.20/bluetooth-fix-unnecessary-error-message-for-hci-request-completion.patch
@@ -0,0 +1,42 @@
+From 1629db9c75342325868243d6bca5853017d91cf8 Mon Sep 17 00:00:00 2001
+From: Johan Hedberg <johan.hedberg@intel.com>
+Date: Tue, 27 Nov 2018 11:37:46 +0200
+Subject: Bluetooth: Fix unnecessary error message for HCI request completion
+
+From: Johan Hedberg <johan.hedberg@intel.com>
+
+commit 1629db9c75342325868243d6bca5853017d91cf8 upstream.
+
+In case a command which completes in Command Status was sent using the
+hci_cmd_send-family of APIs there would be a misleading error in the
+hci_get_cmd_complete function, since the code would be trying to fetch
+the Command Complete parameters when there are none.
+
+Avoid the misleading error and silently bail out from the function in
+case the received event is a command status.
+
+Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
+Acked-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
+Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
+Tested-by Adam Ford <aford173@gmail.com> #4.19.16
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ net/bluetooth/hci_event.c |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/net/bluetooth/hci_event.c
++++ b/net/bluetooth/hci_event.c
+@@ -5711,6 +5711,12 @@ static bool hci_get_cmd_complete(struct
+               return true;
+       }
+ 
++      /* Check if request ended in Command Status - no way to retreive
++       * any extra parameters in this case.
++       */
++      if (hdr->evt == HCI_EV_CMD_STATUS)
++              return false;
++
+       if (hdr->evt != HCI_EV_CMD_COMPLETE) {
+               bt_dev_err(hdev, "last event is not cmd complete (0x%2.2x)",
+                          hdr->evt);

diff --git a/queue-4.20/drm-amd-display-fix-disabled-cursor-on-top-screen-edge.patch b/queue-4.20/drm-amd-display-fix-disabled-cursor-on-top-screen-edge.patch
new file mode 100644 (file)
index 0000000..1ab30ab
--- /dev/null
+++ b/queue-4.20/drm-amd-display-fix-disabled-cursor-on-top-screen-edge.patch
@@ -0,0 +1,55 @@
+From ae1cf20df7a9c60ff5ef41c3315c33c1a5fafd77 Mon Sep 17 00:00:00 2001
+From: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
+Date: Tue, 11 Dec 2018 12:35:56 -0500
+Subject: drm/amd/display: Fix disabled cursor on top screen edge
+
+From: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
+
+commit ae1cf20df7a9c60ff5ef41c3315c33c1a5fafd77 upstream.
+
+[Why]
+The cursor vanishes when touching the top of edge of the screen for
+Raven on Linux.
+
+This occurs because the cursor height is not taken into account when
+deciding to disable the cursor.
+
+[How]
+Factor in the cursor height into the cursor calculations - and mimic
+the existing x position calculations.
+
+Fixes: 94a4ffd1d40b ("drm/amd/display: fix PIP bugs on Dal3")
+
+Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
+Reviewed-by: Harry Wentland <Harry.Wentland@amd.com>
+Acked-by: Leo Li <sunpeng.li@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c  |    2 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c
++++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c
+@@ -463,7 +463,7 @@ void dpp1_set_cursor_position(
+       if (src_y_offset >= (int)param->viewport.height)
+               cur_en = 0;  /* not visible beyond bottom edge*/
+ 
+-      if (src_y_offset < 0)
++      if (src_y_offset + (int)height <= 0)
+               cur_en = 0;  /* not visible beyond top edge*/
+ 
+       REG_UPDATE(CURSOR0_CONTROL,
+--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c
++++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c
+@@ -1134,7 +1134,7 @@ void hubp1_cursor_set_position(
+       if (src_y_offset >= (int)param->viewport.height)
+               cur_en = 0;  /* not visible beyond bottom edge*/
+ 
+-      if (src_y_offset < 0) //+ (int)hubp->curs_attr.height
++      if (src_y_offset + (int)hubp->curs_attr.height <= 0)
+               cur_en = 0;  /* not visible beyond top edge*/
+ 
+       if (cur_en && REG_READ(CURSOR_SURFACE_ADDRESS) == 0)

diff --git a/queue-4.20/series b/queue-4.20/series
index 240050ebccc1f17dda2506ec2e2ac14a7a50eaf8..c14cf66872e382452b939306f53952e0f9ab4a03 100644 (file)
--- a/queue-4.20/series
+++ b/queue-4.20/series
@@ -118,3 +118,5 @@ mm-swap-use-nr_node_ids-for-avail_lists-in-swap_info.patch
 userfaultfd-clear-flag-if-remap-event-not-enabled.patch
 mm-proc-be-more-verbose-about-unstable-vma-flags-in-.patch
 mm-memblock.c-skip-kmemleak-for-kasan_init.patch
+drm-amd-display-fix-disabled-cursor-on-top-screen-edge.patch
+bluetooth-fix-unnecessary-error-message-for-hci-request-completion.patch