diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-04-09 10:14:35 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-04-09 10:31:08 +1000 |
| commit | d1a9b1f513109c975a5a7ed5a2d0c329b280afe4 (patch) | |
| tree | 5c85af47b4f5af0661acf129e3ce3f59e43cbfd9 /src/gallium/state_trackers/egl/egl_surface.c | |
| parent | 90ffce497395d8c02fee2ea4ee4c025eede3d876 (diff) | |
| parent | 8648c2685870174cf620ef15de70ef030a8d5a20 (diff) | |
Merge remote branch 'origin/master' into radeon-rewrite
Conflicts:
src/mesa/drivers/dri/r200/r200_tex.c
src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/r300/r300_context.h
src/mesa/drivers/dri/r300/r300_swtcl.c
src/mesa/drivers/dri/r300/r300_tex.c
src/mesa/drivers/dri/r300/r300_texmem.c
src/mesa/drivers/dri/r300/r300_texstate.c
src/mesa/drivers/dri/radeon/radeon_tex.c
Diffstat (limited to 'src/gallium/state_trackers/egl/egl_surface.c')
| -rw-r--r-- | src/gallium/state_trackers/egl/egl_surface.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/gallium/state_trackers/egl/egl_surface.c b/src/gallium/state_trackers/egl/egl_surface.c index e6e80b985a..489aa8d9af 100644 --- a/src/gallium/state_trackers/egl/egl_surface.c +++ b/src/gallium/state_trackers/egl/egl_surface.c @@ -330,6 +330,13 @@ drm_show_screen_surface_mesa(_EGLDriver *drv, EGLDisplay dpy, if (ret) goto err_crtc; + + if (scrn->dpms) + drmModeConnectorSetProperty(dev->drmFD, + scrn->connectorID, + scrn->dpms->prop_id, + DRM_MODE_DPMS_ON); + surf->screen = scrn; scrn->surf = surf; @@ -399,8 +406,6 @@ drm_swap_buffers(_EGLDriver *drv, EGLDisplay dpy, EGLSurface draw) surf->user->pipe->flush(surf->user->pipe, PIPE_FLUSH_RENDER_CACHE | PIPE_FLUSH_TEXTURE_CACHE, NULL); /* TODO stuff here */ } - - st_notify_swapbuffers_complete(surf->stfb); } return EGL_TRUE; |