Skip to content

Commit

Permalink
Revert "drm/dp: fix DPCD arbitration with CEC"
Browse files Browse the repository at this point in the history
This reverts commit 6ad23342bf035aaf190fba9edff95d7b9c05de84.

Change-Id: 582f65c82a191ae0510148cddca4159df58126a1
Signed-off-by: TogoFire <togofire@mailfence.com>
  • Loading branch information
bananafunction authored and TogoFire committed Apr 21, 2023
1 parent 8402968 commit aa1e573
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
3 changes: 1 addition & 2 deletions drivers/gpu/drm/msm/dp/dp_display.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
Expand Down Expand Up @@ -797,7 +796,7 @@ static int dp_display_usbpd_attention_cb(struct device *dev)
return -ENODEV;
}

if (dp->usbpd->hpd_irq && dp->usbpd->hpd_high && !dp->power_on)
if (dp->usbpd->hpd_high && dp->usbpd->hpd_irq)
drm_dp_cec_irq(dp->aux->drm_aux);

if (dp->usbpd->hpd_irq && dp->usbpd->hpd_high &&
Expand Down
3 changes: 0 additions & 3 deletions drivers/gpu/drm/msm/dp/dp_link.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2012-2018,2020-2021, The Linux Foundation. All rights reserved.
* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
Expand Down Expand Up @@ -793,8 +792,6 @@ static int dp_link_parse_request(struct dp_link_private *link)

pr_debug("device service irq vector = 0x%x\n", data);

drm_dp_cec_irq(link->aux->drm_aux);

if (!(data & DP_AUTOMATED_TEST_REQUEST)) {
pr_debug("no test requested\n");
return 0;
Expand Down

0 comments on commit aa1e573

Please sign in to comment.