Commit 8d5df204 authored by James Almer's avatar James Almer

Merge commit '8e9cd81d'

* commit '8e9cd81d':
  x86: cpu: Detect Conroe CPUs and their slow shuffle unit
Merged-by: 's avatarJames Almer <jamrial@gmail.com>
parents 2eab4817 8e9cd81d
......@@ -221,6 +221,12 @@ int ff_get_cpu_flags_x86(void)
* functions on the Atom. */
if (family == 6 && model == 28)
rval |= AV_CPU_FLAG_ATOM;
/* Conroe has a slow shuffle unit. Check the model number to ensure not
* to include crippled low-end Penryns and Nehalems that lack SSE4. */
if ((rval & AV_CPU_FLAG_SSSE3) && !(rval & AV_CPU_FLAG_SSE4) &&
family == 6 && model < 23)
rval |= AV_CPU_FLAG_SSSE3SLOW;
}
#endif /* cpuid */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment