The flag support_widescreen in struct ast_device selects devices that support resolutions of at least 1680x1050 (WSXGA+). Name it accordingly. Signed-off-by: Thomas Zimmermann <tzimmermann@xxxxxxx> --- drivers/gpu/drm/ast/ast_drv.h | 2 +- drivers/gpu/drm/ast/ast_main.c | 26 +++++++++++++------------- drivers/gpu/drm/ast/ast_mode.c | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h index cf9edef8fca66..ec5b204be1dae 100644 --- a/drivers/gpu/drm/ast/ast_drv.h +++ b/drivers/gpu/drm/ast/ast_drv.h @@ -205,7 +205,7 @@ struct ast_device { } astdp; } output; - bool support_wide_screen; + bool support_wsxga_p; /* 1680x1050 */ u8 *dp501_fw_addr; const struct firmware *dp501_fw; /* dp501 fw */ diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c index 4f402e0b9b5c1..e1cfb2a1a5448 100644 --- a/drivers/gpu/drm/ast/ast_main.c +++ b/drivers/gpu/drm/ast/ast_main.c @@ -40,40 +40,40 @@ static void ast_detect_widescreen(struct ast_device *ast) { u8 vgacrd0; - ast->support_wide_screen = false; + ast->support_wsxga_p = false; if (AST_GEN(ast) >= 7) { - ast->support_wide_screen = true; + ast->support_wsxga_p = true; } else if (AST_GEN(ast) >= 6) { vgacrd0 = ast_get_index_reg(ast, AST_IO_VGACRI, 0xd0); if (!(vgacrd0 & AST_IO_VGACRD0_VRAM_INIT_BY_BMC)) - ast->support_wide_screen = true; + ast->support_wsxga_p = true; else if (vgacrd0 & AST_IO_VGACRD0_IKVM_WIDESCREEN) - ast->support_wide_screen = true; + ast->support_wsxga_p = true; else if (ast->chip == AST2510) - ast->support_wide_screen = true; + ast->support_wsxga_p = true; } else if (AST_GEN(ast) >= 5) { vgacrd0 = ast_get_index_reg(ast, AST_IO_VGACRI, 0xd0); if (!(vgacrd0 & AST_IO_VGACRD0_VRAM_INIT_BY_BMC)) - ast->support_wide_screen = true; + ast->support_wsxga_p = true; else if (vgacrd0 & AST_IO_VGACRD0_IKVM_WIDESCREEN) - ast->support_wide_screen = true; + ast->support_wsxga_p = true; else if (ast->chip == AST1400) - ast->support_wide_screen = true; + ast->support_wsxga_p = true; } else if (AST_GEN(ast) >= 4) { vgacrd0 = ast_get_index_reg(ast, AST_IO_VGACRI, 0xd0); if (!(vgacrd0 & AST_IO_VGACRD0_VRAM_INIT_BY_BMC)) - ast->support_wide_screen = true; + ast->support_wsxga_p = true; else if (vgacrd0 & AST_IO_VGACRD0_IKVM_WIDESCREEN) - ast->support_wide_screen = true; + ast->support_wsxga_p = true; else if (ast->chip == AST1300) - ast->support_wide_screen = true; + ast->support_wsxga_p = true; } else if (AST_GEN(ast) >= 2) { vgacrd0 = ast_get_index_reg(ast, AST_IO_VGACRI, 0xd0); if (!(vgacrd0 & AST_IO_VGACRD0_VRAM_INIT_BY_BMC)) - ast->support_wide_screen = true; + ast->support_wsxga_p = true; else if (vgacrd0 & AST_IO_VGACRD0_IKVM_WIDESCREEN) - ast->support_wide_screen = true; + ast->support_wsxga_p = true; } } diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c index b533eb6e233ed..d1b3136b37693 100644 --- a/drivers/gpu/drm/ast/ast_mode.c +++ b/drivers/gpu/drm/ast/ast_mode.c @@ -1024,7 +1024,7 @@ ast_crtc_helper_mode_valid(struct drm_crtc *crtc, const struct drm_display_mode enum drm_mode_status status; uint32_t jtemp; - if (ast->support_wide_screen) { + if (ast->support_wsxga_p) { if ((mode->hdisplay == 1680) && (mode->vdisplay == 1050)) return MODE_OK; if ((mode->hdisplay == 1280) && (mode->vdisplay == 800)) -- 2.47.1