evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drm/i915: Simplify intel_gpu_reset

Browse source 
Replaced ever growing switch for gen version with chained conditionals.
Futre gen's only need to add a new one if they require something different.

Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Robert Beckett <robert.beckett@intel.com>
[danvet: Picked from internal tree and white-wash commit message.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Robert Beckett 2014-06-03 10:08:26 +02:00 • committed by Daniel Vetter
parent d5ec26394c
commit 542c184f0e
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/gpu/drm/i915/intel_uncore.c
View file

@ -1154,18 +1154,16 @@ static int gen6_do_reset(struct drm_device *dev)
int intel_gpu_reset(struct drm_device *dev) int intel_gpu_reset(struct drm_device *dev)
{ {
switch (INTEL_INFO(dev)->gen) { if (INTEL_INFO(dev)->gen >= 6)
case 8: return gen6_do_reset(dev);
case 7: else if (IS_GEN5(dev))
case 6: return gen6_do_reset(dev); return ironlake_do_reset(dev);
case 5: return ironlake_do_reset(dev); else if (IS_G4X(dev))
case 4: return g4x_do_reset(dev);
if (IS_G4X(dev)) else if (IS_GEN4(dev))
return g4x_do_reset(dev); return i965_do_reset(dev);
else else
return i965_do_reset(dev); return -ENODEV;
default: return -ENODEV;
}
} }
void intel_uncore_check_errors(struct drm_device *dev) void intel_uncore_check_errors(struct drm_device *dev)