diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-06-20 15:01:16 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-06-25 13:18:01 +0100 |
| commit | 5c663ce8442bd3b69c96e29061c57cc565fca91d (patch) | |
| tree | 56f02802179a75e8d94a83c47ebeff9e48bb1168 /src/i965_video.c | |
| parent | 797d173a9af12055ba2609293182b616dd673ef4 (diff) | |
Rename common infrastructure to the intel namespace.
After splitting out the i810 driver into its own legacy directory, we
can identify the common routines not as i830 but as intel. This
clarifies the code which *is* i830 specific.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/i965_video.c')
| -rw-r--r-- | src/i965_video.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/i965_video.c b/src/i965_video.c index 9ec94dde..c0cbd4b8 100644 --- a/src/i965_video.c +++ b/src/i965_video.c @@ -35,10 +35,10 @@ #include "xf86xv.h" #include "fourcc.h" -#include "i830.h" +#include "intel.h" +#include "intel_hwmc.h" +#include "intel_video.h" #include "i830_reg.h" -#include "i830_video.h" -#include "i830_hwmc.h" #include "i965_reg.h" #include "brw_defines.h" #include "brw_structs.h" @@ -365,7 +365,7 @@ static drm_intel_bo *i965_create_dst_surface_state(ScrnInfoPtr scrn, { intel_screen_private *intel = intel_get_screen_private(scrn); struct brw_surface_state *dest_surf_state; - drm_intel_bo *pixmap_bo = i830_get_pixmap_bo(pixmap); + drm_intel_bo *pixmap_bo = intel_get_pixmap_bo(pixmap); drm_intel_bo *surf_bo; if (intel_alloc_and_map(intel, "textured video surface state", 4096, @@ -400,8 +400,8 @@ static drm_intel_bo *i965_create_dst_surface_state(ScrnInfoPtr scrn, dest_surf_state->ss2.width = scrn->virtualX - 1; dest_surf_state->ss2.mip_count = 0; dest_surf_state->ss2.render_target_rotation = 0; - dest_surf_state->ss3.pitch = intel_get_pixmap_pitch(pixmap) - 1; - dest_surf_state->ss3.tiled_surface = i830_pixmap_tiled(pixmap); + dest_surf_state->ss3.pitch = intel_pixmap_pitch(pixmap) - 1; + dest_surf_state->ss3.tiled_surface = intel_pixmap_tiled(pixmap); dest_surf_state->ss3.tile_walk = 0; /* TileX */ drm_intel_bo_unmap(surf_bo); @@ -1240,11 +1240,7 @@ I965DisplayVideoTextured(ScrnInfoPtr scrn, /* release reference once we're finished */ drm_intel_bo_unreference(bind_bo); -#if WATCH_STATS - /* i830_dump_error_state(scrn); */ -#endif - - i830_debug_flush(scrn); + intel_debug_flush(scrn); } void i965_free_video(ScrnInfoPtr scrn) |