diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-10-07 12:45:02 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-10-07 13:26:07 +0100 |
| commit | 4083197a44d1a1a05d33654b3c7d6e96d7472fe7 (patch) | |
| tree | ec2e0390c5330bc07576b32e26ccd96d19727977 /src/intel_driver.c | |
| parent | 1444ea35706992a1f094fe029e6a7d9eec0f93c6 (diff) | |
Include a chipset generation number to clarify device specific paths.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/intel_driver.c')
| -rw-r--r-- | src/intel_driver.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/src/intel_driver.c b/src/intel_driver.c index 50540dde..b16913b4 100644 --- a/src/intel_driver.c +++ b/src/intel_driver.c @@ -668,12 +668,10 @@ void IntelEmitInvarientState(ScrnInfoPtr scrn) if (intel->last_3d != LAST_3D_OTHER) return; - if (!IS_I965G(intel)) { - if (IS_I9XX(intel)) - I915EmitInvarientState(scrn); - else - I830EmitInvarientState(scrn); - } + if (IS_GEN2(intel)) + I830EmitInvarientState(scrn); + else if IS_GEN3(intel) + I915EmitInvarientState(scrn); } static void @@ -816,7 +814,7 @@ I830ScreenInit(int scrnIndex, ScreenPtr screen, int argc, char **argv) MessageType from; #endif struct pci_device *const device = intel->PciInfo; - int fb_bar = IS_I9XX(intel) ? 2 : 0; + int fb_bar = IS_GEN2(intel) ? 0 : 2; /* * The "VideoRam" config file parameter specifies the maximum amount of @@ -872,7 +870,7 @@ I830ScreenInit(int scrnIndex, ScreenPtr screen, int argc, char **argv) intel_batch_init(scrn); - if (IS_I965G(intel)) + if (INTEL_INFO(intel)->gen >= 40) gen4_render_state_init(scrn); miClearVisualTypes(); @@ -972,7 +970,7 @@ I830ScreenInit(int scrnIndex, ScreenPtr screen, int argc, char **argv) xf86DPMSInit(screen, xf86DPMSSet, 0); #ifdef INTEL_XVMC - if (IS_I965G(intel)) + if (INTEL_INFO(intel)->gen >= 40) intel->XvMCEnabled = TRUE; from = ((intel->directRenderingType == DRI_DRI2) && xf86GetOptValBool(intel->Options, OPTION_XVMC, @@ -1115,10 +1113,7 @@ static Bool I830CloseScreen(int scrnIndex, ScreenPtr screen) } if (intel->shadow_buffer) { - if (IS_I8XX(intel)) - drm_intel_bo_unreference(intel->shadow_buffer); - else - free(intel->shadow_buffer); + free(intel->shadow_buffer); intel->shadow_buffer = NULL; } @@ -1131,7 +1126,7 @@ static Bool I830CloseScreen(int scrnIndex, ScreenPtr screen) intel_batch_teardown(scrn); - if (IS_I965G(intel)) + if (INTEL_INFO(intel)->gen >= 40) gen4_render_state_cleanup(scrn); xf86_cursors_fini(screen); |