diff options
| author | Zhigang Gong <zhigang.gong@linux.intel.com> | 2012-02-01 19:47:28 +0800 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2012-02-08 09:07:42 +0000 |
| commit | 70092bfbc51ddc5a51c9cae21c6b2852c216a6fc (patch) | |
| tree | 391915461b10e1bc4f917bb62a436b3babbf34b1 /src/intel_uxa.c | |
| parent | 798aad6c95a1a95fd587430dc7a6d59497a10ce1 (diff) | |
uxa/glamor: Refine CloseScreen and InitScreen process.
The previous version calls glamor_egl_close_screen and
glamor_egl_free_screen manually which is not align with
standard process. Now glamor change the way to follow
standard method:
glamor layer and glamor egl layer both have their internal
CloseScreens. The correct sequence is after the I830CloseScreen
is registered, then register glamor_egl_close_screen and
the last one is glamor_close_screen. So we move out the
intel_glamor_init from the intel_uxa_init to I830ScreenInit
and just after the registration of I830CloseScreen.
As the glamor interfaces changed, we need to check the
glamor version when load the glamor egl module to make
sure we are loading the right glamor module. If
failed, it will switch back to UXA path.
This depends upon glamor commit 1bc8bf tagged with version 0.3.0.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/intel_uxa.c')
| -rw-r--r-- | src/intel_uxa.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/intel_uxa.c b/src/intel_uxa.c index f04a2efd..a11846d0 100644 --- a/src/intel_uxa.c +++ b/src/intel_uxa.c @@ -1391,7 +1391,5 @@ Bool intel_uxa_init(ScreenPtr screen) uxa_set_fallback_debug(screen, intel->fallback_debug); uxa_set_force_fallback(screen, intel->force_fallback); - intel_glamor_init(screen); - return TRUE; } |