2 files changed, 5 insertions, 1 deletions

diff --git a/drivers/gpu/drm/drm_dp_helper.c b/drivers/gpu/drm/drm_dp_helper.c
index ffe14ec3e7f2..70ae1f232331 100644
--- a/drivers/gpu/drm/drm_dp_helper.c
+++ b/drivers/gpu/drm/drm_dp_helper.c
@@ -1145,6 +1145,7 @@ int drm_dp_psr_setup_time(const u8 psr_cap[EDP_PSR_RECEIVER_CAP_SIZE])
         static const u16 psr_setup_time_us[] = {
                 PSR_SETUP_TIME(330),
                 PSR_SETUP_TIME(275),
+                PSR_SETUP_TIME(220),
                 PSR_SETUP_TIME(165),
                 PSR_SETUP_TIME(110),
                 PSR_SETUP_TIME(55),
diff --git a/drivers/gpu/drm/omapdrm/dss/sdi.c b/drivers/gpu/drm/omapdrm/dss/sdi.c
index 68a40ae26f5b..1e2c931f6acf 100644
--- a/drivers/gpu/drm/omapdrm/dss/sdi.c
+++ b/drivers/gpu/drm/omapdrm/dss/sdi.c
@@ -82,7 +82,7 @@ static int sdi_calc_clock_div(struct sdi_device *sdi, unsigned long pclk,
                               struct dispc_clock_info *dispc_cinfo)
 {
         int i;
-        struct sdi_clk_calc_ctx ctx = { .sdi = sdi };
+        struct sdi_clk_calc_ctx ctx;
 
         /*
          * DSS fclk gives us very few possibilities, so finding a good pixel
@@ -95,6 +95,9 @@ static int sdi_calc_clock_div(struct sdi_device *sdi, unsigned long pclk,
                 bool ok;
 
                 memset(&ctx, 0, sizeof(ctx));
+
+                ctx.sdi = sdi;
+
                 if (pclk > 1000 * i * i * i)
                         ctx.pck_min = max(pclk - 1000 * i * i * i, 0lu);
                 else