drm: xilinx: drv: Don't suspend if console_suspend_enabled is false

When console_suspend_enabled is false, user expects to see the logs
through the display even the system goes into suspend. Thus, check
the console_suspend_enabled flag before going into suspend.

Signed-off-by: Hyun Kwon <hyun.kwon@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/drivers/gpu/drm/xilinx/xilinx_drm_drv.c b/drivers/gpu/drm/xilinx/xilinx_drm_drv.c
index 60b70b276accac6c135d0132b8c693e9f808124a..33f1cacd397fd2d573fb901d833e7b686ef114fc 100644 (file)
--- a/drivers/gpu/drm/xilinx/xilinx_drm_drv.c
+++ b/drivers/gpu/drm/xilinx/xilinx_drm_drv.c
@@ -20,6 +20,7 @@
 #include <drm/drm_gem_cma_helper.h>
 
 #include <linux/component.h>
+#include <linux/console.h>
 #include <linux/device.h>
 #include <linux/module.h>
 #include <linux/of_graph.h>
@@ -523,6 +524,10 @@ static int xilinx_drm_pm_suspend(struct device *dev)
        struct drm_connector *connector;
 
        drm_kms_helper_poll_disable(drm);
+
+       if (!console_suspend_enabled)
+               return 0;
+
        drm_modeset_lock_all(drm);
        list_for_each_entry(connector, &drm->mode_config.connector_list, head) {
                int old_dpms = connector->dpms;
@@ -545,6 +550,9 @@ static int xilinx_drm_pm_resume(struct device *dev)
        struct drm_device *drm = private->drm;
        struct drm_connector *connector;
 
+       if (!console_suspend_enabled)
+               return 0;
+
        drm_modeset_lock_all(drm);
        list_for_each_entry(connector, &drm->mode_config.connector_list, head) {
                if (connector->funcs->dpms) {