drm/komeda: Adds error event print functionality
Subsystems (4)
PATCH 1/1 drm/komeda: Adds error event print functionality
From: "Lowry Li (Arm Technology China)" <[email protected]>
Adds to print the event message when error happens and the same event will not be printed until next vsync.
Changes since v1:
1. Handling the event print by CONFIG_KOMEDA_ERROR_PRINT;
2. Changing the max string size to 256.
--- drivers/gpu/drm/arm/display/Kconfig | 6 + drivers/gpu/drm/arm/display/komeda/Makefile | 2 + drivers/gpu/drm/arm/display/komeda/komeda_dev.h | 15 +++ drivers/gpu/drm/arm/display/komeda/komeda_event.c | 141 ++++++++++++++++++++++ drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 4 + 5 files changed, 168 insertions(+) create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_event.c
drivers/gpu/drm/arm/display/Kconfig +6 -0
@@ -12,3 +12,9 @@ config DRM_KOMEDA Processor driver. It supports the D71 variants of the hardware. If compiled as a module it will be called komeda. + +config DRM_KOMEDA_ERROR_PRINT + bool "Enable komeda error print" + depends on DRM_KOMEDA + help + Choose this option to enable error printing.
drivers/gpu/drm/arm/display/komeda/Makefile +2 -0
@@ -22,4 +22,6 @@ komeda-y += \ d71/d71_dev.o \ d71/d71_component.o +komeda-$(CONFIG_DRM_KOMEDA_ERROR_PRINT) += komeda_event.o + obj-$(CONFIG_DRM_KOMEDA) += komeda.o
drivers/gpu/drm/arm/display/komeda/komeda_dev.h +15 -0
@@ -40,6 +40,17 @@#define KOMEDA_ERR_TTNG BIT_ULL(30)#define KOMEDA_ERR_TTF BIT_ULL(31) +#define KOMEDA_ERR_EVENTS \ + (KOMEDA_EVENT_URUN | KOMEDA_EVENT_IBSY | KOMEDA_EVENT_OVR |\ + KOMEDA_ERR_TETO | KOMEDA_ERR_TEMR | KOMEDA_ERR_TITR |\ + KOMEDA_ERR_CPE | KOMEDA_ERR_CFGE | KOMEDA_ERR_AXIE |\ + KOMEDA_ERR_ACE0 | KOMEDA_ERR_ACE1 | KOMEDA_ERR_ACE2 |\ + KOMEDA_ERR_ACE3 | KOMEDA_ERR_DRIFTTO | KOMEDA_ERR_FRAMETO |\ + KOMEDA_ERR_ZME | KOMEDA_ERR_MERR | KOMEDA_ERR_TCF |\ + KOMEDA_ERR_TTNG | KOMEDA_ERR_TTF) + +#define KOMEDA_WARN_EVENTS KOMEDA_ERR_CSCE +/* malidp device id */ enum {MALI_D71 =0 ,
@@ -207,4 +218,8 @@ struct komeda_dev {struct komeda_dev *dev_to_mdev (struct device *dev); +#ifdef CONFIG_DRM_KOMEDA_ERROR_PRINT +void komeda_print_events (struct komeda_events *evts); +#endif +#endif /*_KOMEDA_DEV_H_*/
drivers/gpu/drm/arm/display/komeda/komeda_event.c new file +141 -0
141 lines not on this page · raw message
drivers/gpu/drm/arm/display/komeda/komeda_kms.c +4 -0
@@ -47,6 +47,10 @@ static irqreturn_t komeda_kms_irq_handler(int irq, void *data)memset (&evts,0 ,sizeof (evts)); status = mdev->funcs->irq_handler (mdev, &evts); +#ifdef CONFIG_DRM_KOMEDA_ERROR_PRINT +komeda_print_events (&evts); +#endif +/* Notify the crtc to handle the events */ for (i =0 ; i < kms->n_crtcs; i++)komeda_crtc_handle_event (&kms->crtcs[i], &evts);
Signature · 6 lines
1.9.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 10 lines · Lowry Li (Arm Technology China)
From: "Lowry Li (Arm Technology China)" <[email protected]>
Adds to print the event message when error happens and the same event will not be printed until next vsync.
Changes since v1:
1. Handling the event print byCONFIG_KOMEDA_ERROR_PRINT;
2. Changing the max string size to 256.Signed-off-by Lowry Li (Arm Technology China) <[email protected]>
Best regards,
Liviu
Quoted 230 lines
--- drivers/gpu/drm/arm/display/Kconfig | 6 + drivers/gpu/drm/arm/display/komeda/Makefile | 2 + drivers/gpu/drm/arm/display/komeda/komeda_dev.h | 15 +++ drivers/gpu/drm/arm/display/komeda/komeda_event.c | 141 ++++++++++++++++++++++ drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 4 + 5 files changed, 168 insertions(+) create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_event.cdrivers/gpu/drm/arm/display/Kconfig +6
-0@@ -12,3 +12,9 @@ config DRM_KOMEDA Processor driver. It supports the D71 variants of the hardware. If compiled as a module it will be called komeda. + +config DRM_KOMEDA_ERROR_PRINT + bool "Enable komeda error print" + depends on DRM_KOMEDA + help + Choose this option to enable error printing.drivers/gpu/drm/arm/display/komeda/Makefile +2
-0@@ -22,4 +22,6 @@ komeda-y += \ d71/d71_dev.o \ d71/d71_component.o +komeda-$(CONFIG_DRM_KOMEDA_ERROR_PRINT) += komeda_event.o + obj-$(CONFIG_DRM_KOMEDA) += komeda.odrivers/gpu/drm/arm/display/komeda/komeda_dev.h +15
-0@@ -40,6 +40,17 @@#define KOMEDA_ERR_TTNG BIT_ULL(30)#define KOMEDA_ERR_TTF BIT_ULL(31) +#define KOMEDA_ERR_EVENTS \ + (KOMEDA_EVENT_URUN | KOMEDA_EVENT_IBSY | KOMEDA_EVENT_OVR |\ + KOMEDA_ERR_TETO | KOMEDA_ERR_TEMR | KOMEDA_ERR_TITR |\ + KOMEDA_ERR_CPE | KOMEDA_ERR_CFGE | KOMEDA_ERR_AXIE |\ + KOMEDA_ERR_ACE0 | KOMEDA_ERR_ACE1 | KOMEDA_ERR_ACE2 |\ + KOMEDA_ERR_ACE3 | KOMEDA_ERR_DRIFTTO | KOMEDA_ERR_FRAMETO |\ + KOMEDA_ERR_ZME | KOMEDA_ERR_MERR | KOMEDA_ERR_TCF |\ + KOMEDA_ERR_TTNG | KOMEDA_ERR_TTF) + +#define KOMEDA_WARN_EVENTS KOMEDA_ERR_CSCE +/* malidp device id */ enum {MALI_D71 =0 ,@@ -207,4 +218,8 @@ struct komeda_dev {struct komeda_dev *dev_to_mdev (struct device *dev); +#ifdef CONFIG_DRM_KOMEDA_ERROR_PRINT +void komeda_print_events (struct komeda_events *evts); +#endif +#endif /*_KOMEDA_DEV_H_*/ drivers/gpu/drm/arm/display/komeda/komeda_event.c new file +141
-0@@ -0,0 +1,141 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* (C) COPYRIGHT 2019 ARM Limited. All rights reserved. +* Author: James.Qian.Wang <[email protected]> +* +*/ +#include <drm/drm_print.h> + +#include "komeda_dev.h" + +struct komeda_str { +char *str; +u32 sz; +u32 len; +}; + +/* return 0 on success, < 0 on no space. +*/ +static int komeda_sprintf (struct komeda_str *str,const char *fmt, ...) +{ +va_list args; +int num, free_sz; +int err; + + free_sz = str->sz - str->len; +if (free_sz <=0 ) +return -ENOSPC ; + +va_start (args, fmt); + + num =vsnprintf (str->str + str->len, free_sz, fmt, args); + +va_end (args); + +if (num <= free_sz) { + str->len += num; + err =0 ; + }else { + str->len = str->sz; + err = -ENOSPC ; + } + +return err; +} + +static void evt_sprintf (struct komeda_str *str,u64 evt,const char *msg) +{ +if (evt) +komeda_sprintf (str, msg); +} + +static void evt_str (struct komeda_str *str,u64 events) +{ +if (events ==0ULL ) { +evt_sprintf (str,1 ,"None" ); +return ; + } + +evt_sprintf (str, events &KOMEDA_EVENT_VSYNC ,"VSYNC|" ); +evt_sprintf (str, events &KOMEDA_EVENT_FLIP ,"FLIP|" ); +evt_sprintf (str, events &KOMEDA_EVENT_EOW ,"EOW|" ); +evt_sprintf (str, events &KOMEDA_EVENT_MODE ,"OP-MODE|" ); + +evt_sprintf (str, events &KOMEDA_EVENT_URUN ,"UNDERRUN|" ); +evt_sprintf (str, events &KOMEDA_EVENT_OVR ,"OVERRUN|" ); + +/* GLB error */ +evt_sprintf (str, events &KOMEDA_ERR_MERR ,"MERR|" ); +evt_sprintf (str, events &KOMEDA_ERR_FRAMETO ,"FRAMETO|" ); + +/* DOU error */ +evt_sprintf (str, events &KOMEDA_ERR_DRIFTTO ,"DRIFTTO|" ); +evt_sprintf (str, events &KOMEDA_ERR_FRAMETO ,"FRAMETO|" ); +evt_sprintf (str, events &KOMEDA_ERR_TETO ,"TETO|" ); +evt_sprintf (str, events &KOMEDA_ERR_CSCE ,"CSCE|" ); + +/* LPU errors or events */ +evt_sprintf (str, events &KOMEDA_EVENT_IBSY ,"IBSY|" ); +evt_sprintf (str, events &KOMEDA_ERR_AXIE ,"AXIE|" ); +evt_sprintf (str, events &KOMEDA_ERR_ACE0 ,"ACE0|" ); +evt_sprintf (str, events &KOMEDA_ERR_ACE1 ,"ACE1|" ); +evt_sprintf (str, events &KOMEDA_ERR_ACE2 ,"ACE2|" ); +evt_sprintf (str, events &KOMEDA_ERR_ACE3 ,"ACE3|" ); + +/* LPU TBU errors*/ +evt_sprintf (str, events &KOMEDA_ERR_TCF ,"TCF|" ); +evt_sprintf (str, events &KOMEDA_ERR_TTNG ,"TTNG|" ); +evt_sprintf (str, events &KOMEDA_ERR_TITR ,"TITR|" ); +evt_sprintf (str, events &KOMEDA_ERR_TEMR ,"TEMR|" ); +evt_sprintf (str, events &KOMEDA_ERR_TTF ,"TTF|" ); + +/* CU errors*/ +evt_sprintf (str, events &KOMEDA_ERR_CPE ,"COPROC|" ); +evt_sprintf (str, events &KOMEDA_ERR_ZME ,"ZME|" ); +evt_sprintf (str, events &KOMEDA_ERR_CFGE ,"CFGE|" ); +evt_sprintf (str, events &KOMEDA_ERR_TEMR ,"TEMR|" ); + +if (str->len >0 && (str->str[str->len -1 ] =='|' )) { + str->str[str->len -1 ] =0 ; + str->len--; + } +} + +static bool is_new_frame (struct komeda_events *a) +{ +return (a->pipes[0 ] | a->pipes[1 ]) & + (KOMEDA_EVENT_FLIP |KOMEDA_EVENT_EOW ); +} + +void komeda_print_events (struct komeda_events *evts) +{ +u64 print_evts =KOMEDA_ERR_EVENTS ; +static bool en_print = true; + +/* reduce the same msg print, only print the first evt for one frame */ +if (evts->global ||is_new_frame (evts)) + en_print = true; +if (!en_print) +return ; + +if ((evts->global | evts->pipes[0 ] | evts->pipes[1 ]) & print_evts) { +#define STR_SZ 256 +char msg[STR_SZ ]; +struct komeda_str str; + + str.str = msg; + str.sz =STR_SZ ; + str.len =0 ; + +komeda_sprintf (&str,"gcu: " ); +evt_str (&str, evts->global); +komeda_sprintf (&str,", pipes[0]: " ); +evt_str (&str, evts->pipes[0 ]); +komeda_sprintf (&str,", pipes[1]: " ); +evt_str (&str, evts->pipes[1 ]); + +DRM_ERROR ("err detect: %s\n" , msg); + + en_print = false; + } +}drivers/gpu/drm/arm/display/komeda/komeda_kms.c +4
-0@@ -47,6 +47,10 @@ static irqreturn_t komeda_kms_irq_handler(int irq, void *data)memset (&evts,0 ,sizeof (evts)); status = mdev->funcs->irq_handler (mdev, &evts); +#ifdef CONFIG_DRM_KOMEDA_ERROR_PRINT +komeda_print_events (&evts); +#endif +/* Notify the crtc to handle the events */ for (i =0 ; i < kms->n_crtcs; i++)komeda_crtc_handle_event (&kms->crtcs[i], &evts);Signature · 1 line
1.9.1
Signature · 8 lines
====================
| I would like to |
| fix the world, |
| but they're not |
| giving me the |
\ source code! /
---------------
¯\_(ツ)_/¯Hi Lowry,
Quoted 51 lines · On Thursday, 1 August 2019 12:37:15 BST Lowry Li (Arm Technology China) wrote:
From: "Lowry Li (Arm Technology China)" <[email protected]>
Adds to print the event message when error happens and the same event will not be printed until next vsync.
Changes since v1:
1. Handling the event print byCONFIG_KOMEDA_ERROR_PRINT;
2. Changing the max string size to 256.Signed-off-by Lowry Li (Arm Technology China) <[email protected]>--- drivers/gpu/drm/arm/display/Kconfig | 6 + drivers/gpu/drm/arm/display/komeda/Makefile | 2 + drivers/gpu/drm/arm/display/komeda/komeda_dev.h | 15 +++ drivers/gpu/drm/arm/display/komeda/komeda_event.c | 141 ++++++++++++++++++++++ drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 4 + 5 files changed, 168 insertions(+) create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_event.c(quoted diff) +0
-0b/drivers/gpu/drm/arm/display/Kconfig index cec0639..e87ff86 100644
drivers/gpu/drm/arm/display/Kconfig +6
-0@@ -12,3 +12,9 @@ config DRM_KOMEDA Processor driver. It supports the D71 variants of the hardware. If compiled as a module it will be called komeda. + +config DRM_KOMEDA_ERROR_PRINT + bool "Enable komeda error print" + depends on DRM_KOMEDA + help + Choose this option to enable error printing.(quoted diff) +0
-0b/drivers/gpu/drm/arm/display/komeda/Makefile index 5c3900c..f095a1c 100644
drivers/gpu/drm/arm/display/komeda/Makefile +2
-0@@ -22,4 +22,6 @@ komeda-y += \ d71/d71_dev.o \ d71/d71_component.o +komeda-$(CONFIG_DRM_KOMEDA_ERROR_PRINT) += komeda_event.o + obj-$(CONFIG_DRM_KOMEDA) += komeda.o(quoted diff) +0
-0
b/drivers/gpu/drm/arm/display/komeda/komeda_dev.hindex d1c86b6..e28e7e6 100644
drivers/gpu/drm/arm/display/komeda/komeda_dev.h line 44
Quoted 5 lines
drivers/gpu/drm/arm/display/komeda/komeda_dev.h +2
-0@@ -40,6 +40,17 @@#define KOMEDA_ERR_TTNG BIT_ULL(30)#define KOMEDA_ERR_TTF BIT_ULL(31) +#define KOMEDA_ERR_EVENTS \ + (KOMEDA_EVENT_URUN | KOMEDA_EVENT_IBSY | KOMEDA_EVENT_OVR |
\
drivers/gpu/drm/arm/display/komeda/komeda_dev.h line 45
Quoted 1 line
drivers/gpu/drm/arm/display/komeda/komeda_dev.h +1
-0+ KOMEDA_ERR_TETO | KOMEDA_ERR_TEMR |
KOMEDA_ERR_TITR |\
drivers/gpu/drm/arm/display/komeda/komeda_dev.h line 46
Quoted 1 line
drivers/gpu/drm/arm/display/komeda/komeda_dev.h +1
-0+ KOMEDA_ERR_CPE | KOMEDA_ERR_CFGE |
KOMEDA_ERR_AXIE |\
drivers/gpu/drm/arm/display/komeda/komeda_dev.h line 47
Quoted 1 line
drivers/gpu/drm/arm/display/komeda/komeda_dev.h +1
-0+ KOMEDA_ERR_ACE0 | KOMEDA_ERR_ACE1 |
KOMEDA_ERR_ACE2 |\
drivers/gpu/drm/arm/display/komeda/komeda_dev.h line 48
Quoted 1 line
drivers/gpu/drm/arm/display/komeda/komeda_dev.h +1
-0+ KOMEDA_ERR_ACE3 | KOMEDA_ERR_DRIFTTO |
KOMEDA_ERR_FRAMETO |\
drivers/gpu/drm/arm/display/komeda/komeda_dev.h line 49
Quoted 1 line
drivers/gpu/drm/arm/display/komeda/komeda_dev.h +1
-0+ KOMEDA_ERR_ZME | KOMEDA_ERR_MERR |
KOMEDA_ERR_TCF |\
Quoted 31 lines
drivers/gpu/drm/arm/display/komeda/komeda_dev.h +8
-0+ KOMEDA_ERR_TTNG | KOMEDA_ERR_TTF) + +#define KOMEDA_WARN_EVENTS KOMEDA_ERR_CSCE +/* malidp device id */ enum {MALI_D71 =0 ,@@ -207,4 +218,8 @@ struct komeda_dev {struct komeda_dev *dev_to_mdev (struct device *dev); +#ifdef CONFIG_DRM_KOMEDA_ERROR_PRINT +void komeda_print_events (struct komeda_events *evts); +#endif +#endif /*_KOMEDA_DEV_H_*/ (quoted diff) +0
-0
b/drivers/gpu/drm/arm/display/komeda/komeda_event.cnew file mode 100644 index 0000000..57b60cddrivers/gpu/drm/arm/display/komeda/komeda_event.c new file +9
-0@@ -0,0 +1,141 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* (C) COPYRIGHT 2019 ARM Limited. All rights reserved. +* Author: James.Qian.Wang <[email protected]> +* +*/ +#include <drm/drm_print.h> + +#include "komeda_dev.h"
drivers/gpu/drm/arm/display/komeda/komeda_event.c line 19
Quoted 10 lines
drivers/gpu/drm/arm/display/komeda/komeda_event.c new file +10
-0+ +struct komeda_str { +char *str; +u32 sz; +u32 len; +}; + +/* return 0 on success, < 0 on no space. +*/ +static int komeda_sprintf (struct komeda_str *str,const char *fmt, ...)
The lack of '\0'-termination in the truncation case is quite disconcerting, especially since vsnprintf does it. This would be quite surprising to the casual passer-by.
drivers/gpu/drm/arm/display/komeda/komeda_event.c line 25
Quoted 6 lines
drivers/gpu/drm/arm/display/komeda/komeda_event.c new file +6
-0+{ +va_list args; +int num, free_sz; +int err; + + free_sz = str->sz - str->len;
That's off by 1, you need to account for the null byte.
drivers/gpu/drm/arm/display/komeda/komeda_event.c line 35
Quoted 10 lines
drivers/gpu/drm/arm/display/komeda/komeda_event.c new file +10
-0+if (free_sz <=0 ) +return -ENOSPC ; + +va_start (args, fmt); + + num =vsnprintf (str->str + str->len, free_sz, fmt, args); + +va_end (args); + +if (num <= free_sz) {
Strictly less than. To quote from the doc of vsnprintf:
""" [...] If the return is greater than or equal to @size, the resulting string is truncated. """
drivers/gpu/drm/arm/display/komeda/komeda_event.c line 39
Quoted 4 lines
drivers/gpu/drm/arm/display/komeda/komeda_event.c new file +4
-0+ str->len += num; + err =0 ; + }else { + str->len = str->sz;
Off by 1 here, too.
drivers/gpu/drm/arm/display/komeda/komeda_event.c line 40
Quoted 1 line
drivers/gpu/drm/arm/display/komeda/komeda_event.c new file +1
-0+ err = -ENOSPC ;
That error code isn't used anywhere, so there's no value to having it in the current version of this patch. Either check the error code somewhere downstream and handle it, or change that to an actionable message for the person reading the kernel log. As it stands truncation is completely silent.
Quoted 5 lines
drivers/gpu/drm/arm/display/komeda/komeda_event.c new file +5
-0+ } + +return err; +} +
drivers/gpu/drm/arm/display/komeda/komeda_event.c line 55
Quoted 10 lines
drivers/gpu/drm/arm/display/komeda/komeda_event.c new file +10
-0+static void evt_sprintf (struct komeda_str *str,u64 evt,const char *msg) +{ +if (evt) +komeda_sprintf (str, msg); +} + +static void evt_str (struct komeda_str *str,u64 events) +{ +if (events ==0ULL ) { +evt_sprintf (str,1 ,"None" );
[nit] Call komeda_sprintf(str, "None") directly?
Quoted 50 lines
drivers/gpu/drm/arm/display/komeda/komeda_event.c new file +50
-0+return ; + } + +evt_sprintf (str, events &KOMEDA_EVENT_VSYNC ,"VSYNC|" ); +evt_sprintf (str, events &KOMEDA_EVENT_FLIP ,"FLIP|" ); +evt_sprintf (str, events &KOMEDA_EVENT_EOW ,"EOW|" ); +evt_sprintf (str, events &KOMEDA_EVENT_MODE ,"OP-MODE|" ); + +evt_sprintf (str, events &KOMEDA_EVENT_URUN ,"UNDERRUN|" ); +evt_sprintf (str, events &KOMEDA_EVENT_OVR ,"OVERRUN|" ); + +/* GLB error */ +evt_sprintf (str, events &KOMEDA_ERR_MERR ,"MERR|" ); +evt_sprintf (str, events &KOMEDA_ERR_FRAMETO ,"FRAMETO|" ); + +/* DOU error */ +evt_sprintf (str, events &KOMEDA_ERR_DRIFTTO ,"DRIFTTO|" ); +evt_sprintf (str, events &KOMEDA_ERR_FRAMETO ,"FRAMETO|" ); +evt_sprintf (str, events &KOMEDA_ERR_TETO ,"TETO|" ); +evt_sprintf (str, events &KOMEDA_ERR_CSCE ,"CSCE|" ); + +/* LPU errors or events */ +evt_sprintf (str, events &KOMEDA_EVENT_IBSY ,"IBSY|" ); +evt_sprintf (str, events &KOMEDA_ERR_AXIE ,"AXIE|" ); +evt_sprintf (str, events &KOMEDA_ERR_ACE0 ,"ACE0|" ); +evt_sprintf (str, events &KOMEDA_ERR_ACE1 ,"ACE1|" ); +evt_sprintf (str, events &KOMEDA_ERR_ACE2 ,"ACE2|" ); +evt_sprintf (str, events &KOMEDA_ERR_ACE3 ,"ACE3|" ); + +/* LPU TBU errors*/ +evt_sprintf (str, events &KOMEDA_ERR_TCF ,"TCF|" ); +evt_sprintf (str, events &KOMEDA_ERR_TTNG ,"TTNG|" ); +evt_sprintf (str, events &KOMEDA_ERR_TITR ,"TITR|" ); +evt_sprintf (str, events &KOMEDA_ERR_TEMR ,"TEMR|" ); +evt_sprintf (str, events &KOMEDA_ERR_TTF ,"TTF|" ); + +/* CU errors*/ +evt_sprintf (str, events &KOMEDA_ERR_CPE ,"COPROC|" ); +evt_sprintf (str, events &KOMEDA_ERR_ZME ,"ZME|" ); +evt_sprintf (str, events &KOMEDA_ERR_CFGE ,"CFGE|" ); +evt_sprintf (str, events &KOMEDA_ERR_TEMR ,"TEMR|" ); + +if (str->len >0 && (str->str[str->len -1 ] =='|' )) { + str->str[str->len -1 ] =0 ; + str->len--; + } +} + +static bool is_new_frame (struct komeda_events *a) +{
drivers/gpu/drm/arm/display/komeda/komeda_event.c
Quoted 10 lines
drivers/gpu/drm/arm/display/komeda/komeda_event.c new file +10
-0+return (a->pipes[0 ] | a->pipes[1 ]) & + (KOMEDA_EVENT_FLIP |KOMEDA_EVENT_EOW ); +} + +void komeda_print_events (struct komeda_events *evts) +{ +u64 print_evts =KOMEDA_ERR_EVENTS ; +static bool en_print = true; + +/* reduce the same msg print, only print the first evt for one
frame */
drivers/gpu/drm/arm/display/komeda/komeda_event.c
Quoted 6 lines
drivers/gpu/drm/arm/display/komeda/komeda_event.c new file +6
-0+if (evts->global ||is_new_frame (evts)) + en_print = true; +if (!en_print) +return ; + +if ((evts->global | evts->pipes[0 ] | evts->pipes[1 ]) & print_evts)
{
drivers/gpu/drm/arm/display/komeda/komeda_event.c line 122
Quoted 1 line
drivers/gpu/drm/arm/display/komeda/komeda_event.c new file +1
-0+#define STR_SZ 256
[nit] I'd undef that once it's no longer needed
Quoted 25 lines
drivers/gpu/drm/arm/display/komeda/komeda_event.c new file +19
-0+char msg[STR_SZ ]; +struct komeda_str str; + + str.str = msg; + str.sz =STR_SZ ; + str.len =0 ; + +komeda_sprintf (&str,"gcu: " ); +evt_str (&str, evts->global); +komeda_sprintf (&str,", pipes[0]: " ); +evt_str (&str, evts->pipes[0 ]); +komeda_sprintf (&str,", pipes[1]: " ); +evt_str (&str, evts->pipes[1 ]); + +DRM_ERROR ("err detect: %s\n" , msg); + + en_print = false; + } +}(quoted diff) +0
-0
b/drivers/gpu/drm/arm/display/komeda/komeda_kms.cindex 419a8b0..0fafc36 100644
drivers/gpu/drm/arm/display/komeda/komeda_kms.c static irqreturn_t komeda_kms_irq_handler(int irq, void · line 56
Quoted 10 lines
drivers/gpu/drm/arm/display/komeda/komeda_kms.c +4
-0@@ -47,6 +47,10 @@ static irqreturn_t komeda_kms_irq_handler(int irq, void *data) memset(&evts, 0, sizeof(evts)); status = mdev->funcs->irq_handler (mdev, &evts); +#ifdef CONFIG_DRM_KOMEDA_ERROR_PRINT +komeda_print_events (&evts); +#endif +/* Notify the crtc to handle the events */ for (i =0 ; i < kms->n_crtcs; i++)komeda_crtc_handle_event (&kms->crtcs[i], &evts);
BR,
Mihail
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Hi Mihail,
Quoted 106 lines · Mihail Atanassov
Hi Lowry,
Quoted 51 lines · On Thursday, 1 August 2019 12:37:15 BST Lowry Li (Arm Technology China) wrote:
From: "Lowry Li (Arm Technology China)" <[email protected]>
Adds to print the event message when error happens and the same event will not be printed until next vsync.
Changes since v1:
1. Handling the event print byCONFIG_KOMEDA_ERROR_PRINT;
2. Changing the max string size to 256.Signed-off-by Lowry Li (Arm Technology China) <[email protected]>--- drivers/gpu/drm/arm/display/Kconfig | 6 + drivers/gpu/drm/arm/display/komeda/Makefile | 2 + drivers/gpu/drm/arm/display/komeda/komeda_dev.h | 15 +++ drivers/gpu/drm/arm/display/komeda/komeda_event.c | 141 ++++++++++++++++++++++ drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 4 + 5 files changed, 168 insertions(+) create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_event.c(quoted diff) +0
-0b/drivers/gpu/drm/arm/display/Kconfig index cec0639..e87ff86 100644
drivers/gpu/drm/arm/display/Kconfig +6
-0@@ -12,3 +12,9 @@ config DRM_KOMEDA Processor driver. It supports the D71 variants of the hardware. If compiled as a module it will be called komeda. + +config DRM_KOMEDA_ERROR_PRINT + bool "Enable komeda error print" + depends on DRM_KOMEDA + help + Choose this option to enable error printing.(quoted diff) +0
-0b/drivers/gpu/drm/arm/display/komeda/Makefile index 5c3900c..f095a1c 100644
drivers/gpu/drm/arm/display/komeda/Makefile +2
-0@@ -22,4 +22,6 @@ komeda-y += \ d71/d71_dev.o \ d71/d71_component.o +komeda-$(CONFIG_DRM_KOMEDA_ERROR_PRINT) += komeda_event.o + obj-$(CONFIG_DRM_KOMEDA) += komeda.o(quoted diff) +0
-0
b/drivers/gpu/drm/arm/display/komeda/komeda_dev.hindex d1c86b6..e28e7e6 100644drivers/gpu/drm/arm/display/komeda/komeda_dev.h line 44
Quoted 5 lines
drivers/gpu/drm/arm/display/komeda/komeda_dev.h +2
-0@@ -40,6 +40,17 @@#define KOMEDA_ERR_TTNG BIT_ULL(30)#define KOMEDA_ERR_TTF BIT_ULL(31) +#define KOMEDA_ERR_EVENTS \ + (KOMEDA_EVENT_URUN | KOMEDA_EVENT_IBSY | KOMEDA_EVENT_OVR |\
drivers/gpu/drm/arm/display/komeda/komeda_dev.h line 45
Quoted 1 line
drivers/gpu/drm/arm/display/komeda/komeda_dev.h +1
-0+ KOMEDA_ERR_TETO | KOMEDA_ERR_TEMR |
KOMEDA_ERR_TITR|\drivers/gpu/drm/arm/display/komeda/komeda_dev.h line 46
Quoted 1 line
drivers/gpu/drm/arm/display/komeda/komeda_dev.h +1
-0+ KOMEDA_ERR_CPE | KOMEDA_ERR_CFGE |
KOMEDA_ERR_AXIE|\drivers/gpu/drm/arm/display/komeda/komeda_dev.h line 47
Quoted 1 line
drivers/gpu/drm/arm/display/komeda/komeda_dev.h +1
-0+ KOMEDA_ERR_ACE0 | KOMEDA_ERR_ACE1 |
KOMEDA_ERR_ACE2|\drivers/gpu/drm/arm/display/komeda/komeda_dev.h line 48
Quoted 1 line
drivers/gpu/drm/arm/display/komeda/komeda_dev.h +1
-0+ KOMEDA_ERR_ACE3 | KOMEDA_ERR_DRIFTTO |
KOMEDA_ERR_FRAMETO|\drivers/gpu/drm/arm/display/komeda/komeda_dev.h line 49
Quoted 1 line
drivers/gpu/drm/arm/display/komeda/komeda_dev.h +1
-0+ KOMEDA_ERR_ZME | KOMEDA_ERR_MERR |
KOMEDA_ERR_TCF|\Quoted 36 lines
drivers/gpu/drm/arm/display/komeda/komeda_dev.h +8
-0+ KOMEDA_ERR_TTNG | KOMEDA_ERR_TTF) + +#define KOMEDA_WARN_EVENTS KOMEDA_ERR_CSCE +/* malidp device id */ enum {MALI_D71 =0 ,@@ -207,4 +218,8 @@ struct komeda_dev {struct komeda_dev *dev_to_mdev (struct device *dev); +#ifdef CONFIG_DRM_KOMEDA_ERROR_PRINT +void komeda_print_events (struct komeda_events *evts); +#endif +#endif /*_KOMEDA_DEV_H_*/ (quoted diff) +0
-0
b/drivers/gpu/drm/arm/display/komeda/komeda_event.cnew file mode 100644 index 0000000..57b60cddrivers/gpu/drm/arm/display/komeda/komeda_event.c new file +14
-0@@ -0,0 +1,141 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* (C) COPYRIGHT 2019 ARM Limited. All rights reserved. +* Author: James.Qian.Wang <[email protected]> +* +*/ +#include <drm/drm_print.h> + +#include "komeda_dev.h" + +struct komeda_str { +char *str; +u32 sz; +u32 len;
Quoted 8 lines
drivers/gpu/drm/arm/display/komeda/komeda_event.c line 19
Quoted 5 lines
drivers/gpu/drm/arm/display/komeda/komeda_event.c new file +5
-0+}; + +/* return 0 on success, < 0 on no space. +*/ +static int komeda_sprintf (struct komeda_str *str,const char *fmt, ...)The lack of '\0'-termination in the truncation case is quite disconcerting, especially since vsnprintf does it. This would be quite surprising to the casual passer-by.
Thanks a lot for the comments. Will refine accordingly and send a new patch.
Quoted 25 lines
drivers/gpu/drm/arm/display/komeda/komeda_event.c line 25
Quoted 6 lines
drivers/gpu/drm/arm/display/komeda/komeda_event.c new file +6
-0+{ +va_list args; +int num, free_sz; +int err; + + free_sz = str->sz - str->len;That's off by 1, you need to account for the null byte.
drivers/gpu/drm/arm/display/komeda/komeda_event.c line 35
Quoted 10 lines
drivers/gpu/drm/arm/display/komeda/komeda_event.c new file +10
-0+if (free_sz <=0 ) +return -ENOSPC ; + +va_start (args, fmt); + + num =vsnprintf (str->str + str->len, free_sz, fmt, args); + +va_end (args); + +if (num <= free_sz) {Strictly less than. To quote from the doc of vsnprintf:
""" [...] If the return is greater than or equal to @size, the resulting string is truncated. """drivers/gpu/drm/arm/display/komeda/komeda_event.c line 39
Quoted 4 lines
drivers/gpu/drm/arm/display/komeda/komeda_event.c new file +4
-0+ str->len += num; + err =0 ; + }else { + str->len = str->sz;Off by 1 here, too.
Quoted 5 lines
drivers/gpu/drm/arm/display/komeda/komeda_event.c line 40
Quoted 1 line
drivers/gpu/drm/arm/display/komeda/komeda_event.c new file +1
-0+ err = -ENOSPC ;That error code isn't used anywhere, so there's no value to having it in the current version of this patch. Either check the error code somewhere downstream and handle it, or change that to an actionable message for the person reading the kernel log. As it stands truncation is completely silent.
Better keep this code and treat as an basic util func. For this case, the string size is big enough. I tried to print a err msg/log at calling place, but it is a dead code which will not go into. So still suggest keep the current.
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/arm/display/komeda/komeda_event.c new file +8
-0+ } + +return err; +} + +static void evt_sprintf (struct komeda_str *str,u64 evt,const char *msg) +{ +if (evt)
Quoted 8 lines
drivers/gpu/drm/arm/display/komeda/komeda_event.c line 55
Quoted 7 lines
drivers/gpu/drm/arm/display/komeda/komeda_event.c new file +7
-0+komeda_sprintf (str, msg); +} + +static void evt_str (struct komeda_str *str,u64 events) +{ +if (events ==0ULL ) { +evt_sprintf (str,1 ,"None" );[nit] Call
komeda_sprintf(str, "None")directly?
Yes, will change to it :-)
Quoted 68 lines
Quoted 50 lines
drivers/gpu/drm/arm/display/komeda/komeda_event.c new file +50
-0+return ; + } + +evt_sprintf (str, events &KOMEDA_EVENT_VSYNC ,"VSYNC|" ); +evt_sprintf (str, events &KOMEDA_EVENT_FLIP ,"FLIP|" ); +evt_sprintf (str, events &KOMEDA_EVENT_EOW ,"EOW|" ); +evt_sprintf (str, events &KOMEDA_EVENT_MODE ,"OP-MODE|" ); + +evt_sprintf (str, events &KOMEDA_EVENT_URUN ,"UNDERRUN|" ); +evt_sprintf (str, events &KOMEDA_EVENT_OVR ,"OVERRUN|" ); + +/* GLB error */ +evt_sprintf (str, events &KOMEDA_ERR_MERR ,"MERR|" ); +evt_sprintf (str, events &KOMEDA_ERR_FRAMETO ,"FRAMETO|" ); + +/* DOU error */ +evt_sprintf (str, events &KOMEDA_ERR_DRIFTTO ,"DRIFTTO|" ); +evt_sprintf (str, events &KOMEDA_ERR_FRAMETO ,"FRAMETO|" ); +evt_sprintf (str, events &KOMEDA_ERR_TETO ,"TETO|" ); +evt_sprintf (str, events &KOMEDA_ERR_CSCE ,"CSCE|" ); + +/* LPU errors or events */ +evt_sprintf (str, events &KOMEDA_EVENT_IBSY ,"IBSY|" ); +evt_sprintf (str, events &KOMEDA_ERR_AXIE ,"AXIE|" ); +evt_sprintf (str, events &KOMEDA_ERR_ACE0 ,"ACE0|" ); +evt_sprintf (str, events &KOMEDA_ERR_ACE1 ,"ACE1|" ); +evt_sprintf (str, events &KOMEDA_ERR_ACE2 ,"ACE2|" ); +evt_sprintf (str, events &KOMEDA_ERR_ACE3 ,"ACE3|" ); + +/* LPU TBU errors*/ +evt_sprintf (str, events &KOMEDA_ERR_TCF ,"TCF|" ); +evt_sprintf (str, events &KOMEDA_ERR_TTNG ,"TTNG|" ); +evt_sprintf (str, events &KOMEDA_ERR_TITR ,"TITR|" ); +evt_sprintf (str, events &KOMEDA_ERR_TEMR ,"TEMR|" ); +evt_sprintf (str, events &KOMEDA_ERR_TTF ,"TTF|" ); + +/* CU errors*/ +evt_sprintf (str, events &KOMEDA_ERR_CPE ,"COPROC|" ); +evt_sprintf (str, events &KOMEDA_ERR_ZME ,"ZME|" ); +evt_sprintf (str, events &KOMEDA_ERR_CFGE ,"CFGE|" ); +evt_sprintf (str, events &KOMEDA_ERR_TEMR ,"TEMR|" ); + +if (str->len >0 && (str->str[str->len -1 ] =='|' )) { + str->str[str->len -1 ] =0 ; + str->len--; + } +} + +static bool is_new_frame (struct komeda_events *a) +{drivers/gpu/drm/arm/display/komeda/komeda_event.c
Quoted 10 lines
drivers/gpu/drm/arm/display/komeda/komeda_event.c new file +10
-0+return (a->pipes[0 ] | a->pipes[1 ]) & + (KOMEDA_EVENT_FLIP |KOMEDA_EVENT_EOW ); +} + +void komeda_print_events (struct komeda_events *evts) +{ +u64 print_evts =KOMEDA_ERR_EVENTS ; +static bool en_print = true; + +/* reduce the same msg print, only print the first evt for one frame */
drivers/gpu/drm/arm/display/komeda/komeda_event.c
Quoted 6 lines
drivers/gpu/drm/arm/display/komeda/komeda_event.c new file +6
-0+if (evts->global ||is_new_frame (evts)) + en_print = true; +if (!en_print) +return ; + +if ((evts->global | evts->pipes[0 ] | evts->pipes[1 ]) & print_evts){
Quoted 2 lines
drivers/gpu/drm/arm/display/komeda/komeda_event.c line 122
Quoted 1 line
drivers/gpu/drm/arm/display/komeda/komeda_event.c new file +1
-0+#define STR_SZ 256[nit] I'd undef that once it's no longer needed
Will not use macro here.
Quoted 39 lines
Quoted 25 lines
drivers/gpu/drm/arm/display/komeda/komeda_event.c new file +19
-0+char msg[STR_SZ ]; +struct komeda_str str; + + str.str = msg; + str.sz =STR_SZ ; + str.len =0 ; + +komeda_sprintf (&str,"gcu: " ); +evt_str (&str, evts->global); +komeda_sprintf (&str,", pipes[0]: " ); +evt_str (&str, evts->pipes[0 ]); +komeda_sprintf (&str,", pipes[1]: " ); +evt_str (&str, evts->pipes[1 ]); + +DRM_ERROR ("err detect: %s\n" , msg); + + en_print = false; + } +}(quoted diff) +0
-0
b/drivers/gpu/drm/arm/display/komeda/komeda_kms.cindex 419a8b0..0fafc36 100644drivers/gpu/drm/arm/display/komeda/komeda_kms.c static irqreturn_t komeda_kms_irq_handler(int irq, void · line 56
Quoted 10 lines
drivers/gpu/drm/arm/display/komeda/komeda_kms.c +4
-0@@ -47,6 +47,10 @@ static irqreturn_t komeda_kms_irq_handler(int irq, void *data) memset(&evts, 0, sizeof(evts)); status = mdev->funcs->irq_handler (mdev, &evts); +#ifdef CONFIG_DRM_KOMEDA_ERROR_PRINT +komeda_print_events (&evts); +#endif +/* Notify the crtc to handle the events */ for (i =0 ; i < kms->n_crtcs; i++)komeda_crtc_handle_event (&kms->crtcs[i], &evts);BR,
Mihail
Signature · 6 lines
Regards, Lowry _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel