Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename drmmode_display to intel_display 

And fixup all the drmmode_* functions to have an intel prefix and
categorise those into intel_mode, intel_crtc, intel_output and
intel_property so that the functions are a little more self-descriptive
and, more importantly, are consistent.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2010-08-01 11:25:42 +01:00
parent 0be3e95c84
commit db7cd7b9f0
6 changed files with 1604 additions and 1589 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Makefile.am
View File

@ -43,10 +43,11 @@ intel_drv_la_SOURCES = \
common.h \
intel.h \
intel_module.c \
intel_driver.c \
intel_driver.h \
intel_batchbuffer.c \
intel_batchbuffer.h \
intel_display.c \
intel_driver.c \
intel_driver.h \
intel_memory.c \
intel_uxa.c \
intel_video.c \
@ -62,7 +63,6 @@ intel_drv_la_SOURCES = \
i965_reg.h \
i965_video.c \
i965_render.c \
drmmode_display.c \
$(NULL)
if DRI

1565
src/drmmode_display.c
View File

File diff suppressed because it is too large Load Diff

22
src/intel.h
View File

@ -438,13 +438,15 @@ enum {
DEBUG_FLUSH_WAIT = 0x4,
};
extern Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp);
extern void drmmode_remove_fb(intel_screen_private *intel);
extern void drmmode_fini(intel_screen_private *intel);
extern int drmmode_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, xf86CrtcPtr crtc);
extern int drmmode_crtc_id(xf86CrtcPtr crtc);
extern int drmmode_output_dpms_status(xf86OutputPtr output);
extern Bool drmmode_do_pageflip(ScreenPtr screen, dri_bo *new_front, void *data);
extern Bool intel_mode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp);
extern void intel_mode_remove_fb(intel_screen_private *intel);
extern void intel_mode_fini(intel_screen_private *intel);
extern int intel_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, xf86CrtcPtr crtc);
extern int intel_crtc_id(xf86CrtcPtr crtc);
extern int intel_output_dpms_status(xf86OutputPtr output);
extern Bool intel_do_pageflip(ScreenPtr screen, dri_bo *new_front, void *data);
static inline intel_screen_private *
intel_get_screen_private(ScrnInfoPtr scrn)
@ -485,7 +487,11 @@ void I830DRI2FlipEventHandler(unsigned int frame, unsigned int tv_sec,
unsigned int tv_usec, void *user_data);
extern Bool intel_crtc_on(xf86CrtcPtr crtc);
extern int intel_crtc_to_pipe(xf86CrtcPtr crtc);
static inline int intel_crtc_to_pipe(xf86CrtcPtr crtc)
{
intel_screen_private *intel = intel_get_screen_private(crtc->scrn);
return intel_get_pipe_from_crtc_id(intel->bufmgr, crtc);
}
/* intel_memory.c */
unsigned long intel_get_fence_size(intel_screen_private *intel, unsigned long size);

1582
src/intel_display.c Normal file
View File

File diff suppressed because it is too large Load Diff

16
src/intel_driver.c
View File

@ -599,7 +599,7 @@ static Bool I830PreInit(ScrnInfoPtr scrn, int flags)
return FALSE;
}
if (!drmmode_pre_init(scrn, intel->drmSubFD, intel->cpp)) {
if (!intel_mode_pre_init(scrn, intel->drmSubFD, intel->cpp)) {
PreInitCleanup(scrn);
return FALSE;
}
@ -762,7 +762,7 @@ Bool intel_crtc_on(xf86CrtcPtr crtc)
for (i = 0; i < xf86_config->num_output; i++) {
xf86OutputPtr output = xf86_config->output[i];
if (output->crtc == crtc &&
drmmode_output_dpms_status(output) == DPMSModeOn)
intel_output_dpms_status(output) == DPMSModeOn)
active_outputs++;
}
@ -771,14 +771,6 @@ Bool intel_crtc_on(xf86CrtcPtr crtc)
return FALSE;
}
int intel_crtc_to_pipe(xf86CrtcPtr crtc)
{
ScrnInfoPtr scrn = crtc->scrn;
intel_screen_private *intel = intel_get_screen_private(scrn);
return drmmode_get_pipe_from_crtc_id(intel->bufmgr, crtc);
}
static void
intel_flush_callback(CallbackListPtr *list,
pointer user_data, pointer call_data)
@ -1042,7 +1034,7 @@ static void I830FreeScreen(int scrnIndex, int flags)
intel_screen_private *intel = intel_get_screen_private(scrn);
if (intel) {
drmmode_fini(intel);
intel_mode_fini(intel);
intel_close_drm_master(intel);
intel_bufmgr_fini(intel);
@ -1122,7 +1114,7 @@ static Bool I830CloseScreen(int scrnIndex, ScreenPtr screen)
if (intel->front_buffer) {
intel_set_pixmap_bo(screen->GetScreenPixmap(screen), NULL);
drmmode_remove_fb(intel);
intel_mode_remove_fb(intel);
drm_intel_bo_unreference(intel->front_buffer);
intel->front_buffer = NULL;
}

2
src/intel_video.c
View File

@ -284,7 +284,7 @@ drmmode_overlay_put_image(intel_screen_private *intel,
OVERLAY_DEBUG("off_Y: %i, off_U: %i, off_V: %i\n", request.offset_Y,
request.offset_U, request.offset_V);
request.crtc_id = drmmode_crtc_id(crtc);
request.crtc_id = intel_crtc_id(crtc);
request.dst_x = dstBox->x1;
request.dst_y = dstBox->y1;
request.dst_width = dstBox->x2 - dstBox->x1;