drm/msm: module param to dump state on error irq

Signed-off-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/1478358492-30738-8-git-send-email-robdclark@gmail.com

diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_irq.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_irq.c
index a521207db8a1532e0c4fd2718cd3ca324394085f..b764d7f10312750ffd83edf97f25bdda404db243 100644 (file)
--- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_irq.c
+++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_irq.c
@@ -15,6 +15,7 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <drm/drm_print.h>
 
 #include "msm_drv.h"
 #include "mdp4_kms.h"
@@ -29,7 +30,16 @@ void mdp4_set_irqmask(struct mdp_kms *mdp_kms, uint32_t irqmask,
 
 static void mdp4_irq_error_handler(struct mdp_irq *irq, uint32_t irqstatus)
 {
+       struct mdp4_kms *mdp4_kms = container_of(irq, struct mdp4_kms, error_handler);
+       static DEFINE_RATELIMIT_STATE(rs, 5*HZ, 1);
+       extern bool dumpstate;
+
        DRM_ERROR_RATELIMITED("errors: %08x\n", irqstatus);
+
+       if (dumpstate && __ratelimit(&rs)) {
+               struct drm_printer p = drm_info_printer(mdp4_kms->dev->dev);
+               drm_state_dump(mdp4_kms->dev, &p);
+       }
 }
 
 void mdp4_irq_preinstall(struct msm_kms *kms)

diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_irq.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_irq.c
index d53e5510fd7cbcf03695e718ace36b1f661c9db6..5c5940db898e83f006e1f200e8bf80ffb40b2980 100644 (file)
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_irq.c
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_irq.c
@@ -17,6 +17,8 @@
 
 #include <linux/irq.h>
 
+#include <drm/drm_print.h>
+
 #include "msm_drv.h"
 #include "mdp5_kms.h"
 
@@ -30,7 +32,16 @@ void mdp5_set_irqmask(struct mdp_kms *mdp_kms, uint32_t irqmask,
 
 static void mdp5_irq_error_handler(struct mdp_irq *irq, uint32_t irqstatus)
 {
+       struct mdp5_kms *mdp5_kms = container_of(irq, struct mdp5_kms, error_handler);
+       static DEFINE_RATELIMIT_STATE(rs, 5*HZ, 1);
+       extern bool dumpstate;
+
        DRM_ERROR_RATELIMITED("errors: %08x\n", irqstatus);
+
+       if (dumpstate && __ratelimit(&rs)) {
+               struct drm_printer p = drm_info_printer(mdp5_kms->dev->dev);
+               drm_state_dump(mdp5_kms->dev, &p);
+       }
 }
 
 void mdp5_irq_preinstall(struct msm_kms *kms)

diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index 8855972303ecaac8b3862c86de7a208700f3bf9e..8d21fb27a4013198528c29c64311e9f535fc1ccf 100644 (file)
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -79,6 +79,10 @@ static char *vram = "16m";
 MODULE_PARM_DESC(vram, "Configure VRAM size (for devices without IOMMU/GPUMMU)");
 module_param(vram, charp, 0);
 
+bool dumpstate = false;
+MODULE_PARM_DESC(dumpstate, "Dump KMS state on errors");
+module_param(dumpstate, bool, 0600);
+
 /*
  * Util/helpers:
  */