radeonsi: add support for Mullins asics.
v2: name defaults to kabini for older llvm v3: fix llvm version check Signed-off-by: Samuel Li <samuel.li@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Leo Liu <leo.liu@amd.com> Reviewed-by: Marek Olšák <marek.olsak@amd.com> Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
This commit is contained in:
parent
b26175b6c3
commit
aad669b1e9
|
@ -293,6 +293,7 @@ static const char* r600_get_name(struct pipe_screen* pscreen)
|
||||||
case CHIP_KAVERI: return "AMD KAVERI";
|
case CHIP_KAVERI: return "AMD KAVERI";
|
||||||
case CHIP_KABINI: return "AMD KABINI";
|
case CHIP_KABINI: return "AMD KABINI";
|
||||||
case CHIP_HAWAII: return "AMD HAWAII";
|
case CHIP_HAWAII: return "AMD HAWAII";
|
||||||
|
case CHIP_MULLINS: return "AMD MULLINS";
|
||||||
default: return "AMD unknown";
|
default: return "AMD unknown";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -410,6 +411,12 @@ const char *r600_get_llvm_processor_name(enum radeon_family family)
|
||||||
case CHIP_KABINI: return "kabini";
|
case CHIP_KABINI: return "kabini";
|
||||||
case CHIP_KAVERI: return "kaveri";
|
case CHIP_KAVERI: return "kaveri";
|
||||||
case CHIP_HAWAII: return "hawaii";
|
case CHIP_HAWAII: return "hawaii";
|
||||||
|
case CHIP_MULLINS:
|
||||||
|
#if HAVE_LLVM >= 0x0305
|
||||||
|
return "mullins";
|
||||||
|
#else
|
||||||
|
return "kabini";
|
||||||
|
#endif
|
||||||
default: return "";
|
default: return "";
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -3101,6 +3101,8 @@ void si_init_config(struct si_context *sctx)
|
||||||
/* XXX todo */
|
/* XXX todo */
|
||||||
case CHIP_KABINI:
|
case CHIP_KABINI:
|
||||||
/* XXX todo */
|
/* XXX todo */
|
||||||
|
case CHIP_MULLINS:
|
||||||
|
/* XXX todo */
|
||||||
default:
|
default:
|
||||||
si_pm4_set_reg(pm4, R_028350_PA_SC_RASTER_CONFIG, 0x00000000);
|
si_pm4_set_reg(pm4, R_028350_PA_SC_RASTER_CONFIG, 0x00000000);
|
||||||
si_pm4_set_reg(pm4, R_028354_PA_SC_RASTER_CONFIG_1, 0x00000000);
|
si_pm4_set_reg(pm4, R_028354_PA_SC_RASTER_CONFIG_1, 0x00000000);
|
||||||
|
|
|
@ -276,6 +276,7 @@ static boolean do_winsys_init(struct radeon_drm_winsys *ws)
|
||||||
case CHIP_KAVERI:
|
case CHIP_KAVERI:
|
||||||
case CHIP_KABINI:
|
case CHIP_KABINI:
|
||||||
case CHIP_HAWAII:
|
case CHIP_HAWAII:
|
||||||
|
case CHIP_MULLINS:
|
||||||
ws->info.chip_class = CIK;
|
ws->info.chip_class = CIK;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -130,6 +130,7 @@ enum radeon_family {
|
||||||
CHIP_KAVERI,
|
CHIP_KAVERI,
|
||||||
CHIP_KABINI,
|
CHIP_KABINI,
|
||||||
CHIP_HAWAII,
|
CHIP_HAWAII,
|
||||||
|
CHIP_MULLINS,
|
||||||
CHIP_LAST,
|
CHIP_LAST,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue