Commit 6c9bd443 authored by Gregory Williams's avatar Gregory Williams Committed by Thomas Zimmermann

DRM: ast: Fixed coding style issues of ast_mode.c

Removed space before comma, fixed if statements by putting trailing
statements on new line, fixed unsigned int declaration, and removed
not needed else statement after return.
Signed-off-by: default avatarGregory Williams <gregwills85@gmail.com>
Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20210731005328.GA19016@devbox
parent 9746f5fe
...@@ -275,7 +275,7 @@ static void ast_set_std_reg(struct ast_private *ast, ...@@ -275,7 +275,7 @@ static void ast_set_std_reg(struct ast_private *ast,
ast_set_index_reg_mask(ast, AST_IO_SEQ_PORT, 0x01, 0xdf, stdtable->seq[0]); ast_set_index_reg_mask(ast, AST_IO_SEQ_PORT, 0x01, 0xdf, stdtable->seq[0]);
for (i = 1; i < 4; i++) { for (i = 1; i < 4; i++) {
jreg = stdtable->seq[i]; jreg = stdtable->seq[i];
ast_set_index_reg(ast, AST_IO_SEQ_PORT, (i + 1) , jreg); ast_set_index_reg(ast, AST_IO_SEQ_PORT, (i + 1), jreg);
} }
/* Set CRTC; except base address and offset */ /* Set CRTC; except base address and offset */
...@@ -498,13 +498,15 @@ static void ast_set_sync_reg(struct ast_private *ast, ...@@ -498,13 +498,15 @@ static void ast_set_sync_reg(struct ast_private *ast,
jreg = ast_io_read8(ast, AST_IO_MISC_PORT_READ); jreg = ast_io_read8(ast, AST_IO_MISC_PORT_READ);
jreg &= ~0xC0; jreg &= ~0xC0;
if (vbios_mode->enh_table->flags & NVSync) jreg |= 0x80; if (vbios_mode->enh_table->flags & NVSync)
if (vbios_mode->enh_table->flags & NHSync) jreg |= 0x40; jreg |= 0x80;
if (vbios_mode->enh_table->flags & NHSync)
jreg |= 0x40;
ast_io_write8(ast, AST_IO_MISC_PORT_WRITE, jreg); ast_io_write8(ast, AST_IO_MISC_PORT_WRITE, jreg);
} }
static void ast_set_start_address_crt1(struct ast_private *ast, static void ast_set_start_address_crt1(struct ast_private *ast,
unsigned offset) unsigned int offset)
{ {
u32 addr; u32 addr;
...@@ -1211,6 +1213,7 @@ static int ast_get_modes(struct drm_connector *connector) ...@@ -1211,6 +1213,7 @@ static int ast_get_modes(struct drm_connector *connector)
struct edid *edid; struct edid *edid;
int ret; int ret;
bool flags = false; bool flags = false;
if (ast->tx_chip_type == AST_TX_DP501) { if (ast->tx_chip_type == AST_TX_DP501) {
ast->dp501_maxclk = 0xff; ast->dp501_maxclk = 0xff;
edid = kmalloc(128, GFP_KERNEL); edid = kmalloc(128, GFP_KERNEL);
...@@ -1230,8 +1233,8 @@ static int ast_get_modes(struct drm_connector *connector) ...@@ -1230,8 +1233,8 @@ static int ast_get_modes(struct drm_connector *connector)
ret = drm_add_edid_modes(connector, edid); ret = drm_add_edid_modes(connector, edid);
kfree(edid); kfree(edid);
return ret; return ret;
} else }
drm_connector_update_edid_property(&ast_connector->base, NULL); drm_connector_update_edid_property(&ast_connector->base, NULL);
return 0; return 0;
} }
...@@ -1271,19 +1274,24 @@ static enum drm_mode_status ast_mode_valid(struct drm_connector *connector, ...@@ -1271,19 +1274,24 @@ static enum drm_mode_status ast_mode_valid(struct drm_connector *connector,
} }
switch (mode->hdisplay) { switch (mode->hdisplay) {
case 640: case 640:
if (mode->vdisplay == 480) flags = MODE_OK; if (mode->vdisplay == 480)
flags = MODE_OK;
break; break;
case 800: case 800:
if (mode->vdisplay == 600) flags = MODE_OK; if (mode->vdisplay == 600)
flags = MODE_OK;
break; break;
case 1024: case 1024:
if (mode->vdisplay == 768) flags = MODE_OK; if (mode->vdisplay == 768)
flags = MODE_OK;
break; break;
case 1280: case 1280:
if (mode->vdisplay == 1024) flags = MODE_OK; if (mode->vdisplay == 1024)
flags = MODE_OK;
break; break;
case 1600: case 1600:
if (mode->vdisplay == 1200) flags = MODE_OK; if (mode->vdisplay == 1200)
flags = MODE_OK;
break; break;
default: default:
return flags; return flags;
...@@ -1307,6 +1315,7 @@ static enum drm_connector_status ast_connector_detect(struct drm_connector ...@@ -1307,6 +1315,7 @@ static enum drm_connector_status ast_connector_detect(struct drm_connector
static void ast_connector_destroy(struct drm_connector *connector) static void ast_connector_destroy(struct drm_connector *connector)
{ {
struct ast_connector *ast_connector = to_ast_connector(connector); struct ast_connector *ast_connector = to_ast_connector(connector);
ast_i2c_destroy(ast_connector->i2c); ast_i2c_destroy(ast_connector->i2c);
drm_connector_cleanup(connector); drm_connector_cleanup(connector);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment