Merge branch 'drm-next-5.2' of git://people.freedesktop.org/~agd5f/linux into drm-next
- Add the amdgpu specific bits for timeline support - Add internal interfaces for xgmi pstate support - DC Z ordering fixes for planes - Add support for NV12 planes in DC - Add colorspace properties for planes in DC - eDP optimizations if the GOP driver already initialized eDP - DC bandwidth validation tracing support Signed-off-by: Dave Airlie <airlied@redhat.com> From: Alex Deucher <alexdeucher@gmail.com> Link: https://patchwork.freedesktop.org/patch/msgid/20190419150034.3473-1-alexander.deucher@amd.com
This commit is contained in:
@@ -540,6 +540,8 @@ struct smu_funcs
|
||||
int (*get_fan_speed_percent)(struct smu_context *smu, uint32_t *speed);
|
||||
int (*set_fan_speed_percent)(struct smu_context *smu, uint32_t speed);
|
||||
int (*set_fan_speed_rpm)(struct smu_context *smu, uint32_t speed);
|
||||
int (*set_xgmi_pstate)(struct smu_context *smu, uint32_t pstate);
|
||||
|
||||
};
|
||||
|
||||
#define smu_init_microcode(smu) \
|
||||
@@ -723,6 +725,8 @@ struct smu_funcs
|
||||
((smu)->funcs->get_sclk ? (smu)->funcs->get_sclk((smu), (low)) : 0)
|
||||
#define smu_get_mclk(smu, low) \
|
||||
((smu)->funcs->get_mclk ? (smu)->funcs->get_mclk((smu), (low)) : 0)
|
||||
#define smu_set_xgmi_pstate(smu, pstate) \
|
||||
((smu)->funcs->set_xgmi_pstate ? (smu)->funcs->set_xgmi_pstate((smu), (pstate)) : 0)
|
||||
|
||||
|
||||
extern int smu_get_atom_data_table(struct smu_context *smu, uint32_t table,
|
||||
|
@@ -1893,6 +1893,13 @@ set_fan_speed_rpm_failed:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int smu_v11_0_set_xgmi_pstate(struct smu_context *smu,
|
||||
uint32_t pstate)
|
||||
{
|
||||
/* send msg to SMU to set pstate */
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct smu_funcs smu_v11_0_funcs = {
|
||||
.init_microcode = smu_v11_0_init_microcode,
|
||||
.load_microcode = smu_v11_0_load_microcode,
|
||||
@@ -1947,6 +1954,7 @@ static const struct smu_funcs smu_v11_0_funcs = {
|
||||
.get_fan_speed_percent = smu_v11_0_get_fan_speed_percent,
|
||||
.set_fan_speed_percent = smu_v11_0_set_fan_speed_percent,
|
||||
.set_fan_speed_rpm = smu_v11_0_set_fan_speed_rpm,
|
||||
.set_xgmi_pstate = smu_v11_0_set_xgmi_pstate,
|
||||
};
|
||||
|
||||
void smu_v11_0_set_smu_funcs(struct smu_context *smu)
|
||||
@@ -1954,7 +1962,6 @@ void smu_v11_0_set_smu_funcs(struct smu_context *smu)
|
||||
struct amdgpu_device *adev = smu->adev;
|
||||
|
||||
smu->funcs = &smu_v11_0_funcs;
|
||||
|
||||
switch (adev->asic_type) {
|
||||
case CHIP_VEGA20:
|
||||
vega20_set_ppt_funcs(smu);
|
||||
|
Reference in New Issue
Block a user