lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

intel-gtt: drop unnecessary conditions in intel_gtt_stolen_entries

Browse Source 
The dedection function in drm/i915/i915_dma.c works without it, so
drop it here, too. All the values are disdinct, anyway.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Daniel Vetter
2010-08-27 16:25:54 +02:00
committed by Chris Wilson
parent d8d9abcd35
commit 77ad498eca
1 changed files with 8 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/char/agp/intel-gtt.c
View File

@@ -704,54 +704,28 @@ static unsigned int intel_gtt_stolen_entries(void)
stolen_size = MB(32); stolen_size = MB(32);
break; break;
case I915_GMCH_GMS_STOLEN_48M: case I915_GMCH_GMS_STOLEN_48M:
/* Check it's really I915G */ stolen_size = MB(48);
if (IS_I915 || IS_I965 || IS_G33 || IS_G4X)
stolen_size = MB(48);
else
stolen_size = 0;
break; break;
case I915_GMCH_GMS_STOLEN_64M: case I915_GMCH_GMS_STOLEN_64M:
/* Check it's really I915G */ stolen_size = MB(64);
if (IS_I915 || IS_I965 || IS_G33 || IS_G4X)
stolen_size = MB(64);
else
stolen_size = 0;
break; break;
case G33_GMCH_GMS_STOLEN_128M: case G33_GMCH_GMS_STOLEN_128M:
if (IS_G33 || IS_I965 || IS_G4X) stolen_size = MB(128);
stolen_size = MB(128);
else
stolen_size = 0;
break; break;
case G33_GMCH_GMS_STOLEN_256M: case G33_GMCH_GMS_STOLEN_256M:
if (IS_G33 || IS_I965 || IS_G4X) stolen_size = MB(256);
stolen_size = MB(256);
else
stolen_size = 0;
break; break;
case INTEL_GMCH_GMS_STOLEN_96M: case INTEL_GMCH_GMS_STOLEN_96M:
if (IS_I965 || IS_G4X) stolen_size = MB(96);
stolen_size = MB(96);
else
stolen_size = 0;
break; break;
case INTEL_GMCH_GMS_STOLEN_160M: case INTEL_GMCH_GMS_STOLEN_160M:
if (IS_I965 || IS_G4X) stolen_size = MB(160);
stolen_size = MB(160);
else
stolen_size = 0;
break; break;
case INTEL_GMCH_GMS_STOLEN_224M: case INTEL_GMCH_GMS_STOLEN_224M:
if (IS_I965 || IS_G4X) stolen_size = MB(224);
stolen_size = MB(224);
else
stolen_size = 0;
break; break;
case INTEL_GMCH_GMS_STOLEN_352M: case INTEL_GMCH_GMS_STOLEN_352M:
if (IS_I965 || IS_G4X) stolen_size = MB(352);
stolen_size = MB(352);
else
stolen_size = 0;
break; break;
default: default:
stolen_size = 0; stolen_size = 0;