drivers/gpu/drm/ast: Fix infinite loop if read fails
Subsystems (3)
PATCH 1/1 drivers/gpu/drm/ast: Fix infinite loop if read fails
[Why]
Similar to commit <298360af3>("drivers/gpu/drm/ast: Fix infinite loop if read fails"), ast_init_dram_reg() configures a window in order to access BMC memory.
A BMC register can be configured to disallow this, and if so, causes
an infinite loop in the ast driver which renders the system unusable.
[How]
Fix this by erroring out if an error is detected.
Signed-off-by Defang Bo <[email protected]>
--- drivers/gpu/drm/ast/ast_post.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/ast/ast_post.c +6 -3
@@ -287,7 +287,8 @@ static void ast_init_dram_reg(struct drm_device *dev)ast_write32 (ast,0x10100 ,0xa8 );do { - ; +if (pci_channel_offline (dev->pdev)) +return ; }while (ast_read32 (ast,0x10100 ) !=0xa8 ); }else {/* AST2100/1100 */ if (ast->chip ==AST2100 || ast->chip ==2200 )
@@ -299,12 +300,14 @@ static void ast_init_dram_reg(struct drm_device *dev)ast_write32 (ast,0xf000 ,0x1 );ast_write32 (ast,0x12000 ,0x1688A8A8 );do { - ; +if (pci_channel_offline (dev->pdev)) +return ; }while (ast_read32 (ast,0x12000 ) !=0x01 );ast_write32 (ast,0x10000 ,0xfc600309 );do { - ; +if (pci_channel_offline (dev->pdev)) +return ; }while (ast_read32 (ast,0x10000 ) !=0x01 ); }
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel