diff --git a/src/gallium/drivers/r600/sfn/sfn_nir.cpp b/src/gallium/drivers/r600/sfn/sfn_nir.cpp
index 1daa9024b7d..9d8af3bafea 100644
--- a/src/gallium/drivers/r600/sfn/sfn_nir.cpp
+++ b/src/gallium/drivers/r600/sfn/sfn_nir.cpp
@@ -667,7 +667,7 @@ int r600_shader_from_nir(struct r600_context *rctx,
    idiv_options.allow_fp16 = true;
 
    NIR_PASS_V(sel->nir, nir_lower_idiv, &idiv_options);
-   NIR_PASS_V(sel->nir, r600_nir_lower_trigen);
+   NIR_PASS_V(sel->nir, r600_nir_lower_trigen, rctx->b.gfx_level);
    NIR_PASS_V(sel->nir, nir_lower_phis_to_scalar, false);
    NIR_PASS_V(sel->nir, nir_lower_undef_to_zero);
 
diff --git a/src/gallium/drivers/r600/sfn/sfn_nir_lower_alu.cpp b/src/gallium/drivers/r600/sfn/sfn_nir_lower_alu.cpp
index 8ff2eba6ef3..93f0aea823c 100644
--- a/src/gallium/drivers/r600/sfn/sfn_nir_lower_alu.cpp
+++ b/src/gallium/drivers/r600/sfn/sfn_nir_lower_alu.cpp
@@ -72,9 +72,12 @@ nir_ssa_def *Lower2x16::lower(nir_instr *instr)
 }
 
 class LowerSinCos : public NirLowerInstruction {
+public:
+   LowerSinCos(amd_gfx_level gxf_level): m_gxf_level(gxf_level){}
 private:
    bool filter(const nir_instr *instr) const override;
    nir_ssa_def *lower(nir_instr *instr) override;
+   amd_gfx_level m_gxf_level;
 };
 
 bool LowerSinCos::filter(const nir_instr *instr) const
@@ -99,14 +102,17 @@ nir_ssa_def *LowerSinCos::lower(nir_instr *instr)
    assert(alu->op == nir_op_fsin ||
           alu->op == nir_op_fcos);
 
+   auto fract = nir_ffract(b,
+                           nir_ffma(b,
+                                    nir_ssa_for_alu_src(b, alu, 0),
+                                    nir_imm_float(b, 0.15915494),
+                                    nir_imm_float(b, 0.5)));
+
    auto normalized =
-         nir_fadd(b,
-                  nir_ffract(b,
-                             nir_ffma(b,
-                                      nir_ssa_for_alu_src(b, alu, 0),
-                                      nir_imm_float(b, 0.15915494),
-                                      nir_imm_float(b, 0.5))),
-                              nir_imm_float(b, -0.5));
+         m_gxf_level != R600 ?
+                           nir_fadd(b, fract, nir_imm_float(b, -0.5)) :
+                           nir_ffma(b, fract, nir_imm_float(b, 2.0f * M_PI),
+                                    nir_imm_float(b, -M_PI));
 
    if (alu->op == nir_op_fsin)
       return nir_fsin_amd(b, normalized);
@@ -123,7 +129,7 @@ bool r600_nir_lower_pack_unpack_2x16(nir_shader *shader)
    return r600::Lower2x16().run(shader);
 }
 
-bool r600_nir_lower_trigen(nir_shader *shader)
+bool r600_nir_lower_trigen(nir_shader *shader, amd_gfx_level gfx_level)
 {
-   return r600::LowerSinCos().run(shader);
+   return r600::LowerSinCos(gfx_level).run(shader);
 }
diff --git a/src/gallium/drivers/r600/sfn/sfn_nir_lower_alu.h b/src/gallium/drivers/r600/sfn/sfn_nir_lower_alu.h
index ffef7b9ab47..01e9f0c0493 100644
--- a/src/gallium/drivers/r600/sfn/sfn_nir_lower_alu.h
+++ b/src/gallium/drivers/r600/sfn/sfn_nir_lower_alu.h
@@ -29,9 +29,11 @@
 
 #include "nir.h"
 
+#include "amd_family.h"
+
 bool r600_nir_lower_pack_unpack_2x16(nir_shader *shader);
 
-bool r600_nir_lower_trigen(nir_shader *shader);
+bool r600_nir_lower_trigen(nir_shader *shader, enum amd_gfx_level gfx_level);
 
 
 #endif // SFN_NIR_LOWER_ALU_H