Merge tag 'vfs-6.11-rc1.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs

[J-linux.git] / drivers / gpu / drm / amd / display / amdgpu_dm / amdgpu_dm_helpers.c

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
index 2648d2b5be3ebd25079f7b782dec151d1b7fe780..b490ae67b6beb16a38428dfa0139cb47621f08ca 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
@@ -575,10 +575,8 @@ bool dm_helpers_dp_write_dpcd(
 {
        struct amdgpu_dm_connector *aconnector = link->priv;
 
-       if (!aconnector) {
-               DRM_ERROR("Failed to find connector for link!");
+       if (!aconnector)
                return false;
-       }
 
        return drm_dp_dpcd_write(&aconnector->dm_dp_aux.aux,
                        address, (uint8_t *)data, size) > 0;
@@ -807,9 +805,6 @@ bool dm_helpers_dp_write_dsc_enable(
        uint8_t enable_passthrough = enable ? DSC_PASSTHROUGH : DSC_DISABLE;
        uint8_t ret = 0;
 
-       if (!stream)
-               return false;
-
        if (stream->signal == SIGNAL_TYPE_DISPLAY_PORT_MST) {
                if (!aconnector->dsc_aux)
                        return false;
@@ -1242,8 +1237,11 @@ void dm_helpers_enable_periodic_detection(struct dc_context *ctx, bool enable)
 {
        struct amdgpu_device *adev = ctx->driver_context;
 
-       if (adev->dm.idle_workqueue)
+       if (adev->dm.idle_workqueue) {
                adev->dm.idle_workqueue->enable = enable;
+               if (enable && !adev->dm.idle_workqueue->running && amdgpu_dm_is_headless(adev))
+                       schedule_work(&adev->dm.idle_workqueue->work);
+       }
 }
 
 void dm_helpers_dp_mst_update_branch_bandwidth(