Skip to content

L
linux
Commit 22acdbb1 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Dave Airlie
Browse files
Options

drm/ast: const'ify mode setting tables 

And fix some comment alignment & space/tabs while at it
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: default avatarJoel Stanley <joel@jms.id.au>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 71f677a9
Show whitespace changes
Inline Side-by-side
Showing with 59 additions and 59 deletions
drivers/gpu/drm/ast/ast_drv.h
View file @ 22acdbb1
...@@ -305,8 +305,8 @@ struct ast_vbios_dclk_info { ...@@ -305,8 +305,8 @@ struct ast_vbios_dclk_info {
}; };
struct ast_vbios_mode_info { struct ast_vbios_mode_info {
struct ast_vbios_stdtable *std_table; const struct ast_vbios_stdtable *std_table;
struct ast_vbios_enhtable *enh_table; const struct ast_vbios_enhtable *enh_table;
}; };
extern int ast_mode_init(struct drm_device *dev); extern int ast_mode_init(struct drm_device *dev);
......
drivers/gpu/drm/ast/ast_mode.c
View file @ 22acdbb1
...@@ -81,9 +81,9 @@ static bool ast_get_vbios_mode_info(struct drm_crtc *crtc, struct drm_display_mo ...@@ -81,9 +81,9 @@ static bool ast_get_vbios_mode_info(struct drm_crtc *crtc, struct drm_display_mo
struct ast_private *ast = crtc->dev->dev_private; struct ast_private *ast = crtc->dev->dev_private;
const struct drm_framebuffer *fb = crtc->primary->fb; const struct drm_framebuffer *fb = crtc->primary->fb;
u32 refresh_rate_index = 0, mode_id, color_index, refresh_rate; u32 refresh_rate_index = 0, mode_id, color_index, refresh_rate;
const struct ast_vbios_enhtable *best = NULL;
u32 hborder, vborder; u32 hborder, vborder;
bool check_sync; bool check_sync;
struct ast_vbios_enhtable *best = NULL;
switch (fb->format->cpp[0] * 8) { switch (fb->format->cpp[0] * 8) {
case 8: case 8:
...@@ -147,7 +147,7 @@ static bool ast_get_vbios_mode_info(struct drm_crtc *crtc, struct drm_display_mo ...@@ -147,7 +147,7 @@ static bool ast_get_vbios_mode_info(struct drm_crtc *crtc, struct drm_display_mo
refresh_rate = drm_mode_vrefresh(mode); refresh_rate = drm_mode_vrefresh(mode);
check_sync = vbios_mode->enh_table->flags & WideScreenMode; check_sync = vbios_mode->enh_table->flags & WideScreenMode;
do { do {
struct ast_vbios_enhtable *loop = vbios_mode->enh_table; const struct ast_vbios_enhtable *loop = vbios_mode->enh_table;
while (loop->refresh_rate != 0xff) { while (loop->refresh_rate != 0xff) {
if ((check_sync) && if ((check_sync) &&
...@@ -227,7 +227,7 @@ static void ast_set_std_reg(struct drm_crtc *crtc, struct drm_display_mode *mode ...@@ -227,7 +227,7 @@ static void ast_set_std_reg(struct drm_crtc *crtc, struct drm_display_mode *mode
struct ast_vbios_mode_info *vbios_mode) struct ast_vbios_mode_info *vbios_mode)
{ {
struct ast_private *ast = crtc->dev->dev_private; struct ast_private *ast = crtc->dev->dev_private;
struct ast_vbios_stdtable *stdtable; const struct ast_vbios_stdtable *stdtable;
u32 i; u32 i;
u8 jreg; u8 jreg;
...@@ -384,7 +384,7 @@ static void ast_set_dclk_reg(struct drm_device *dev, struct drm_display_mode *mo ...@@ -384,7 +384,7 @@ static void ast_set_dclk_reg(struct drm_device *dev, struct drm_display_mode *mo
struct ast_vbios_mode_info *vbios_mode) struct ast_vbios_mode_info *vbios_mode)
{ {
struct ast_private *ast = dev->dev_private; struct ast_private *ast = dev->dev_private;
struct ast_vbios_dclk_info *clk_info; const struct ast_vbios_dclk_info *clk_info;
clk_info = &dclk_table[vbios_mode->enh_table->dclk_index]; clk_info = &dclk_table[vbios_mode->enh_table->dclk_index];
......
drivers/gpu/drm/ast/ast_tables.h
View file @ 22acdbb1
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
#define VCLK97_75 0x19 #define VCLK97_75 0x19
#define VCLK118_25 0x1A #define VCLK118_25 0x1A
static struct ast_vbios_dclk_info dclk_table[] = { static const struct ast_vbios_dclk_info dclk_table[] = {
{0x2C, 0xE7, 0x03}, /* 00: VCLK25_175 */ {0x2C, 0xE7, 0x03}, /* 00: VCLK25_175 */
{0x95, 0x62, 0x03}, /* 01: VCLK28_322 */ {0x95, 0x62, 0x03}, /* 01: VCLK28_322 */
{0x67, 0x63, 0x01}, /* 02: VCLK31_5 */ {0x67, 0x63, 0x01}, /* 02: VCLK31_5 */
...@@ -108,7 +108,7 @@ static struct ast_vbios_dclk_info dclk_table[] = { ...@@ -108,7 +108,7 @@ static struct ast_vbios_dclk_info dclk_table[] = {
{0x3b, 0x2c, 0x81}, /* 1A: VCLK118_25 */ {0x3b, 0x2c, 0x81}, /* 1A: VCLK118_25 */
}; };
static struct ast_vbios_stdtable vbios_stdtable[] = { static const struct ast_vbios_stdtable vbios_stdtable[] = {
/* MD_2_3_400 */ /* MD_2_3_400 */
{ {
0x67, 0x67,
...@@ -181,7 +181,7 @@ static struct ast_vbios_stdtable vbios_stdtable[] = { ...@@ -181,7 +181,7 @@ static struct ast_vbios_stdtable vbios_stdtable[] = {
}, },
}; };
static struct ast_vbios_enhtable res_640x480[] = { static const struct ast_vbios_enhtable res_640x480[] = {
{ 800, 640, 8, 96, 525, 480, 2, 2, VCLK25_175, /* 60Hz */ { 800, 640, 8, 96, 525, 480, 2, 2, VCLK25_175, /* 60Hz */
(SyncNN | HBorder | VBorder | Charx8Dot), 60, 1, 0x2E }, (SyncNN | HBorder | VBorder | Charx8Dot), 60, 1, 0x2E },
{ 832, 640, 16, 40, 520, 480, 1, 3, VCLK31_5, /* 72Hz */ { 832, 640, 16, 40, 520, 480, 1, 3, VCLK31_5, /* 72Hz */
...@@ -194,7 +194,7 @@ static struct ast_vbios_enhtable res_640x480[] = { ...@@ -194,7 +194,7 @@ static struct ast_vbios_enhtable res_640x480[] = {
(SyncNN | Charx8Dot) , 0xFF, 4, 0x2E }, (SyncNN | Charx8Dot) , 0xFF, 4, 0x2E },
}; };
static struct ast_vbios_enhtable res_800x600[] = { static const struct ast_vbios_enhtable res_800x600[] = {
{1024, 800, 24, 72, 625, 600, 1, 2, VCLK36, /* 56Hz */ {1024, 800, 24, 72, 625, 600, 1, 2, VCLK36, /* 56Hz */
(SyncPP | Charx8Dot), 56, 1, 0x30 }, (SyncPP | Charx8Dot), 56, 1, 0x30 },
{1056, 800, 40, 128, 628, 600, 1, 4, VCLK40, /* 60Hz */ {1056, 800, 40, 128, 628, 600, 1, 4, VCLK40, /* 60Hz */
...@@ -210,7 +210,7 @@ static struct ast_vbios_enhtable res_800x600[] = { ...@@ -210,7 +210,7 @@ static struct ast_vbios_enhtable res_800x600[] = {
}; };
static struct ast_vbios_enhtable res_1024x768[] = { static const struct ast_vbios_enhtable res_1024x768[] = {
{1344, 1024, 24, 136, 806, 768, 3, 6, VCLK65, /* 60Hz */ {1344, 1024, 24, 136, 806, 768, 3, 6, VCLK65, /* 60Hz */
(SyncNN | Charx8Dot), 60, 1, 0x31 }, (SyncNN | Charx8Dot), 60, 1, 0x31 },
{1328, 1024, 24, 136, 806, 768, 3, 6, VCLK75, /* 70Hz */ {1328, 1024, 24, 136, 806, 768, 3, 6, VCLK75, /* 70Hz */
...@@ -223,7 +223,7 @@ static struct ast_vbios_enhtable res_1024x768[] = { ...@@ -223,7 +223,7 @@ static struct ast_vbios_enhtable res_1024x768[] = {
(SyncPP | Charx8Dot), 0xFF, 4, 0x31 }, (SyncPP | Charx8Dot), 0xFF, 4, 0x31 },
}; };
static struct ast_vbios_enhtable res_1280x1024[] = { static const struct ast_vbios_enhtable res_1280x1024[] = {
{1688, 1280, 48, 112, 1066, 1024, 1, 3, VCLK108, /* 60Hz */ {1688, 1280, 48, 112, 1066, 1024, 1, 3, VCLK108, /* 60Hz */
(SyncPP | Charx8Dot), 60, 1, 0x32 }, (SyncPP | Charx8Dot), 60, 1, 0x32 },
{1688, 1280, 16, 144, 1066, 1024, 1, 3, VCLK135, /* 75Hz */ {1688, 1280, 16, 144, 1066, 1024, 1, 3, VCLK135, /* 75Hz */
...@@ -234,7 +234,7 @@ static struct ast_vbios_enhtable res_1280x1024[] = { ...@@ -234,7 +234,7 @@ static struct ast_vbios_enhtable res_1280x1024[] = {
(SyncPP | Charx8Dot), 0xFF, 3, 0x32 }, (SyncPP | Charx8Dot), 0xFF, 3, 0x32 },
}; };
static struct ast_vbios_enhtable res_1600x1200[] = { static const struct ast_vbios_enhtable res_1600x1200[] = {
{2160, 1600, 64, 192, 1250, 1200, 1, 3, VCLK162, /* 60Hz */ {2160, 1600, 64, 192, 1250, 1200, 1, 3, VCLK162, /* 60Hz */
(SyncPP | Charx8Dot), 60, 1, 0x33 }, (SyncPP | Charx8Dot), 60, 1, 0x33 },
{2160, 1600, 64, 192, 1250, 1200, 1, 3, VCLK162, /* end */ {2160, 1600, 64, 192, 1250, 1200, 1, 3, VCLK162, /* end */
...@@ -242,23 +242,23 @@ static struct ast_vbios_enhtable res_1600x1200[] = { ...@@ -242,23 +242,23 @@ static struct ast_vbios_enhtable res_1600x1200[] = {
}; };
/* 16:9 */ /* 16:9 */
static struct ast_vbios_enhtable res_1360x768[] = { static const struct ast_vbios_enhtable res_1360x768[] = {
{1792, 1360, 64,112, 795, 768, 3, 6, VCLK85_5, /* 60Hz */ {1792, 1360, 64, 112, 795, 768, 3, 6, VCLK85_5, /* 60Hz */
(SyncPP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 1, 0x39 }, (SyncPP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 1, 0x39 },
{1792, 1360, 64,112, 795, 768, 3, 6, VCLK85_5, /* end */ {1792, 1360, 64, 112, 795, 768, 3, 6, VCLK85_5, /* end */
(SyncPP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 0xFF, 1, 0x39 }, (SyncPP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 0xFF, 1, 0x39 },
}; };
static struct ast_vbios_enhtable res_1600x900[] = { static const struct ast_vbios_enhtable res_1600x900[] = {
{1760, 1600, 48, 32, 926, 900, 3, 5, VCLK97_75, /* 60Hz CVT RB */ {1760, 1600, 48, 32, 926, 900, 3, 5, VCLK97_75, /* 60Hz CVT RB */
(SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 1, 0x3A }, (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 1, 0x3A },
{2112, 1600, 88,168, 934, 900, 3, 5, VCLK118_25, /* 60Hz CVT */ {2112, 1600, 88, 168, 934, 900, 3, 5, VCLK118_25, /* 60Hz CVT */
(SyncPN | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 2, 0x3A }, (SyncPN | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 2, 0x3A },
{2112, 1600, 88,168, 934, 900, 3, 5, VCLK118_25, /* 60Hz CVT */ {2112, 1600, 88, 168, 934, 900, 3, 5, VCLK118_25, /* 60Hz CVT */
(SyncPN | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 0xFF, 2, 0x3A }, (SyncPN | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 0xFF, 2, 0x3A },
}; };
static struct ast_vbios_enhtable res_1920x1080[] = { static const struct ast_vbios_enhtable res_1920x1080[] = {
{2200, 1920, 88, 44, 1125, 1080, 4, 5, VCLK148_5, /* 60Hz */ {2200, 1920, 88, 44, 1125, 1080, 4, 5, VCLK148_5, /* 60Hz */
(SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 1, 0x38 }, (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 1, 0x38 },
{2200, 1920, 88, 44, 1125, 1080, 4, 5, VCLK148_5, /* 60Hz */ {2200, 1920, 88, 44, 1125, 1080, 4, 5, VCLK148_5, /* 60Hz */
...@@ -267,7 +267,7 @@ static struct ast_vbios_enhtable res_1920x1080[] = { ...@@ -267,7 +267,7 @@ static struct ast_vbios_enhtable res_1920x1080[] = {
/* 16:10 */ /* 16:10 */
static struct ast_vbios_enhtable res_1280x800[] = { static const struct ast_vbios_enhtable res_1280x800[] = {
{1440, 1280, 48, 32, 823, 800, 3, 6, VCLK71, /* 60Hz RB */ {1440, 1280, 48, 32, 823, 800, 3, 6, VCLK71, /* 60Hz RB */
(SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 1, 0x35 }, (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 1, 0x35 },
{1680, 1280, 72,128, 831, 800, 3, 6, VCLK83_5, /* 60Hz */ {1680, 1280, 72,128, 831, 800, 3, 6, VCLK83_5, /* 60Hz */
...@@ -277,7 +277,7 @@ static struct ast_vbios_enhtable res_1280x800[] = { ...@@ -277,7 +277,7 @@ static struct ast_vbios_enhtable res_1280x800[] = {
}; };
static struct ast_vbios_enhtable res_1440x900[] = { static const struct ast_vbios_enhtable res_1440x900[] = {
{1600, 1440, 48, 32, 926, 900, 3, 6, VCLK88_75, /* 60Hz RB */ {1600, 1440, 48, 32, 926, 900, 3, 6, VCLK88_75, /* 60Hz RB */
(SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 1, 0x36 }, (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 1, 0x36 },
{1904, 1440, 80,152, 934, 900, 3, 6, VCLK106_5, /* 60Hz */ {1904, 1440, 80,152, 934, 900, 3, 6, VCLK106_5, /* 60Hz */
...@@ -286,7 +286,7 @@ static struct ast_vbios_enhtable res_1440x900[] = { ...@@ -286,7 +286,7 @@ static struct ast_vbios_enhtable res_1440x900[] = {
(SyncPN | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 0xFF, 2, 0x36 }, (SyncPN | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 0xFF, 2, 0x36 },
}; };
static struct ast_vbios_enhtable res_1680x1050[] = { static const struct ast_vbios_enhtable res_1680x1050[] = {
{1840, 1680, 48, 32, 1080, 1050, 3, 6, VCLK119, /* 60Hz RB */ {1840, 1680, 48, 32, 1080, 1050, 3, 6, VCLK119, /* 60Hz RB */
(SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 1, 0x37 }, (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 1, 0x37 },
{2240, 1680,104,176, 1089, 1050, 3, 6, VCLK146_25, /* 60Hz */ {2240, 1680,104,176, 1089, 1050, 3, 6, VCLK146_25, /* 60Hz */
...@@ -295,7 +295,7 @@ static struct ast_vbios_enhtable res_1680x1050[] = { ...@@ -295,7 +295,7 @@ static struct ast_vbios_enhtable res_1680x1050[] = {
(SyncPN | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 0xFF, 2, 0x37 }, (SyncPN | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 0xFF, 2, 0x37 },
}; };
static struct ast_vbios_enhtable res_1920x1200[] = { static const struct ast_vbios_enhtable res_1920x1200[] = {
{2080, 1920, 48, 32, 1235, 1200, 3, 6, VCLK154, /* 60Hz RB*/ {2080, 1920, 48, 32, 1235, 1200, 3, 6, VCLK154, /* 60Hz RB*/
(SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 1, 0x34 }, (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 1, 0x34 },
{2080, 1920, 48, 32, 1235, 1200, 3, 6, VCLK154, /* 60Hz RB */ {2080, 1920, 48, 32, 1235, 1200, 3, 6, VCLK154, /* 60Hz RB */
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7