Skip to content

Commit

Permalink
Revert "drm/amd: cleanup: drm_modeset_lock_all() --> DRM_MODESET_LOCK…
Browse files Browse the repository at this point in the history 
…_ALL_BEGIN()"

This reverts commit 299f040.

This patchset breaks on intel platforms and was previously NACK'd by
Ville.

Cc: Ville Syrjälä <[email protected]>
Cc: Fernando Ramos <[email protected]>
Acked-by: Ville Syrjälä <[email protected]>
Signed-off-by: Sean Paul <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
  • Loading branch information
@atseanpaul
atseanpaul committed Oct 4, 2021
1 parent 294a0d9 commit 6f67e6f
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 53 deletions.
21 changes: 7 additions & 14 deletions drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
#include <drm/drm_fb_helper.h>
#include <drm/drm_fourcc.h>
#include <drm/drm_vblank.h>
#include <drm/drm_drv.h>

static void amdgpu_display_flip_callback(struct dma_fence *f,
struct dma_fence_cb *cb)
Expand Down Expand Up @@ -1544,21 +1543,16 @@ int amdgpu_display_suspend_helper(struct amdgpu_device *adev)
struct drm_crtc *crtc;
struct drm_connector *connector;
struct drm_connector_list_iter iter;
struct drm_modeset_acquire_ctx ctx;
int r, ret;
int r;

/* turn off display hw */
DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);
drm_modeset_lock_all(dev);
drm_connector_list_iter_begin(dev, &iter);
drm_for_each_connector_iter(connector, &iter)
drm_helper_connector_dpms(connector,
DRM_MODE_DPMS_OFF);
drm_connector_list_iter_end(&iter);
DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);

if (ret)
return ret;

drm_modeset_unlock_all(dev);
/* unpin the front buffers and cursors */
list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
Expand Down Expand Up @@ -1596,8 +1590,7 @@ int amdgpu_display_resume_helper(struct amdgpu_device *adev)
struct drm_connector *connector;
struct drm_connector_list_iter iter;
struct drm_crtc *crtc;
struct drm_modeset_acquire_ctx ctx;
int r, ret;
int r;

/* pin cursors */
list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
Expand All @@ -1619,16 +1612,16 @@ int amdgpu_display_resume_helper(struct amdgpu_device *adev)
drm_helper_resume_force_mode(dev);

/* turn on display hw */
DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);
drm_modeset_lock_all(dev);

drm_connector_list_iter_begin(dev, &iter);
drm_for_each_connector_iter(connector, &iter)
drm_helper_connector_dpms(connector,
DRM_MODE_DPMS_ON);
drm_connector_list_iter_end(&iter);

DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);
drm_modeset_unlock_all(dev);

return ret;
return 0;
}

50 changes: 25 additions & 25 deletions drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@
#include <drm/drm_edid.h>
#include <drm/drm_vblank.h>
#include <drm/drm_audio_component.h>
#include <drm/drm_drv.h>

#if defined(CONFIG_DRM_AMD_DC_DCN)
#include "ivsrcid/dcn/irqsrcs_dcn_1_0.h"
Expand Down Expand Up @@ -2622,9 +2621,6 @@ static void handle_hpd_irq(void *param)
#ifdef CONFIG_DRM_AMD_DC_HDCP
struct dm_connector_state *dm_con_state = to_dm_connector_state(connector->state);
#endif
struct drm_modeset_acquire_ctx ctx;
int ret;


if (adev->dm.disable_hpd_irq)
return;
Expand All @@ -2650,25 +2646,28 @@ static void handle_hpd_irq(void *param)
if (aconnector->base.force && new_connection_type == dc_connection_none) {
emulated_link_detect(aconnector->dc_link);


drm_modeset_lock_all(dev);
dm_restore_drm_connector_state(dev, connector);
drm_modeset_unlock_all(dev);

if (aconnector->base.force == DRM_FORCE_UNSPECIFIED)
drm_kms_helper_hotplug_event(dev);

} else if (dc_link_detect(aconnector->dc_link, DETECT_REASON_HPD)) {
if (new_connection_type == dc_connection_none &&
aconnector->dc_link->type == dc_connection_none)
dm_set_dpms_off(aconnector->dc_link);

amdgpu_dm_update_connector_after_detect(aconnector);

} else {
goto out;
}

DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);
dm_restore_drm_connector_state(dev, connector);
DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);

if (aconnector->base.force == DRM_FORCE_UNSPECIFIED)
drm_kms_helper_hotplug_event(dev);
drm_modeset_lock_all(dev);
dm_restore_drm_connector_state(dev, connector);
drm_modeset_unlock_all(dev);

out:
if (aconnector->base.force == DRM_FORCE_UNSPECIFIED)
drm_kms_helper_hotplug_event(dev);
}
mutex_unlock(&aconnector->hpd_lock);

}
Expand Down Expand Up @@ -2757,14 +2756,12 @@ static void handle_hpd_rx_irq(void *param)
struct drm_connector *connector = &aconnector->base;
struct drm_device *dev = connector->dev;
struct dc_link *dc_link = aconnector->dc_link;
struct drm_modeset_acquire_ctx ctx;
bool is_mst_root_connector = aconnector->mst_mgr.mst_state;
bool result = false;
enum dc_connection_type new_connection_type = dc_connection_none;
struct amdgpu_device *adev = drm_to_adev(dev);
union hpd_irq_data hpd_irq_data;
bool lock_flag = 0;
int ret;

memset(&hpd_irq_data, 0, sizeof(hpd_irq_data));

Expand Down Expand Up @@ -2831,24 +2828,27 @@ static void handle_hpd_rx_irq(void *param)

amdgpu_dm_update_connector_after_detect(aconnector);


drm_modeset_lock_all(dev);
dm_restore_drm_connector_state(dev, connector);
drm_modeset_unlock_all(dev);

drm_kms_helper_hotplug_event(dev);
} else if (dc_link_detect(dc_link, DETECT_REASON_HPDRX)) {

if (aconnector->fake_enable)
aconnector->fake_enable = false;

amdgpu_dm_update_connector_after_detect(aconnector);

} else {
goto finish;
}

DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);
dm_restore_drm_connector_state(dev, connector);
DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);
drm_modeset_lock_all(dev);
dm_restore_drm_connector_state(dev, connector);
drm_modeset_unlock_all(dev);

drm_kms_helper_hotplug_event(dev);
drm_kms_helper_hotplug_event(dev);
}
}
finish:
#ifdef CONFIG_DRM_AMD_DC_HDCP
if (hpd_irq_data.bytes.device_service_irq.bits.CP_IRQ) {
if (adev->dm.hdcp_workqueue)
Expand Down
25 changes: 11 additions & 14 deletions drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
*/

#include <linux/uaccess.h>
#include <drm/drm_drv.h>

#include "dc.h"
#include "amdgpu.h"
Expand Down Expand Up @@ -1192,14 +1191,12 @@ static ssize_t trigger_hotplug(struct file *f, const char __user *buf,
struct drm_connector *connector = &aconnector->base;
struct dc_link *link = NULL;
struct drm_device *dev = connector->dev;
struct drm_modeset_acquire_ctx ctx;
enum dc_connection_type new_connection_type = dc_connection_none;
char *wr_buf = NULL;
uint32_t wr_buf_size = 42;
int max_param_num = 1;
long param[1] = {0};
uint8_t param_nums = 0;
int ret;

if (!aconnector || !aconnector->dc_link)
return -EINVAL;
Expand Down Expand Up @@ -1239,6 +1236,12 @@ static ssize_t trigger_hotplug(struct file *f, const char __user *buf,
goto unlock;

amdgpu_dm_update_connector_after_detect(aconnector);

drm_modeset_lock_all(dev);
dm_restore_drm_connector_state(dev, connector);
drm_modeset_unlock_all(dev);

drm_kms_helper_hotplug_event(dev);
} else if (param[0] == 0) {
if (!aconnector->dc_link)
goto unlock;
Expand All @@ -1256,18 +1259,12 @@ static ssize_t trigger_hotplug(struct file *f, const char __user *buf,

amdgpu_dm_update_connector_after_detect(aconnector);

} else {
goto unlock;
}

DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);
dm_restore_drm_connector_state(dev, connector);
DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);

if (ret)
return ret;
drm_modeset_lock_all(dev);
dm_restore_drm_connector_state(dev, connector);
drm_modeset_unlock_all(dev);

drm_kms_helper_hotplug_event(dev);
drm_kms_helper_hotplug_event(dev);
}

unlock:
mutex_unlock(&aconnector->hpd_lock);
Expand Down

0 comments on commit 6f67e6f

Please sign in to comment.