On Thu, 1 Nov 2012 10:24:01 -0700, Ben Widawsky <ben at bwidawsk.net> wrote: > Signed-off-by: Ben Widawsky <ben at bwidawsk.net> > Reviewed-by: Jesse Barnes <jbarnes at virtuousgeek.org> > --- > @@ -1269,22 +1108,8 @@ static int i9xx_setup(void) > pci_read_config_dword(intel_private.pcidev, > I915_PTEADDR, >t_addr); > intel_private.gtt_bus_addr = gtt_addr; > - } else { > - u32 gtt_offset; > - > - switch (INTEL_GTT_GEN) { > - case 5: > - case 6: > - case 7: > - gtt_offset = MB(2); > - break; > - case 4: > - default: > - gtt_offset = KB(512); > - break; > - } > - intel_private.gtt_bus_addr = reg_addr + gtt_offset; > - } > + } else > + intel_private.gtt_bus_addr = reg_addr + KB(512); We still need to handle GEN==5 here which has a MB(2) GTT. -Chris -- Chris Wilson, Intel Open Source Technology Centre