diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2010-08-27 10:25:54 -0400 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-08 16:20:11 -0400 |
| commit | 77ad498ecaeb9a614d2a7bbfaab58a35c0cc577d (patch) | |
| tree | 0e146e942233b703fda4241ee67dd2a6969f73d6 /drivers/char/agp | |
| parent | d8d9abcd35aeebd633cba2e99c384f4e004ccb84 (diff) | |
intel-gtt: drop unnecessary conditions in intel_gtt_stolen_entries
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>
Diffstat (limited to 'drivers/char/agp')
| -rw-r--r-- | drivers/char/agp/intel-gtt.c | 42 |
1 files changed, 8 insertions, 34 deletions
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c index 79eb106c6f08..a620296c0810 100644 --- a/drivers/char/agp/intel-gtt.c +++ b/drivers/char/agp/intel-gtt.c | |||
| @@ -704,54 +704,28 @@ static unsigned int intel_gtt_stolen_entries(void) | |||
| 704 | stolen_size = MB(32); | 704 | stolen_size = MB(32); |
| 705 | break; | 705 | break; |
| 706 | case I915_GMCH_GMS_STOLEN_48M: | 706 | case I915_GMCH_GMS_STOLEN_48M: |
| 707 | /* Check it's really I915G */ | 707 | stolen_size = MB(48); |
| 708 | if (IS_I915 || IS_I965 || IS_G33 || IS_G4X) | ||
| 709 | stolen_size = MB(48); | ||
| 710 | else | ||
| 711 | stolen_size = 0; | ||
| 712 | break; | 708 | break; |
| 713 | case I915_GMCH_GMS_STOLEN_64M: | 709 | case I915_GMCH_GMS_STOLEN_64M: |
| 714 | /* Check it's really I915G */ | 710 | stolen_size = MB(64); |
| 715 | if (IS_I915 || IS_I965 || IS_G33 || IS_G4X) | ||
| 716 | stolen_size = MB(64); | ||
| 717 | else | ||
| 718 | stolen_size = 0; | ||
| 719 | break; | 711 | break; |
| 720 | case G33_GMCH_GMS_STOLEN_128M: | 712 | case G33_GMCH_GMS_STOLEN_128M: |
| 721 | if (IS_G33 || IS_I965 || IS_G4X) | 713 | stolen_size = MB(128); |
| 722 | stolen_size = MB(128); | ||
| 723 | else | ||
| 724 | stolen_size = 0; | ||
| 725 | break; | 714 | break; |
| 726 | case G33_GMCH_GMS_STOLEN_256M: | 715 | case G33_GMCH_GMS_STOLEN_256M: |
| 727 | if (IS_G33 || IS_I965 || IS_G4X) | 716 | stolen_size = MB(256); |
| 728 | stolen_size = MB(256); | ||
| 729 | else | ||
| 730 | stolen_size = 0; | ||
| 731 | break; | 717 | break; |
| 732 | case INTEL_GMCH_GMS_STOLEN_96M: | 718 | case INTEL_GMCH_GMS_STOLEN_96M: |
| 733 | if (IS_I965 || IS_G4X) | 719 | stolen_size = MB(96); |
| 734 | stolen_size = MB(96); | ||
| 735 | else | ||
| 736 | stolen_size = 0; | ||
| 737 | break; | 720 | break; |
| 738 | case INTEL_GMCH_GMS_STOLEN_160M: | 721 | case INTEL_GMCH_GMS_STOLEN_160M: |
| 739 | if (IS_I965 || IS_G4X) | 722 | stolen_size = MB(160); |
| 740 | stolen_size = MB(160); | ||
| 741 | else | ||
| 742 | stolen_size = 0; | ||
| 743 | break; | 723 | break; |
| 744 | case INTEL_GMCH_GMS_STOLEN_224M: | 724 | case INTEL_GMCH_GMS_STOLEN_224M: |
| 745 | if (IS_I965 || IS_G4X) | 725 | stolen_size = MB(224); |
| 746 | stolen_size = MB(224); | ||
| 747 | else | ||
| 748 | stolen_size = 0; | ||
| 749 | break; | 726 | break; |
| 750 | case INTEL_GMCH_GMS_STOLEN_352M: | 727 | case INTEL_GMCH_GMS_STOLEN_352M: |
| 751 | if (IS_I965 || IS_G4X) | 728 | stolen_size = MB(352); |
| 752 | stolen_size = MB(352); | ||
| 753 | else | ||
| 754 | stolen_size = 0; | ||
| 755 | break; | 729 | break; |
| 756 | default: | 730 | default: |
| 757 | stolen_size = 0; | 731 | stolen_size = 0; |