Merge branch 'drm-next-4.19' of git://people.freedesktop.org/~agd5f/linux into drm-next

More fixes for 4.19:
- Fixes for scheduler
- Fix for SR-IOV
- Fixes for display

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180809200052.2777-1-alexander.deucher@amd.com

21 files changed, 194 insertions, 78 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index e839470880d7..1e66dfd0e39c 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -3108,7 +3108,7 @@ static int amdgpu_device_handle_vram_lost(struct amdgpu_device *adev)
         long tmo;
 
         if (amdgpu_sriov_runtime(adev))
-                tmo = msecs_to_jiffies(amdgpu_lockup_timeout);
+                tmo = msecs_to_jiffies(8000);
         else
                 tmo = msecs_to_jiffies(100);
 
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 45e062022461..34f34823bab5 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -1320,7 +1320,12 @@ static int amdgpu_dm_backlight_update_status(struct backlight_device *bd)
 
 static int amdgpu_dm_backlight_get_brightness(struct backlight_device *bd)
 {
-        return bd->props.brightness;
+        struct amdgpu_display_manager *dm = bl_get_data(bd);
+        int ret = dc_link_get_backlight_level(dm->backlight_link);
+
+        if (ret == DC_ERROR_UNEXPECTED)
+                return bd->props.brightness;
+        return ret;
 }
 
 static const struct backlight_ops amdgpu_dm_backlight_ops = {
@@ -1335,6 +1340,7 @@ amdgpu_dm_register_backlight_device(struct amdgpu_display_manager *dm)
         struct backlight_properties props = { 0 };
 
         props.max_brightness = AMDGPU_MAX_BL_LEVEL;
+        props.brightness = AMDGPU_MAX_BL_LEVEL;
         props.type = BACKLIGHT_RAW;
 
         snprintf(bl_name, sizeof(bl_name), "amdgpu_bl%d",
@@ -2109,13 +2115,8 @@ convert_color_depth_from_display_info(const struct drm_connector *connector)
 static enum dc_aspect_ratio
 get_aspect_ratio(const struct drm_display_mode *mode_in)
 {
-        int32_t width = mode_in->crtc_hdisplay * 9;
-        int32_t height = mode_in->crtc_vdisplay * 16;
-
-        if ((width - height) < 10 && (width - height) > -10)
-                return ASPECT_RATIO_16_9;
-        else
-                return ASPECT_RATIO_4_3;
+        /* 1-1 mapping, since both enums follow the HDMI spec. */
+        return (enum dc_aspect_ratio) mode_in->picture_aspect_ratio;
 }
 
 static enum dc_color_space
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c
index b329393307e5..326f6fb7e0bc 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c
@@ -231,18 +231,21 @@ void amdgpu_dm_set_ctm(struct dm_crtc_state *crtc)
  * preparation for hardware commit. If no lut is specified by user, we default
  * to SRGB degamma.
  *
- * Currently, we only support degamma bypass, or preprogrammed SRGB degamma.
- * Programmable degamma is not supported, and an attempt to do so will return
- * -EINVAL.
+ * We support degamma bypass, predefined SRGB, and custom degamma
  *
  * RETURNS:
- * 0 on success, -EINVAL if custom degamma curve is given.
+ * 0 on success
+ * -EINVAL if crtc_state has a degamma_lut of invalid size
+ * -ENOMEM if gamma allocation fails
  */
 int amdgpu_dm_set_degamma_lut(struct drm_crtc_state *crtc_state,
                               struct dc_plane_state *dc_plane_state)
 {
         struct drm_property_blob *blob = crtc_state->degamma_lut;
         struct drm_color_lut *lut;
+        uint32_t lut_size;
+        struct dc_gamma *gamma;
+        bool ret;
 
         if (!blob) {
                 /* Default to SRGB */
@@ -258,11 +261,30 @@ int amdgpu_dm_set_degamma_lut(struct drm_crtc_state *crtc_state,
                 return 0;
         }
 
-        /* Otherwise, assume SRGB, since programmable degamma is not
-         * supported.
-         */
-        dc_plane_state->in_transfer_func->type = TF_TYPE_PREDEFINED;
-        dc_plane_state->in_transfer_func->tf = TRANSFER_FUNCTION_SRGB;
-        return -EINVAL;
+        gamma = dc_create_gamma();
+        if (!gamma)
+                return -ENOMEM;
+
+        lut_size = blob->length / sizeof(struct drm_color_lut);
+        gamma->num_entries = lut_size;
+        if (gamma->num_entries == MAX_COLOR_LUT_ENTRIES)
+                gamma->type = GAMMA_CUSTOM;
+        else {
+                dc_gamma_release(&gamma);
+                return -EINVAL;
+        }
+
+        __drm_lut_to_dc_gamma(lut, gamma, false);
+
+        dc_plane_state->in_transfer_func->type = TF_TYPE_DISTRIBUTED_POINTS;
+        ret = mod_color_calculate_degamma_params(dc_plane_state->in_transfer_func, gamma, true);
+        dc_gamma_release(&gamma);
+        if (!ret) {
+                dc_plane_state->in_transfer_func->type = TF_TYPE_BYPASS;
+                DRM_ERROR("Out of memory when calculating degamma params\n");
+                return -ENOMEM;
+        }
+
+        return 0;
 }
 
diff --git a/drivers/gpu/drm/amd/display/dc/bios/command_table.c b/drivers/gpu/drm/amd/display/dc/bios/command_table.c
index 651e1fd4622f..a558bfaa0c46 100644
--- a/drivers/gpu/drm/amd/display/dc/bios/command_table.c
+++ b/drivers/gpu/drm/amd/display/dc/bios/command_table.c
@@ -808,6 +808,24 @@ static enum bp_result transmitter_control_v1_5(
          * (=1: 8bpp, =1.25: 10bpp, =1.5:12bpp, =2: 16bpp)
          * LVDS mode: usPixelClock = pixel clock
          */
+        if  (cntl->signal == SIGNAL_TYPE_HDMI_TYPE_A) {
+                switch (cntl->color_depth) {
+                case COLOR_DEPTH_101010:
+                        params.usSymClock =
+                                cpu_to_le16((le16_to_cpu(params.usSymClock) * 30) / 24);
+                        break;
+                case COLOR_DEPTH_121212:
+                        params.usSymClock =
+                                cpu_to_le16((le16_to_cpu(params.usSymClock) * 36) / 24);
+                        break;
+                case COLOR_DEPTH_161616:
+                        params.usSymClock =
+                                cpu_to_le16((le16_to_cpu(params.usSymClock) * 48) / 24);
+                        break;
+                default: