Subversion Repositories Kolibri OS

Rev

Rev 1414 | Rev 1430 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1414 Rev 1428
Line 32... Line 32...
32
#include 
32
#include 
33
#include "radeon_reg.h"
33
#include "radeon_reg.h"
34
#include "radeon.h"
34
#include "radeon.h"
35
#include "radeon_asic.h"
35
#include "radeon_asic.h"
36
#include "atom.h"
36
#include "atom.h"
-
 
37
#include "display.h"
Line 37... Line 38...
37
 
38
 
Line 38... Line 39...
38
#include 
39
#include 
Line 48... Line 49...
48
int radeon_modeset          = 1;
49
int radeon_modeset          = 1;
49
int radeon_new_pll          = 1;
50
int radeon_new_pll          = 1;
50
int radeon_vram_limit       = 0;
51
int radeon_vram_limit       = 0;
51
int radeon_audio            = 0;
52
int radeon_audio            = 0;
Line -... Line 53...
-
 
53
 
Line 52... Line 54...
52
 
54
extern display_t *rdisplay;
53
 
55
 
54
void parse_cmdline(char *cmdline, videomode_t *mode, char *log, int *kms);
56
void parse_cmdline(char *cmdline, videomode_t *mode, char *log, int *kms);
Line 55... Line 57...
55
int init_display(struct radeon_device *rdev, videomode_t *mode);
57
int init_display(struct radeon_device *rdev, videomode_t *mode);
56
int init_display_kms(struct radeon_device *rdev, videomode_t *mode);
58
int init_display_kms(struct radeon_device *rdev, videomode_t *mode);
-
 
59
 
Line 57... Line 60...
57
 
60
int get_modes(videomode_t *mode, int *count);
58
int get_modes(videomode_t *mode, int *count);
61
int set_user_mode(videomode_t *mode);
59
int set_user_mode(videomode_t *mode);
62
int r100_2D_test(struct radeon_device *rdev);
Line 955... Line 958...
955
static char  log[256];
958
static char  log[256];
956
static pci_dev_t device;
959
static pci_dev_t device;
Line 957... Line 960...
957
 
960
 
958
u32_t drvEntry(int action, char *cmdline)
961
u32_t drvEntry(int action, char *cmdline)
-
 
962
{
-
 
963
    struct radeon_device *rdev = NULL;
959
{
964
 
Line 960... Line 965...
960
    struct pci_device_id  *ent;
965
    struct pci_device_id  *ent;
961
 
966
 
Line 996... Line 1001...
996
    dbgprintf("device %x:%x\n", device.pci_dev.vendor,
1001
    dbgprintf("device %x:%x\n", device.pci_dev.vendor,
997
                                device.pci_dev.device);
1002
                                device.pci_dev.device);
Line 998... Line 1003...
998
 
1003
 
Line -... Line 1004...
-
 
1004
    err = drm_get_dev(&device.pci_dev, ent);
-
 
1005
 
-
 
1006
    rdev = rdisplay->ddev->dev_private;
-
 
1007
 
-
 
1008
    if( (rdev->asic == &r600_asic) ||
-
 
1009
        (rdev->asic == &rv770_asic))
-
 
1010
        r600_2D_test(rdev);
-
 
1011
    else
999
    err = drm_get_dev(&device.pci_dev, ent);
1012
        r100_2D_test(rdev);
Line 1000... Line 1013...
1000
 
1013
 
1001
    err = RegService("DISPLAY", display_handler);
1014
    err = RegService("DISPLAY", display_handler);