diff options
| -rw-r--r-- | src/i830_driver.c | 4 | ||||
| -rw-r--r-- | src/i830_memory.c | 4 | ||||
| -rw-r--r-- | src/i830_video.c | 1 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c index 445ab37b..5069142a 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -1170,8 +1170,8 @@ int i830_crtc_to_pipe(xf86CrtcPtr crtc) static Bool I830ScreenInit(int scrnIndex, ScreenPtr screen, int argc, char **argv) { - ScrnInfoPtr scrn = xf86Screens[screen->myNum];; - intel_screen_private *intel = intel_get_screen_private(scrn);; + ScrnInfoPtr scrn = xf86Screens[screen->myNum]; + intel_screen_private *intel = intel_get_screen_private(scrn); VisualPtr visual; MessageType from; struct pci_device *const device = intel->PciInfo; diff --git a/src/i830_memory.c b/src/i830_memory.c index 8fac2aaa..f6ed71c5 100644 --- a/src/i830_memory.c +++ b/src/i830_memory.c @@ -584,12 +584,12 @@ Bool i830_allocate_2d_memory(ScrnInfoPtr scrn) Bool i830_bind_all_memory(ScrnInfoPtr scrn) { intel_screen_private *intel = intel_get_screen_private(scrn); + xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); + int i; if (intel->memory_list == NULL) return TRUE; - int i; - xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); for (i = 0; i < xf86_config->num_crtc; i++) drmmode_crtc_set_cursor_bo(xf86_config->crtc[i], intel->cursor_mem_argb[i]->bo); diff --git a/src/i830_video.c b/src/i830_video.c index b0403d40..dd3aefa3 100644 --- a/src/i830_video.c +++ b/src/i830_video.c @@ -1440,7 +1440,6 @@ i830_copy_video_data(ScrnInfoPtr scrn, intel_adaptor_private *adaptor_priv, INT32 x1, INT32 y1, INT32 x2, INT32 y2, int id, unsigned char *buf) { - intel_screen_private *intel = intel_get_screen_private(scrn); int srcPitch = 0, srcPitch2 = 0; int top, left, npixels, nlines, size; |