From e8a75c8d7e68c480d7cc277f6b61643553b869a6 Mon Sep 17 00:00:00 2001 From: Helge Deller Date: Tue, 10 Jan 2006 20:48:03 -0500 Subject: [PATCH] --- yaml --- r: 17847 b: refs/heads/master c: 5d6d1640a254b27d0f598007313065713c1e3a04 h: refs/heads/master i: 17845: c570360ee03f58f5c043d63f03e39e00e9b8d45f 17843: fd9026bb81f8884978e4f5116b47e7ae88d96351 17839: b3b74e6386b4c21d915c0f41d7a2e378cafb28d6 v: v3 --- [refs] | 2 +- trunk/drivers/video/stifb.c | 17 +++++------------ 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 5b9998bec551..c33f8e30f160 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 02d79800a221eb4e54d80cbf2026af9edc1f437d +refs/heads/master: 5d6d1640a254b27d0f598007313065713c1e3a04 diff --git a/trunk/drivers/video/stifb.c b/trunk/drivers/video/stifb.c index fbb17332afd7..83cd76ca0265 100644 --- a/trunk/drivers/video/stifb.c +++ b/trunk/drivers/video/stifb.c @@ -73,13 +73,8 @@ #include "sticore.h" /* REGION_BASE(fb_info, index) returns the virtual address for region */ -#ifdef __LP64__ - #define REGION_BASE(fb_info, index) \ - (fb_info->sti->glob_cfg->region_ptrs[index] | 0xffffffff00000000) -#else - #define REGION_BASE(fb_info, index) \ - fb_info->sti->glob_cfg->region_ptrs[index] -#endif +#define REGION_BASE(fb_info, index) \ + F_EXTEND(fb_info->sti->glob_cfg->region_ptrs[index]) #define NGLEDEVDEPROM_CRT_REGION 1 @@ -1250,12 +1245,10 @@ stifb_init_fb(struct sti_struct *sti, int bpp_pref) memset(&fb->ngle_rom, 0, sizeof(fb->ngle_rom)); if ((fb->sti->regions_phys[0] & 0xfc000000) == (fb->sti->regions_phys[2] & 0xfc000000)) - sti_rom_address = fb->sti->regions_phys[0]; + sti_rom_address = F_EXTEND(fb->sti->regions_phys[0]); else - sti_rom_address = fb->sti->regions_phys[1]; -#ifdef __LP64__ - sti_rom_address |= 0xffffffff00000000; -#endif + sti_rom_address = F_EXTEND(fb->sti->regions_phys[1]); + fb->deviceSpecificConfig = gsc_readl(sti_rom_address); if (IS_24_DEVICE(fb)) { if (bpp_pref == 8 || bpp_pref == 32)