msleep(delay_dp_power_up_in_ms);
                }
 
+#ifdef CONFIG_DRM_AMD_DC_HDCP
+               if (panel_mode == DP_PANEL_MODE_EDP) {
+                       struct cp_psp *cp_psp = &stream->ctx->cp_psp;
+
+                       if (cp_psp && cp_psp->funcs.enable_assr) {
+                               if (!cp_psp->funcs.enable_assr(cp_psp->handle, link)) {
+                                       /* since eDP implies ASSR on, change panel
+                                        * mode to disable ASSR
+                                        */
+                                       panel_mode = DP_PANEL_MODE_DEFAULT;
+                               }
+                       } else
+                               panel_mode = DP_PANEL_MODE_DEFAULT;
+               }
+#endif
+
                dp_set_panel_mode(link, panel_mode);
 
                if (link->aux_access_disabled) {