diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2012-09-18 12:16:07 -0700 |
---|---|---|
committer | Tom Zanussi <tom.zanussi@intel.com> | 2012-12-03 14:20:44 -0600 |
commit | 6eed0090597bfe82603be5ffa9c9f1fd141306f0 (patch) | |
tree | e4e16247f8ae3b3ad3a1426f59af2dcf5668e533 /meta-emenlow/recipes-graphics/xorg-xserver/files/ptr-to-int-cast-fix.patch | |
parent | b4141a6404fa7d3445d660860b6bf68acec9f114 (diff) | |
download | meta-intel-6eed0090597bfe82603be5ffa9c9f1fd141306f0.tar.gz |
emenlow: use emgd instead of psb for graphics driver
Remove all the Poulsbo graphics driver specific meta data files.
And configure the BSP to use EMGD instead of psb for graphics stack.
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Diffstat (limited to 'meta-emenlow/recipes-graphics/xorg-xserver/files/ptr-to-int-cast-fix.patch')
-rw-r--r-- | meta-emenlow/recipes-graphics/xorg-xserver/files/ptr-to-int-cast-fix.patch | 92 |
1 files changed, 0 insertions, 92 deletions
diff --git a/meta-emenlow/recipes-graphics/xorg-xserver/files/ptr-to-int-cast-fix.patch b/meta-emenlow/recipes-graphics/xorg-xserver/files/ptr-to-int-cast-fix.patch deleted file mode 100644 index 19574d01..00000000 --- a/meta-emenlow/recipes-graphics/xorg-xserver/files/ptr-to-int-cast-fix.patch +++ /dev/null | |||
@@ -1,92 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [already upstream] | ||
2 | |||
3 | It's broken for devices with BARs above 4G, and the sysfs method should | ||
4 | work everywhere anyway. As a pleasant side effect, this fixes some | ||
5 | warnings: | ||
6 | |||
7 | fbdevhw.c: In function 'fbdev_open_pci': | ||
8 | fbdevhw.c:333:4: warning: cast from pointer to integer of different size | ||
9 | fbdevhw.c:334:4: warning: cast from pointer to integer of different size | ||
10 | fbdevhw.c:336:4: warning: cast from pointer to integer of different size | ||
11 | fbdevhw.c:337:4: warning: cast from pointer to integer of different size | ||
12 | |||
13 | Signed-off-by: Adam Jackson <ajax (a] redhat.com> | ||
14 | Integrated-by: Tom Zanussi <tom.zanussi (a] intel.com> | ||
15 | |||
16 | Index: xorg-server-1.7.99.2/hw/xfree86/fbdevhw/fbdevhw.c | ||
17 | =================================================================== | ||
18 | --- xorg-server-1.7.99.2.orig/hw/xfree86/fbdevhw/fbdevhw.c 2012-01-10 22:08:26.466693355 -0600 | ||
19 | +++ xorg-server-1.7.99.2/hw/xfree86/fbdevhw/fbdevhw.c 2012-01-10 22:11:36.386936978 -0600 | ||
20 | @@ -291,14 +291,7 @@ | ||
21 | { | ||
22 | struct fb_fix_screeninfo fix; | ||
23 | char filename[256]; | ||
24 | - int fd,i,j; | ||
25 | - | ||
26 | - | ||
27 | - /* There are two ways to that we can determine which fb device is | ||
28 | - * associated with this PCI device. The more modern way is to look in | ||
29 | - * the sysfs directory for the PCI device for a file named | ||
30 | - * "graphics/fb*" | ||
31 | - */ | ||
32 | + int fd, i; | ||
33 | |||
34 | for (i = 0; i < 8; i++) { | ||
35 | sprintf(filename, | ||
36 | @@ -331,55 +324,10 @@ | ||
37 | } | ||
38 | } | ||
39 | |||
40 | - | ||
41 | - /* The other way is to examine the resources associated with each fb | ||
42 | - * device and see if there is a match with the PCI device. This technique | ||
43 | - * has some problems on certain mixed 64-bit / 32-bit architectures. | ||
44 | - * There is a flaw in the fb_fix_screeninfo structure in that it only | ||
45 | - * returns the low 32-bits of the address of the resources associated with | ||
46 | - * a device. However, on a mixed architecture the base addresses of PCI | ||
47 | - * devices, even for 32-bit applications, may be higher than 0x0f0000000. | ||
48 | - */ | ||
49 | - | ||
50 | - for (i = 0; i < 8; i++) { | ||
51 | - sprintf(filename,"/dev/fb%d",i); | ||
52 | - if (-1 == (fd = open(filename,O_RDWR,0))) { | ||
53 | - xf86DrvMsg(-1, X_WARNING, | ||
54 | - "open %s: %s\n", filename, strerror(errno)); | ||
55 | - continue; | ||
56 | - } | ||
57 | - if (-1 == ioctl(fd,FBIOGET_FSCREENINFO,(void*)&fix)) { | ||
58 | - close(fd); | ||
59 | - continue; | ||
60 | - } | ||
61 | - for (j = 0; j < 6; j++) { | ||
62 | - const pciaddr_t res_start = pPci->regions[j].base_addr; | ||
63 | - const pciaddr_t res_end = res_start + pPci->regions[j].size; | ||
64 | - | ||
65 | - if ((0 != fix.smem_len && | ||
66 | - (pciaddr_t) fix.smem_start >= res_start && | ||
67 | - (pciaddr_t) fix.smem_start < res_end) || | ||
68 | - (0 != fix.mmio_len && | ||
69 | - (pciaddr_t) fix.mmio_start >= res_start && | ||
70 | - (pciaddr_t) fix.mmio_start < res_end)) | ||
71 | - break; | ||
72 | - } | ||
73 | - if (j == 6) { | ||
74 | - close(fd); | ||
75 | - continue; | ||
76 | - } | ||
77 | - if (namep) { | ||
78 | - *namep = xnfalloc(16); | ||
79 | - strncpy(*namep,fix.id,16); | ||
80 | - } | ||
81 | - return fd; | ||
82 | - } | ||
83 | - | ||
84 | if (namep) | ||
85 | *namep = NULL; | ||
86 | |||
87 | - xf86DrvMsg(-1, X_ERROR, | ||
88 | - "Unable to find a valid framebuffer device\n"); | ||
89 | + xf86DrvMsg(-1, X_ERROR, "Unable to find a valid framebuffer device\n"); | ||
90 | return -1; | ||
91 | } | ||
92 | |||