diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-16 19:32:17 -0400 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-21 06:19:45 -0400 |
commit | a6c45cf013a57e32ddae43dd4ac911eb4a3919fd (patch) | |
tree | 21ce3ea9dcbeb815c92eb0a17377e5061b33151c /drivers/gpu/drm/i915/intel_fb.c | |
parent | 219adae138513bae20b256f1946b9cb3b75ca05c (diff) |
drm/i915: INTEL_INFO->gen supercedes i8xx, i9xx, i965g
Avoid confusion between i965g meaning broadwater and the gen4+ chipset
families.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_fb.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_fb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c index 8a23bf772c95..7af4accafb7f 100644 --- a/drivers/gpu/drm/i915/intel_fb.c +++ b/drivers/gpu/drm/i915/intel_fb.c | |||
@@ -68,7 +68,7 @@ static int intelfb_create(struct intel_fbdev *ifbdev, | |||
68 | struct drm_gem_object *fbo = NULL; | 68 | struct drm_gem_object *fbo = NULL; |
69 | struct drm_i915_gem_object *obj_priv; | 69 | struct drm_i915_gem_object *obj_priv; |
70 | struct device *device = &dev->pdev->dev; | 70 | struct device *device = &dev->pdev->dev; |
71 | int size, ret, mmio_bar = IS_I9XX(dev) ? 0 : 1; | 71 | int size, ret, mmio_bar = IS_GEN2(dev) ? 1 : 0; |
72 | 72 | ||
73 | /* we don't do packed 24bpp */ | 73 | /* we don't do packed 24bpp */ |
74 | if (sizes->surface_bpp == 24) | 74 | if (sizes->surface_bpp == 24) |
@@ -129,7 +129,7 @@ static int intelfb_create(struct intel_fbdev *ifbdev, | |||
129 | goto out_unpin; | 129 | goto out_unpin; |
130 | } | 130 | } |
131 | info->apertures->ranges[0].base = dev->mode_config.fb_base; | 131 | info->apertures->ranges[0].base = dev->mode_config.fb_base; |
132 | if (IS_I9XX(dev)) | 132 | if (!IS_GEN2(dev)) |
133 | info->apertures->ranges[0].size = pci_resource_len(dev->pdev, 2); | 133 | info->apertures->ranges[0].size = pci_resource_len(dev->pdev, 2); |
134 | else | 134 | else |
135 | info->apertures->ranges[0].size = pci_resource_len(dev->pdev, 0); | 135 | info->apertures->ranges[0].size = pci_resource_len(dev->pdev, 0); |