Merge branch 'drm-radeon-lockup' into drm-core-next

[~andy/linux] / drivers / gpu / drm / radeon / evergreen.c

diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
index e8f447e20507313ed0367748b8fa585fdeec2bbf..bd1bb9fb2b2a01b950cc08353e433dbda2459444 100644 (file)
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
@@ -487,7 +487,13 @@ int evergreen_mc_init(struct radeon_device *rdev)
        return 0;
 }
 
-int evergreen_gpu_reset(struct radeon_device *rdev)
+bool evergreen_gpu_is_lockup(struct radeon_device *rdev)
+{
+       /* FIXME: implement for evergreen */
+       return false;
+}
+
+int evergreen_asic_reset(struct radeon_device *rdev)
 {
        /* FIXME: implement for evergreen */
        return 0;