drm/bridge: adv7511: Fix Intermittent EDID failures
Subsystems (3)
PATCH 1/1 drm/bridge: adv7511: Fix Intermittent EDID failures
In the process of adding support for shared IRQ pins, a scenario was accidentally created where adv7511_irq_process returned prematurely causing the EDID to fail randomly.
Since the interrupt handler is broken up into two main helper functions, update both of them to treat the helper functions as IRQ handlers. These IRQ routines process their respective tasks as before, but if they determine that actual work was done, mark the respective IRQ status accordingly, and delay the check until everything has been processed.
This should guarantee the helper functions don't return prematurely while still returning proper values of either IRQ_HANDLED or IRQ_NONE.
Reported by: Liu Ying <[email protected]>
drivers/gpu/drm/bridge/adv7511/adv7511.h +1 -1
@@ -401,7 +401,7 @@ struct adv7511 {#ifdef CONFIG_DRM_I2C_ADV7511_CEC int adv7511_cec_init (struct device *dev,struct adv7511 *adv7511); -void adv7511_cec_irq_process (struct adv7511 *adv7511,unsigned int irq1); +int adv7511_cec_irq_process (struct adv7511 *adv7511,unsigned int irq1);#else static inline int adv7511_cec_init (struct device *dev,struct adv7511 *adv7511) {
drivers/gpu/drm/bridge/adv7511/adv7511_cec.c +13 -7
@@ -119,7 +119,7 @@ static void adv7511_cec_rx(struct adv7511 *adv7511, int rx_buf)cec_received_msg (adv7511->cec_adap, &msg); } -void adv7511_cec_irq_process (struct adv7511 *adv7511,unsigned int irq1) +int adv7511_cec_irq_process (struct adv7511 *adv7511,unsigned int irq1) {unsigned int offset = adv7511->info->reg_cec_offset; const u32 irq_tx_mask = ADV7511_INT1_CEC_TX_READY |
@@ -130,17 +130,21 @@ void adv7511_cec_irq_process(struct adv7511 *adv7511, unsigned int irq1)ADV7511_INT1_CEC_RX_READY3 ;unsigned int rx_status;int rx_order[3 ] = {-1 ,-1 ,-1 }; -int i; +int i, ret =0 ; +int irq_status =IRQ_NONE ; -if (irq1 & irq_tx_mask) +if (irq1 & irq_tx_mask) {adv_cec_tx_raw_status (adv7511, irq1); + irq_status =IRQ_HANDLED ; + }if (!(irq1 & irq_rx_mask)) -return ; +return irq_status; -if (regmap_read (adv7511->regmap_cec, -ADV7511_REG_CEC_RX_STATUS + offset, &rx_status)) -return ; + ret =regmap_read (adv7511->regmap_cec, +ADV7511_REG_CEC_RX_STATUS + offset, &rx_status); +if (ret <0 ) +return ret;/* * ADV7511_REG_CEC_RX_STATUS[5:0] contains the reception order of RX
@@ -172,6 +176,8 @@ void adv7511_cec_irq_process(struct adv7511 *adv7511, unsigned int irq1)adv7511_cec_rx (adv7511, rx_buf); } + +return IRQ_HANDLED ; }static int adv7511_cec_adap_enable (struct cec_adapter *adap,bool enable)
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +16 -11
@@ -469,6 +469,8 @@ static int adv7511_irq_process(struct adv7511 *adv7511, bool process_hpd) {unsigned int irq0, irq1;int ret; +int cec_status; +int irq_status =IRQ_NONE ; ret =regmap_read (adv7511->regmap,ADV7511_REG_INT (0 ), &irq0);if (ret <0 )
@@ -478,38 +480,41 @@ static int adv7511_irq_process(struct adv7511 *adv7511, bool process_hpd)if (ret <0 )return ret; -/* If there is no IRQ to handle, exit indicating no IRQ data */ -if (!(irq0 & (ADV7511_INT0_HPD |ADV7511_INT0_EDID_READY )) && - !(irq1 &ADV7511_INT1_DDC_ERROR )) -return -ENODATA ; -regmap_write (adv7511->regmap,ADV7511_REG_INT (0 ), irq0);regmap_write (adv7511->regmap,ADV7511_REG_INT (1 ), irq1); -if (process_hpd && irq0 &ADV7511_INT0_HPD && adv7511->bridge.encoder) +if (process_hpd && irq0 &ADV7511_INT0_HPD && adv7511->bridge.encoder) {schedule_work (&adv7511->hpd_work); + irq_status =IRQ_HANDLED ; + }if (irq0 &ADV7511_INT0_EDID_READY || irq1 &ADV7511_INT1_DDC_ERROR ) { adv7511->edid_read = true;if (adv7511->i2c_main->irq)wake_up_all (&adv7511->wq); + irq_status =IRQ_HANDLED ; }#ifdef CONFIG_DRM_I2C_ADV7511_CEC -adv7511_cec_irq_process (adv7511, irq1); + cec_status =adv7511_cec_irq_process (adv7511, irq1); + +if (cec_status <0 ) +return cec_status;#endif -return 0 ; +/* If there is no IRQ to handle, exit indicating no IRQ data */ +if (irq_status ==IRQ_HANDLED || cec_status ==IRQ_HANDLED ) +return IRQ_HANDLED ; + +return IRQ_NONE ; }static irqreturn_t adv7511_irq_handler (int irq,void *devid) {struct adv7511 *adv7511 = devid; -int ret; - ret =adv7511_irq_process (adv7511, true); -return ret <0 ?IRQ_NONE :IRQ_HANDLED ; +return adv7511_irq_process (adv7511, true); }/* -----------------------------------------------------------------------------
Signature · 1 line
2.43.0
kernel test robot
build botkernel test robot noticed the following build warnings:
Hi Adam,
kernel test robot noticed the following build warnings:
[auto build test WARNING on drm-misc/drm-misc-next]
[also build test WARNING on drm/drm-next drm-exynos/exynos-drm-next drm-intel/for-linux-next drm-tip/drm-tip linus/master drm-intel/for-linux-next-fixes v6.9 next-20240521] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Adam-Ford/drm-bridge-adv7511-Fix-Intermittent-EDID-failures/20240521-091841 base: git://anongit.freedesktop.org/drm/drm-misc drm-misc-next patch link: https://lore.kernel.org/r/20240521011614.496421-1-aford173%40gmail.com patch subject: [PATCH] drm/bridge: adv7511: Fix Intermittent EDID failures config: i386-buildonly-randconfig-002-20240521 (https://download.01.org/0day-ci/archive/20240522/[email protected]/config) compiler: clang version 18.1.5 (https://github.com/llvm/llvm-project 617a15a9eac96088ae5e9134248d8236e34b91b1) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240522/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All warnings (new ones prefixed by >>):
>> drivers/gpu/drm/bridge/adv7511/adv7511_drv.c:507:35: warning: variable 'cec_status' is uninitialized when used here [-Wuninitialized]
507 | if (irq_status == IRQ_HANDLED || cec_status == IRQ_HANDLED)
| ^~~~~~~~~~
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c:472:16: note: initialize the variable 'cec_status' to silence this warning
472 | int cec_status;
| ^
| = 01 warning generated.
vim +/cec_status +507 drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
505
506 /* If there is no IRQ to handle, exit indicating no IRQ data */
> 507 if (irq_status == IRQ_HANDLED || cec_status == IRQ_HANDLED)
508 return IRQ_HANDLED;
509
510 return IRQ_NONE;
511 }
512
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
Quoted 11 lines · Adam Ford
In the process of adding support for shared IRQ pins, a scenario was accidentally created where
adv7511_irq_processreturned prematurely causing the EDID to fail randomly.Since the interrupt handler is broken up into two main helper functions, update both of them to treat the helper functions as IRQ handlers. These IRQ routines process their respective tasks as before, but if they determine that actual work was done, mark the respective IRQ status accordingly, and delay the check until everything has been processed.
Quoted 6 lines
This should guarantee the helper functions don't return prematurely while still returning proper values of either
IRQ_HANDLEDorIRQ_NONE.Reported by: Liu Ying <[email protected]>
Fixes f3d9683346d6 ("drm/bridge: adv7511: Allow IRQ to share GPIO pins")Signed-off-by Adam Ford <[email protected]>
+ Liu
Sorry about the e-mail address copy-paste error.
Quoted 133 lines
drivers/gpu/drm/bridge/adv7511/adv7511.h +1
-1@@ -401,7 +401,7 @@ struct adv7511 {#ifdef CONFIG_DRM_I2C_ADV7511_CEC int adv7511_cec_init (struct device *dev,struct adv7511 *adv7511); -void adv7511_cec_irq_process (struct adv7511 *adv7511,unsigned int irq1); +int adv7511_cec_irq_process (struct adv7511 *adv7511,unsigned int irq1);#else static inline int adv7511_cec_init (struct device *dev,struct adv7511 *adv7511) {drivers/gpu/drm/bridge/adv7511/adv7511_cec.c +13
-7@@ -119,7 +119,7 @@ static void adv7511_cec_rx(struct adv7511 *adv7511, int rx_buf)cec_received_msg (adv7511->cec_adap, &msg); } -void adv7511_cec_irq_process (struct adv7511 *adv7511,unsigned int irq1) +int adv7511_cec_irq_process (struct adv7511 *adv7511,unsigned int irq1) {unsigned int offset = adv7511->info->reg_cec_offset; const u32 irq_tx_mask = ADV7511_INT1_CEC_TX_READY |@@ -130,17 +130,21 @@ void adv7511_cec_irq_process(struct adv7511 *adv7511, unsigned int irq1)ADV7511_INT1_CEC_RX_READY3 ;unsigned int rx_status;int rx_order[3 ] = {-1 ,-1 ,-1 }; -int i; +int i, ret =0 ; +int irq_status =IRQ_NONE ; -if (irq1 & irq_tx_mask) +if (irq1 & irq_tx_mask) {adv_cec_tx_raw_status (adv7511, irq1); + irq_status =IRQ_HANDLED ; + }if (!(irq1 & irq_rx_mask)) -return ; +return irq_status; -if (regmap_read (adv7511->regmap_cec, -ADV7511_REG_CEC_RX_STATUS + offset, &rx_status)) -return ; + ret =regmap_read (adv7511->regmap_cec, +ADV7511_REG_CEC_RX_STATUS + offset, &rx_status); +if (ret <0 ) +return ret;/* * ADV7511_REG_CEC_RX_STATUS[5:0] contains the reception order of RX @@ -172,6 +176,8 @@ void adv7511_cec_irq_process(struct adv7511 *adv7511, unsigned int irq1)adv7511_cec_rx (adv7511, rx_buf); } + +return IRQ_HANDLED ; }static int adv7511_cec_adap_enable (struct cec_adapter *adap,bool enable)drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +16
-12@@ -469,6 +469,8 @@ static int adv7511_irq_process(struct adv7511 *adv7511, bool process_hpd) {unsigned int irq0, irq1;int ret; +int cec_status; +int irq_status =IRQ_NONE ; ret =regmap_read (adv7511->regmap,ADV7511_REG_INT (0 ), &irq0);if (ret <0 )@@ -478,38 +480,41 @@ static int adv7511_irq_process(struct adv7511 *adv7511, bool process_hpd)if (ret <0 )return ret; -/* If there is no IRQ to handle, exit indicating no IRQ data */ -if (!(irq0 & (ADV7511_INT0_HPD |ADV7511_INT0_EDID_READY )) && - !(irq1 &ADV7511_INT1_DDC_ERROR )) -return -ENODATA ; -regmap_write (adv7511->regmap,ADV7511_REG_INT (0 ), irq0);regmap_write (adv7511->regmap,ADV7511_REG_INT (1 ), irq1); -if (process_hpd && irq0 &ADV7511_INT0_HPD && adv7511->bridge.encoder) +if (process_hpd && irq0 &ADV7511_INT0_HPD && adv7511->bridge.encoder) {schedule_work (&adv7511->hpd_work); + irq_status =IRQ_HANDLED ; + }if (irq0 &ADV7511_INT0_EDID_READY || irq1 &ADV7511_INT1_DDC_ERROR ) { adv7511->edid_read = true;if (adv7511->i2c_main->irq)wake_up_all (&adv7511->wq); + irq_status =IRQ_HANDLED ; }#ifdef CONFIG_DRM_I2C_ADV7511_CEC -adv7511_cec_irq_process (adv7511, irq1); + cec_status =adv7511_cec_irq_process (adv7511, irq1); + +if (cec_status <0 ) +return cec_status;#endif -return 0 ; +/* If there is no IRQ to handle, exit indicating no IRQ data */ +if (irq_status ==IRQ_HANDLED || cec_status ==IRQ_HANDLED ) +return IRQ_HANDLED ; + +return IRQ_NONE ; }static irqreturn_t adv7511_irq_handler (int irq,void *devid) {struct adv7511 *adv7511 = devid; -int ret; - ret =adv7511_irq_process (adv7511, true); -return ret <0 ?IRQ_NONE :IRQ_HANDLED ; +return adv7511_irq_process (adv7511, true); }/* ----------------------------------------------------------------------------- -- 2.43.0
Liu Ying
Tested-byQuoted 12 lines · Adam Ford
Quoted 11 lines · Adam Ford
In the process of adding support for shared IRQ pins, a scenario was accidentally created where
adv7511_irq_processreturned prematurely causing the EDID to fail randomly.Since the interrupt handler is broken up into two main helper functions, update both of them to treat the helper functions as IRQ handlers. These IRQ routines process their respective tasks as before, but if they determine that actual work was done, mark the respective IRQ status accordingly, and delay the check until everything has been processed.
Quoted 4 lines
Quoted 4 lines
This should guarantee the helper functions don't return prematurely while still returning proper values of either
IRQ_HANDLEDorIRQ_NONE.Reported by: Liu Ying <[email protected]>
s/Reported by/Reported-by/
Quoted 6 lines
Quoted 2 lines
Fixes f3d9683346d6 ("drm/bridge: adv7511: Allow IRQ to share GPIO pins")Signed-off-by Adam Ford <[email protected]>+ Liu
Sorry about the e-mail address copy-paste error.
No worries.
With this patch, it looks EDID retrieval works ok for me without interrupt requested.
Quoted 133 lines
Quoted 133 lines
drivers/gpu/drm/bridge/adv7511/adv7511.h +1
-1@@ -401,7 +401,7 @@ struct adv7511 {#ifdef CONFIG_DRM_I2C_ADV7511_CEC int adv7511_cec_init (struct device *dev,struct adv7511 *adv7511); -void adv7511_cec_irq_process (struct adv7511 *adv7511,unsigned int irq1); +int adv7511_cec_irq_process (struct adv7511 *adv7511,unsigned int irq1);#else static inline int adv7511_cec_init (struct device *dev,struct adv7511 *adv7511) {drivers/gpu/drm/bridge/adv7511/adv7511_cec.c +13
-7@@ -119,7 +119,7 @@ static void adv7511_cec_rx(struct adv7511 *adv7511, int rx_buf)cec_received_msg (adv7511->cec_adap, &msg); } -void adv7511_cec_irq_process (struct adv7511 *adv7511,unsigned int irq1) +int adv7511_cec_irq_process (struct adv7511 *adv7511,unsigned int irq1) {unsigned int offset = adv7511->info->reg_cec_offset; const u32 irq_tx_mask = ADV7511_INT1_CEC_TX_READY |@@ -130,17 +130,21 @@ void adv7511_cec_irq_process(struct adv7511 *adv7511, unsigned int irq1)ADV7511_INT1_CEC_RX_READY3 ;unsigned int rx_status;int rx_order[3 ] = {-1 ,-1 ,-1 }; -int i; +int i, ret =0 ; +int irq_status =IRQ_NONE ; -if (irq1 & irq_tx_mask) +if (irq1 & irq_tx_mask) {adv_cec_tx_raw_status (adv7511, irq1); + irq_status =IRQ_HANDLED ; + }if (!(irq1 & irq_rx_mask)) -return ; +return irq_status; -if (regmap_read (adv7511->regmap_cec, -ADV7511_REG_CEC_RX_STATUS + offset, &rx_status)) -return ; + ret =regmap_read (adv7511->regmap_cec, +ADV7511_REG_CEC_RX_STATUS + offset, &rx_status); +if (ret <0 ) +return ret;/* * ADV7511_REG_CEC_RX_STATUS[5:0] contains the reception order of RX @@ -172,6 +176,8 @@ void adv7511_cec_irq_process(struct adv7511 *adv7511, unsigned int irq1)adv7511_cec_rx (adv7511, rx_buf); } + +return IRQ_HANDLED ; }static int adv7511_cec_adap_enable (struct cec_adapter *adap,bool enable)drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +16
-12@@ -469,6 +469,8 @@ static int adv7511_irq_process(struct adv7511 *adv7511, bool process_hpd) {unsigned int irq0, irq1;int ret; +int cec_status; +int irq_status =IRQ_NONE ; ret =regmap_read (adv7511->regmap,ADV7511_REG_INT (0 ), &irq0);if (ret <0 )@@ -478,38 +480,41 @@ static int adv7511_irq_process(struct adv7511 *adv7511, bool process_hpd)if (ret <0 )return ret; -/* If there is no IRQ to handle, exit indicating no IRQ data */ -if (!(irq0 & (ADV7511_INT0_HPD |ADV7511_INT0_EDID_READY )) && - !(irq1 &ADV7511_INT1_DDC_ERROR )) -return -ENODATA ; -regmap_write (adv7511->regmap,ADV7511_REG_INT (0 ), irq0);regmap_write (adv7511->regmap,ADV7511_REG_INT (1 ), irq1); -if (process_hpd && irq0 &ADV7511_INT0_HPD && adv7511->bridge.encoder) +if (process_hpd && irq0 &ADV7511_INT0_HPD && adv7511->bridge.encoder) {schedule_work (&adv7511->hpd_work); + irq_status =IRQ_HANDLED ; + }if (irq0 &ADV7511_INT0_EDID_READY || irq1 &ADV7511_INT1_DDC_ERROR ) { adv7511->edid_read = true;if (adv7511->i2c_main->irq)wake_up_all (&adv7511->wq); + irq_status =IRQ_HANDLED ; }#ifdef CONFIG_DRM_I2C_ADV7511_CEC -adv7511_cec_irq_process (adv7511, irq1); + cec_status =adv7511_cec_irq_process (adv7511, irq1); + +if (cec_status <0 ) +return cec_status;#endif -return 0 ; +/* If there is no IRQ to handle, exit indicating no IRQ data */ +if (irq_status ==IRQ_HANDLED || cec_status ==IRQ_HANDLED ) +return IRQ_HANDLED ; + +return IRQ_NONE ; }static irqreturn_t adv7511_irq_handler (int irq,void *devid) {struct adv7511 *adv7511 = devid; -int ret; - ret =adv7511_irq_process (adv7511, true); -return ret <0 ?IRQ_NONE :IRQ_HANDLED ; +return adv7511_irq_process (adv7511, true); }/* ----------------------------------------------------------------------------- -- 2.43.0
Quoted 58 lines · Adam Ford
In the process of adding support for shared IRQ pins, a scenario was accidentally created where
adv7511_irq_processreturned prematurely causing the EDID to fail randomly.Since the interrupt handler is broken up into two main helper functions, update both of them to treat the helper functions as IRQ handlers. These IRQ routines process their respective tasks as before, but if they determine that actual work was done, mark the respective IRQ status accordingly, and delay the check until everything has been processed.
This should guarantee the helper functions don't return prematurely while still returning proper values of either
IRQ_HANDLEDorIRQ_NONE.Reported by: Liu Ying <[email protected]>
Fixes f3d9683346d6 ("drm/bridge: adv7511: Allow IRQ to share GPIO pins")Signed-off-by Adam Ford <[email protected]>drivers/gpu/drm/bridge/adv7511/adv7511.h +1
-1@@ -401,7 +401,7 @@ struct adv7511 {#ifdef CONFIG_DRM_I2C_ADV7511_CEC int adv7511_cec_init (struct device *dev,struct adv7511 *adv7511); -void adv7511_cec_irq_process (struct adv7511 *adv7511,unsigned int irq1); +int adv7511_cec_irq_process (struct adv7511 *adv7511,unsigned int irq1);#else static inline int adv7511_cec_init (struct device *dev,struct adv7511 *adv7511) {drivers/gpu/drm/bridge/adv7511/adv7511_cec.c +6
-3@@ -119,7 +119,7 @@ static void adv7511_cec_rx(struct adv7511 *adv7511, int rx_buf)cec_received_msg (adv7511->cec_adap, &msg); } -void adv7511_cec_irq_process (struct adv7511 *adv7511,unsigned int irq1) +int adv7511_cec_irq_process (struct adv7511 *adv7511,unsigned int irq1) {unsigned int offset = adv7511->info->reg_cec_offset; const u32 irq_tx_mask = ADV7511_INT1_CEC_TX_READY |@@ -130,17 +130,21 @@ void adv7511_cec_irq_process(struct adv7511 *adv7511, unsigned int irq1)ADV7511_INT1_CEC_RX_READY3 ;unsigned int rx_status;int rx_order[3 ] = {-1 ,-1 ,-1 }; -int i; +int i, ret =0 ; +int irq_status =IRQ_NONE ; -if (irq1 & irq_tx_mask) +if (irq1 & irq_tx_mask) {adv_cec_tx_raw_status (adv7511, irq1); + irq_status =IRQ_HANDLED ; + }if (!(irq1 & irq_rx_mask))
drivers/gpu/drm/bridge/adv7511/adv7511_cec.c void adv7511_cec_irq_process(struct adv7511 *adv7511, unsigned int irq1) · line 147
Quoted 10 lines
drivers/gpu/drm/bridge/adv7511/adv7511_cec.c +5
-4-return ; +return irq_status; -if (regmap_read (adv7511->regmap_cec, -ADV7511_REG_CEC_RX_STATUS + offset, &rx_status)) -return ; + ret =regmap_read (adv7511->regmap_cec, +ADV7511_REG_CEC_RX_STATUS + offset, &rx_status); +if (ret <0 ) +return ret;
Ok, maybe I was wrong with my previous suggestion. The code starts to look more and more clumsy. Do we really care about error status at all? Maybe it's enough to return IRQ_NONE here from the IRQ handlers?
Quoted 17 lines
drivers/gpu/drm/bridge/adv7511/adv7511_cec.c +2
-0/* * ADV7511_REG_CEC_RX_STATUS[5:0] contains the reception order of RX @@ -172,6 +176,8 @@ void adv7511_cec_irq_process(struct adv7511 *adv7511, unsigned int irq1)adv7511_cec_rx (adv7511, rx_buf); } + +return IRQ_HANDLED ; }static int adv7511_cec_adap_enable (struct cec_adapter *adap,bool enable)drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +0
-0
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c static int adv7511_irq_process(struct adv7511 *adv7511, bool process_hpd) · line 472
Quoted 4 lines
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +1
-0@@ -469,6 +469,8 @@ static int adv7511_irq_process(struct adv7511 *adv7511, bool process_hpd) {unsigned int irq0, irq1;int ret; +int cec_status;
cec_status ends up being unset if CEC is disabled.
Quoted 44 lines
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +14
-8+int irq_status =IRQ_NONE ; ret =regmap_read (adv7511->regmap,ADV7511_REG_INT (0 ), &irq0);if (ret <0 )@@ -478,38 +480,41 @@ static int adv7511_irq_process(struct adv7511 *adv7511, bool process_hpd)if (ret <0 )return ret; -/* If there is no IRQ to handle, exit indicating no IRQ data */ -if (!(irq0 & (ADV7511_INT0_HPD |ADV7511_INT0_EDID_READY )) && - !(irq1 &ADV7511_INT1_DDC_ERROR )) -return -ENODATA ; -regmap_write (adv7511->regmap,ADV7511_REG_INT (0 ), irq0);regmap_write (adv7511->regmap,ADV7511_REG_INT (1 ), irq1); -if (process_hpd && irq0 &ADV7511_INT0_HPD && adv7511->bridge.encoder) +if (process_hpd && irq0 &ADV7511_INT0_HPD && adv7511->bridge.encoder) {schedule_work (&adv7511->hpd_work); + irq_status =IRQ_HANDLED ; + }if (irq0 &ADV7511_INT0_EDID_READY || irq1 &ADV7511_INT1_DDC_ERROR ) { adv7511->edid_read = true;if (adv7511->i2c_main->irq)wake_up_all (&adv7511->wq); + irq_status =IRQ_HANDLED ; }#ifdef CONFIG_DRM_I2C_ADV7511_CEC -adv7511_cec_irq_process (adv7511, irq1); + cec_status =adv7511_cec_irq_process (adv7511, irq1); + +if (cec_status <0 ) +return cec_status;#endif -return 0 ; +/* If there is no IRQ to handle, exit indicating no IRQ data */ +if (irq_status ==IRQ_HANDLED || cec_status ==IRQ_HANDLED ) +return IRQ_HANDLED ; + +return IRQ_NONE ;
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c static int adv7511_irq_process(struct adv7511 *adv7511, bool process_hpd) · line 517
Quoted 10 lines
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +1
-3}static irqreturn_t adv7511_irq_handler (int irq,void *devid) {struct adv7511 *adv7511 = devid; -int ret; - ret =adv7511_irq_process (adv7511, true); -return ret <0 ?IRQ_NONE :IRQ_HANDLED ; +return adv7511_irq_process (adv7511, true);
This should be return ret < 0 ? IRQ_NONE : ret. We should not be returning negative error via irqreturn_t.
Quoted 6 lines
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +0
-0}/* ----------------------------------------------------------------------------- Signature · 1 line
2.43.0
Signature · 2 lines
With best wishes Dmitry