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/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/xorg-x11-drv-psb-0.31.0-xserver17.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/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/xorg-x11-drv-psb-0.31.0-xserver17.patch')
-rw-r--r-- | meta-emenlow/recipes-graphics/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/xorg-x11-drv-psb-0.31.0-xserver17.patch | 85 |
1 files changed, 0 insertions, 85 deletions
diff --git a/meta-emenlow/recipes-graphics/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/xorg-x11-drv-psb-0.31.0-xserver17.patch b/meta-emenlow/recipes-graphics/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/xorg-x11-drv-psb-0.31.0-xserver17.patch deleted file mode 100644 index defed503..00000000 --- a/meta-emenlow/recipes-graphics/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/xorg-x11-drv-psb-0.31.0-xserver17.patch +++ /dev/null | |||
@@ -1,85 +0,0 @@ | |||
1 | --- xserver-xorg-video-psb-0.31.0/src/Xpsb.h 2009-04-17 11:22:26.000000000 -0700 | ||
2 | +++ xserver-xorg-video-psb-0.31.0/src/Xpsb.h.new 2009-08-28 09:24:16.333677591 -0700 | ||
3 | @@ -38,7 +38,9 @@ | ||
4 | #include "xf86drm.h" | ||
5 | #include "xf86.h" | ||
6 | #include "xf86_OSproc.h" | ||
7 | +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 | ||
8 | #include "xf86Resources.h" | ||
9 | +#endif | ||
10 | #include "compiler.h" | ||
11 | |||
12 | #define XPSB_VOFFSET_X 0 | ||
13 | --- xserver-xorg-video-psb-0.31.0/src/psb_driver.h 2009-04-17 11:22:25.000000000 -0700 | ||
14 | +++ xserver-xorg-video-psb-0.31.0/src/psb_driver.h.new 2009-08-28 09:24:11.822679667 -0700 | ||
15 | @@ -34,7 +34,6 @@ | ||
16 | |||
17 | #include "xf86.h" | ||
18 | #include "xf86_OSproc.h" | ||
19 | -#include "xf86Resources.h" | ||
20 | #include "compiler.h" | ||
21 | #include "xf86PciInfo.h" | ||
22 | #include "vgaHW.h" | ||
23 | @@ -46,8 +45,10 @@ | ||
24 | #include "xf86int10.h" | ||
25 | #include "mibank.h" | ||
26 | #include "dgaproc.h" | ||
27 | +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 | ||
28 | #include "xf86Resources.h" | ||
29 | #include "xf86RAC.h" | ||
30 | +#endif | ||
31 | #include "fb.h" | ||
32 | #include "xaa.h" | ||
33 | #include "xf86xv.h" | ||
34 | --- xserver-xorg-video-psb-0.31.0/src/i830_i2c.c 2009-04-17 11:22:24.000000000 -0700 | ||
35 | +++ xserver-xorg-video-psb-0.31.0/src/i830_i2c.c.new 2009-08-28 09:33:06.789804272 -0700 | ||
36 | @@ -31,8 +31,10 @@ | ||
37 | |||
38 | #include "xf86.h" | ||
39 | #include "xf86_OSproc.h" | ||
40 | +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 | ||
41 | #include "xf86Resources.h" | ||
42 | #include "xf86RAC.h" | ||
43 | +#endif | ||
44 | #include "xf86cmap.h" | ||
45 | #include "compiler.h" | ||
46 | #include "mibstore.h" | ||
47 | --- xserver-xorg-video-psb-0.31.0/src/psb_video.c 2009-04-17 11:22:26.000000000 -0700 | ||
48 | +++ xserver-xorg-video-psb-0.31.0/src/psb_video.c.new 2009-08-28 09:35:03.874805663 -0700 | ||
49 | @@ -36,7 +36,9 @@ | ||
50 | |||
51 | #include "xf86.h" | ||
52 | #include "xf86_OSproc.h" | ||
53 | +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 | ||
54 | #include "xf86Resources.h" | ||
55 | +#endif | ||
56 | #include "compiler.h" | ||
57 | |||
58 | #include "xf86xv.h" | ||
59 | --- xserver-xorg-video-psb-0.31.0/src/psb_driver.c 2009-04-17 11:22:26.000000000 -0700 | ||
60 | +++ xserver-xorg-video-psb-0.31.0/src/psb_driver.c.new 2009-08-28 10:30:32.325553685 -0700 | ||
61 | @@ -317,7 +317,7 @@ | ||
62 | * This data is accessed by the loader. The name must be the module name | ||
63 | * followed by "ModuleData". | ||
64 | */ | ||
65 | -XF86ModuleData psbModuleData = { &psbVersionRec, psbSetup, NULL }; | ||
66 | +_X_EXPORT XF86ModuleData psbModuleData = { &psbVersionRec, psbSetup, NULL }; | ||
67 | |||
68 | static pointer | ||
69 | psbSetup(pointer Module, pointer Options, int *ErrorMajor, int *ErrorMinor) | ||
70 | @@ -1023,11 +1023,13 @@ | ||
71 | |||
72 | PSB_DEBUG(scrnIndex, 3, "Initializing device\n"); | ||
73 | |||
74 | +#ifndef XSERVER_LIBPCIACCESS | ||
75 | if (xf86RegisterResources(pDevice->pEnt->index, NULL, ResExclusive)) { | ||
76 | xf86DrvMsg(scrnIndex, X_ERROR, | ||
77 | "Could not registrer device. Resource conflict.\n"); | ||
78 | return FALSE; | ||
79 | } | ||
80 | +#endif | ||
81 | |||
82 | if (!xf86LoadSubModule(pDevice->pScrns[0], "vgahw")) | ||
83 | return FALSE; | ||
84 | |||
85 | |||