Backmerge v4.1-rc4 into into drm-next

We picked up a silent conflict in amdkfd with drm-fixes and drm-next,
backmerge v4.1-rc5 and fix the conflicts

Signed-off-by: Dave Airlie <airlied@redhat.com>

Conflicts:
	drivers/gpu/drm/drm_irq.c

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/pinctrl/qcom/pinctrl-spmi-mpp.c b/drivers/pinctrl/qcom/pinctrl-spmi-mpp.c
index 8f36c5f91949..211b942ad6d5 100644
--- a/drivers/pinctrl/qcom/pinctrl-spmi-mpp.c
+++ b/drivers/pinctrl/qcom/pinctrl-spmi-mpp.c
@@ -370,6 +370,7 @@ static int pmic_mpp_set_mux(struct pinctrl_dev *pctldev, unsigned function,
                 }
         }
 
+        val = val << PMIC_MPP_REG_MODE_DIR_SHIFT;
         val |= pad->function << PMIC_MPP_REG_MODE_FUNCTION_SHIFT;
         val |= pad->out_value & PMIC_MPP_REG_MODE_VALUE_MASK;
 
@@ -576,10 +577,11 @@ static void pmic_mpp_config_dbg_show(struct pinctrl_dev *pctldev,
 
                 if (pad->input_enabled) {
                         ret = pmic_mpp_read(state, pad, PMIC_MPP_REG_RT_STS);
-                        if (!ret) {
-                                ret &= PMIC_MPP_REG_RT_STS_VAL_MASK;
-                                pad->out_value = ret;
-                        }
+                        if (ret < 0)
+                                return;
+
+                        ret &= PMIC_MPP_REG_RT_STS_VAL_MASK;
+                        pad->out_value = ret;
                 }
 
                 seq_printf(s, " %-4s", pad->output_enabled ? "out" : "in");