Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
567b99f8
Commit
567b99f8
authored
Apr 24, 2011
by
Florian Tobias Schandinat
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'viafb-olpc' into viafb-next
parents
b4ce6a28
c5a4e6d7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
2 deletions
+8
-2
drivers/video/via/hw.c
drivers/video/via/hw.c
+6
-1
drivers/video/via/share.h
drivers/video/via/share.h
+1
-0
drivers/video/via/viamode.c
drivers/video/via/viamode.c
+1
-1
No files found.
drivers/video/via/hw.c
View file @
567b99f8
...
...
@@ -20,6 +20,7 @@
*/
#include <linux/via-core.h>
#include <asm/olpc.h>
#include "global.h"
static
struct
pll_config
cle266_pll_config
[]
=
{
...
...
@@ -875,6 +876,10 @@ void viafb_set_iga_path(void)
viaparinfo
->
chip_info
->
lvds_chip_info2
.
output_interface
);
}
/* looks like the OLPC has its display wired to DVP1 and LVDS2 */
if
(
machine_is_olpc
())
viaparinfo
->
shared
->
iga2_devices
=
VIA_DVP1
|
VIA_LVDS2
;
}
static
void
set_color_register
(
u8
index
,
u8
red
,
u8
green
,
u8
blue
)
...
...
@@ -2600,7 +2605,7 @@ int viafb_get_refresh(int hres, int vres, u32 long_refresh)
if
(
abs
(
best
->
refresh_rate
-
long_refresh
)
>
3
)
{
if
(
hres
==
1200
&&
vres
==
900
)
return
50
;
/* OLPC DCON only supports 50 Hz */
return
49
;
/* OLPC DCON only supports 50 Hz */
else
return
60
;
}
...
...
drivers/video/via/share.h
View file @
567b99f8
...
...
@@ -290,6 +290,7 @@
#define HW_LAYOUT_LCD_EXTERNAL_LCD2 0x10
/* Definition Refresh Rate */
#define REFRESH_49 49
#define REFRESH_50 50
#define REFRESH_60 60
#define REFRESH_75 75
...
...
drivers/video/via/viamode.c
View file @
567b99f8
...
...
@@ -606,7 +606,7 @@ static struct crt_mode_table CRTM1200x720[] = {
/* 1200x900 (DCON) */
static
struct
crt_mode_table
DCON1200x900
[]
=
{
/* r_rate, hsp, vsp */
{
REFRESH_
50
,
M1200X900_R60_HSP
,
M1200X900_R60_VSP
,
{
REFRESH_
49
,
M1200X900_R60_HSP
,
M1200X900_R60_VSP
,
/* The correct htotal is 1240, but this doesn't raster on VX855. */
/* Via suggested changing to a multiple of 16, hence 1264. */
/* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment