From 728e3d4398ce6e83ffbd4ad3e000c94b9178cdbf Mon Sep 17 00:00:00 2001
From: Con Kolivas <kernel@kolivas.org>
Date: Thu, 16 Feb 2012 00:43:05 +1100
Subject: [PATCH] Revert "Automatically choose phatk kernel for bitalign
 non-gcn ATI cards, and then only select poclbm if SDK2.6 is detected."

This reverts commit e7fdadfc8fc388f68772d5a4c2740da60287c889.

Broke kernel loading.
---
 ocl.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ocl.c b/ocl.c
index 385d5f27..42b4e1eb 100644
--- a/ocl.c
+++ b/ocl.c
@@ -357,7 +357,11 @@ _clState *initCl(unsigned int gpu, char *name, size_t nameSize)
 
 	if (chosen_kernel == KL_NONE) {
 		if (strstr(name, "Tahiti") // GCN
-		    || !clState->hasBitAlign) // Older Radeon & Nvidia
+		    || !clState->hasBitAlign // Older Radeon & Nvidia
+		    || strstr(vbuff, "844.4") // Linux 64 bit ATI 2.6 SDK
+		    || strstr(vbuff, "851.4") // Windows 64 bit ""
+		    || strstr(vbuff, "831.4") // Windows & Linux 32 bit ""
+		)
 			clState->chosen_kernel = KL_POCLBM;
 		else
 			clState->chosen_kernel = KL_PHATK;