Commit 7abbb35b authored by Dave Airlie's avatar Dave Airlie

Merge branch 'drm-fixes-5.0' of git://people.freedesktop.org/~agd5f/linux into drm-fixes

amdgpu:
- Vega20 psp fix
- Add vrr range to debugfs for freesync debugging

sched:
- Scheduler race fix
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190213202958.3336-1-alexander.deucher@amd.com
parents 5016bd24 1d69511e
...@@ -90,8 +90,10 @@ static int psp_sw_fini(void *handle) ...@@ -90,8 +90,10 @@ static int psp_sw_fini(void *handle)
adev->psp.sos_fw = NULL; adev->psp.sos_fw = NULL;
release_firmware(adev->psp.asd_fw); release_firmware(adev->psp.asd_fw);
adev->psp.asd_fw = NULL; adev->psp.asd_fw = NULL;
release_firmware(adev->psp.ta_fw); if (adev->psp.ta_fw) {
adev->psp.ta_fw = NULL; release_firmware(adev->psp.ta_fw);
adev->psp.ta_fw = NULL;
}
return 0; return 0;
} }
...@@ -435,6 +437,9 @@ static int psp_xgmi_initialize(struct psp_context *psp) ...@@ -435,6 +437,9 @@ static int psp_xgmi_initialize(struct psp_context *psp)
struct ta_xgmi_shared_memory *xgmi_cmd; struct ta_xgmi_shared_memory *xgmi_cmd;
int ret; int ret;
if (!psp->adev->psp.ta_fw)
return -ENOENT;
if (!psp->xgmi_context.initialized) { if (!psp->xgmi_context.initialized) {
ret = psp_xgmi_init_shared_buf(psp); ret = psp_xgmi_init_shared_buf(psp);
if (ret) if (ret)
......
...@@ -152,18 +152,22 @@ static int psp_v11_0_init_microcode(struct psp_context *psp) ...@@ -152,18 +152,22 @@ static int psp_v11_0_init_microcode(struct psp_context *psp)
snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_ta.bin", chip_name); snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_ta.bin", chip_name);
err = request_firmware(&adev->psp.ta_fw, fw_name, adev->dev); err = request_firmware(&adev->psp.ta_fw, fw_name, adev->dev);
if (err) if (err) {
goto out2; release_firmware(adev->psp.ta_fw);
adev->psp.ta_fw = NULL;
err = amdgpu_ucode_validate(adev->psp.ta_fw); dev_info(adev->dev,
if (err) "psp v11.0: Failed to load firmware \"%s\"\n", fw_name);
goto out2; } else {
err = amdgpu_ucode_validate(adev->psp.ta_fw);
ta_hdr = (const struct ta_firmware_header_v1_0 *)adev->psp.ta_fw->data; if (err)
adev->psp.ta_xgmi_ucode_version = le32_to_cpu(ta_hdr->ta_xgmi_ucode_version); goto out2;
adev->psp.ta_xgmi_ucode_size = le32_to_cpu(ta_hdr->ta_xgmi_size_bytes);
adev->psp.ta_xgmi_start_addr = (uint8_t *)ta_hdr + ta_hdr = (const struct ta_firmware_header_v1_0 *)adev->psp.ta_fw->data;
le32_to_cpu(ta_hdr->header.ucode_array_offset_bytes); adev->psp.ta_xgmi_ucode_version = le32_to_cpu(ta_hdr->ta_xgmi_ucode_version);
adev->psp.ta_xgmi_ucode_size = le32_to_cpu(ta_hdr->ta_xgmi_size_bytes);
adev->psp.ta_xgmi_start_addr = (uint8_t *)ta_hdr +
le32_to_cpu(ta_hdr->header.ucode_array_offset_bytes);
}
return 0; return 0;
......
...@@ -671,6 +671,25 @@ static ssize_t dp_phy_test_pattern_debugfs_write(struct file *f, const char __us ...@@ -671,6 +671,25 @@ static ssize_t dp_phy_test_pattern_debugfs_write(struct file *f, const char __us
return bytes_from_user; return bytes_from_user;
} }
/*
* Returns the min and max vrr vfreq through the connector's debugfs file.
* Example usage: cat /sys/kernel/debug/dri/0/DP-1/vrr_range
*/
static int vrr_range_show(struct seq_file *m, void *data)
{
struct drm_connector *connector = m->private;
struct amdgpu_dm_connector *aconnector = to_amdgpu_dm_connector(connector);
if (connector->status != connector_status_connected)
return -ENODEV;
seq_printf(m, "Min: %u\n", (unsigned int)aconnector->min_vfreq);
seq_printf(m, "Max: %u\n", (unsigned int)aconnector->max_vfreq);
return 0;
}
DEFINE_SHOW_ATTRIBUTE(vrr_range);
static const struct file_operations dp_link_settings_debugfs_fops = { static const struct file_operations dp_link_settings_debugfs_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.read = dp_link_settings_read, .read = dp_link_settings_read,
...@@ -697,7 +716,8 @@ static const struct { ...@@ -697,7 +716,8 @@ static const struct {
} dp_debugfs_entries[] = { } dp_debugfs_entries[] = {
{"link_settings", &dp_link_settings_debugfs_fops}, {"link_settings", &dp_link_settings_debugfs_fops},
{"phy_settings", &dp_phy_settings_debugfs_fop}, {"phy_settings", &dp_phy_settings_debugfs_fop},
{"test_pattern", &dp_phy_test_pattern_fops} {"test_pattern", &dp_phy_test_pattern_fops},
{"vrr_range", &vrr_range_fops}
}; };
int connector_debugfs_init(struct amdgpu_dm_connector *connector) int connector_debugfs_init(struct amdgpu_dm_connector *connector)
......
...@@ -440,13 +440,10 @@ struct drm_sched_job *drm_sched_entity_pop_job(struct drm_sched_entity *entity) ...@@ -440,13 +440,10 @@ struct drm_sched_job *drm_sched_entity_pop_job(struct drm_sched_entity *entity)
while ((entity->dependency = while ((entity->dependency =
sched->ops->dependency(sched_job, entity))) { sched->ops->dependency(sched_job, entity))) {
trace_drm_sched_job_wait_dep(sched_job, entity->dependency);
if (drm_sched_entity_add_dependency_cb(entity)) { if (drm_sched_entity_add_dependency_cb(entity))
trace_drm_sched_job_wait_dep(sched_job,
entity->dependency);
return NULL; return NULL;
}
} }
/* skip jobs from entity that marked guilty */ /* skip jobs from entity that marked guilty */
......
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