drm/amdgpu: Add support for drm_privacy_screen
Subsystems (7)
PATCH v2 1/1 drm/amdgpu: Add support for drm_privacy_screen
From: Sean Paul <[email protected]>
This patch adds the necessary hooks to make amdgpu aware of privacy screens. On devices with privacy screen drivers (such as thinkpad-acpi), the amdgpu driver will defer probe until it's ready and then sync the sw and hw state on each commit the connector is involved and enabled.
Changes in v2:
-Tweaked the drm_privacy_screen_get() error check to avoid logging
errors when privacy screen is absent (Hans)
--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 9 +++++++++ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +++ .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 16 +++++++++++++++- 3 files changed, 27 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +9 -0
@@ -26,6 +26,7 @@#include <drm/drm_aperture.h> #include <drm/drm_drv.h> #include <drm/drm_gem.h> +#include <drm/drm_privacy_screen_consumer.h> #include <drm/drm_vblank.h> #include <drm/drm_managed.h> #include "amdgpu_drv.h"
@@ -1988,6 +1989,7 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, {struct drm_device *ddev;struct amdgpu_device *adev; +struct drm_privacy_screen *privacy_screen;unsigned long flags = ent->driver_data;int ret, retry =0 , i;bool supports_atomic = false;
@@ -2063,6 +2065,13 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, size =pci_resource_len (pdev,0 ); is_fw_fb =amdgpu_is_fw_framebuffer (base, size); +/* If the LCD panel has a privacy screen, defer probe until its ready */ + privacy_screen =drm_privacy_screen_get (&pdev->dev,NULL ); +if (IS_ERR (privacy_screen) &&PTR_ERR (privacy_screen) == -EPROBE_DEFER ) +return -EPROBE_DEFER ; + +drm_privacy_screen_put (privacy_screen); +/* Get rid of things like offb */ ret =drm_aperture_remove_conflicting_pci_framebuffers (pdev, &amdgpu_kms_driver);if (ret)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +3 -0
@@ -9781,6 +9781,9 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)if (acrtc) { new_crtc_state =drm_atomic_get_new_crtc_state (state, &acrtc->base); old_crtc_state =drm_atomic_get_old_crtc_state (state, &acrtc->base); + +/* Sync the privacy screen state between hw and sw */ +drm_connector_update_privacy_screen (new_con_state); }/* Skip any modesets/resets */
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +15 -1
@@ -27,6 +27,7 @@#include <drm/drm_atomic_helper.h> #include <drm/dp/drm_dp_mst_helper.h> #include <drm/dp/drm_dp_helper.h> +#include <drm/drm_privacy_screen_consumer.h> #include "dm_services.h" #include "amdgpu.h" #include "amdgpu_dm.h"
@@ -506,6 +507,7 @@ void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm, struct amdgpu_dm_connector *aconnector, int link_index) { +struct drm_device *dev = dm->ddev;struct dc_link_settings max_link_enc_cap = {0 }; aconnector->dm_dp_aux.aux.name =
@@ -519,8 +521,20 @@ void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm,drm_dp_cec_register_connector (&aconnector->dm_dp_aux.aux, &aconnector->base); -if (aconnector->base.connector_type == DRM_MODE_CONNECTOR_eDP) +if (aconnector->base.connector_type == DRM_MODE_CONNECTOR_eDP) { +struct drm_privacy_screen *privacy_screen; + +/* Reference given up in drm_connector_cleanup() */ + privacy_screen =drm_privacy_screen_get (dev->dev,NULL ); +if (!IS_ERR (privacy_screen)) { +drm_connector_attach_privacy_screen_provider (&aconnector->base, + privacy_screen); + }else if (PTR_ERR (privacy_screen) != -ENODEV ) { +drm_err (dev,"Error getting privacy screen, ret=%d\n" , +PTR_ERR (privacy_screen)); + }return ; + }dc_link_dp_get_max_link_enc_cap (aconnector->dc_link, &max_link_enc_cap); aconnector->mst_mgr.cbs = &dm_mst_cbs;
Signature · 1 line
Sean Paul, Software Engineer, Google / Chromium OS
Hi,
Quoted 7 lines · Sean Paul
From: Sean Paul <[email protected]>
This patch adds the necessary hooks to make amdgpu aware of privacy screens. On devices with privacy screen drivers (such as thinkpad-acpi), the amdgpu driver will defer probe until it's ready and then sync the sw and hw state on each commit the connector is involved and enabled.
Quoted 6 lines
Changes in v2:
-Tweaked thedrm_privacy_screen_get()error check to avoid logging
errors when privacy screen is absent (Hans)Signed-off-by Sean Paul <[email protected]>
Thanks, patch looks good to me:
Regards,
Hans
Quoted 96 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 9 +++++++++ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +++ .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 16 +++++++++++++++- 3 files changed, 27 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +9
-0@@ -26,6 +26,7 @@#include <drm/drm_aperture.h> #include <drm/drm_drv.h> #include <drm/drm_gem.h> +#include <drm/drm_privacy_screen_consumer.h> #include <drm/drm_vblank.h> #include <drm/drm_managed.h> #include "amdgpu_drv.h" @@ -1988,6 +1989,7 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, {struct drm_device *ddev;struct amdgpu_device *adev; +struct drm_privacy_screen *privacy_screen;unsigned long flags = ent->driver_data;int ret, retry =0 , i;bool supports_atomic = false;@@ -2063,6 +2065,13 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, size =pci_resource_len (pdev,0 ); is_fw_fb =amdgpu_is_fw_framebuffer (base, size); +/* If the LCD panel has a privacy screen, defer probe until its ready */ + privacy_screen =drm_privacy_screen_get (&pdev->dev,NULL ); +if (IS_ERR (privacy_screen) &&PTR_ERR (privacy_screen) == -EPROBE_DEFER ) +return -EPROBE_DEFER ; + +drm_privacy_screen_put (privacy_screen); +/* Get rid of things like offb */ ret =drm_aperture_remove_conflicting_pci_framebuffers (pdev, &amdgpu_kms_driver);if (ret)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +3
-0@@ -9781,6 +9781,9 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)if (acrtc) { new_crtc_state =drm_atomic_get_new_crtc_state (state, &acrtc->base); old_crtc_state =drm_atomic_get_old_crtc_state (state, &acrtc->base); + +/* Sync the privacy screen state between hw and sw */ +drm_connector_update_privacy_screen (new_con_state); }/* Skip any modesets/resets */ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +15
-1@@ -27,6 +27,7 @@#include <drm/drm_atomic_helper.h> #include <drm/dp/drm_dp_mst_helper.h> #include <drm/dp/drm_dp_helper.h> +#include <drm/drm_privacy_screen_consumer.h> #include "dm_services.h" #include "amdgpu.h" #include "amdgpu_dm.h" @@ -506,6 +507,7 @@ void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm, struct amdgpu_dm_connector *aconnector, int link_index) { +struct drm_device *dev = dm->ddev;struct dc_link_settings max_link_enc_cap = {0 }; aconnector->dm_dp_aux.aux.name =@@ -519,8 +521,20 @@ void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm,drm_dp_cec_register_connector (&aconnector->dm_dp_aux.aux, &aconnector->base); -if (aconnector->base.connector_type == DRM_MODE_CONNECTOR_eDP) +if (aconnector->base.connector_type == DRM_MODE_CONNECTOR_eDP) { +struct drm_privacy_screen *privacy_screen; + +/* Reference given up in drm_connector_cleanup() */ + privacy_screen =drm_privacy_screen_get (dev->dev,NULL ); +if (!IS_ERR (privacy_screen)) { +drm_connector_attach_privacy_screen_provider (&aconnector->base, + privacy_screen); + }else if (PTR_ERR (privacy_screen) != -ENODEV ) { +drm_err (dev,"Error getting privacy screen, ret=%d\n" , +PTR_ERR (privacy_screen)); + }return ; + }dc_link_dp_get_max_link_enc_cap (aconnector->dc_link, &max_link_enc_cap); aconnector->mst_mgr.cbs = &dm_mst_cbs;
Quoted 89 lines · Sean Paul
From: Sean Paul <[email protected]>
This patch adds the necessary hooks to make amdgpu aware of privacy screens. On devices with privacy screen drivers (such as thinkpad-acpi), the amdgpu driver will defer probe until it's ready and then sync the sw and hw state on each commit the connector is involved and enabled.
Changes in v2:
-Tweaked thedrm_privacy_screen_get()error check to avoid logging
errors when privacy screen is absent (Hans)Signed-off-by Sean Paul <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 9 +++++++++ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +++ .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 16 +++++++++++++++- 3 files changed, 27 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +9
-0@@ -26,6 +26,7 @@#include <drm/drm_aperture.h> #include <drm/drm_drv.h> #include <drm/drm_gem.h> +#include <drm/drm_privacy_screen_consumer.h> #include <drm/drm_vblank.h> #include <drm/drm_managed.h> #include "amdgpu_drv.h" @@ -1988,6 +1989,7 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, {struct drm_device *ddev;struct amdgpu_device *adev; +struct drm_privacy_screen *privacy_screen;unsigned long flags = ent->driver_data;int ret, retry =0 , i;bool supports_atomic = false;@@ -2063,6 +2065,13 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, size =pci_resource_len (pdev,0 ); is_fw_fb =amdgpu_is_fw_framebuffer (base, size); +/* If the LCD panel has a privacy screen, defer probe until its ready */ + privacy_screen =drm_privacy_screen_get (&pdev->dev,NULL ); +if (IS_ERR (privacy_screen) &&PTR_ERR (privacy_screen) == -EPROBE_DEFER ) +return -EPROBE_DEFER ; + +drm_privacy_screen_put (privacy_screen); +/* Get rid of things like offb */ ret =drm_aperture_remove_conflicting_pci_framebuffers (pdev, &amdgpu_kms_driver);if (ret)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +3
-0@@ -9781,6 +9781,9 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)if (acrtc) { new_crtc_state =drm_atomic_get_new_crtc_state (state, &acrtc->base); old_crtc_state =drm_atomic_get_old_crtc_state (state, &acrtc->base); + +/* Sync the privacy screen state between hw and sw */ +drm_connector_update_privacy_screen (new_con_state); }/* Skip any modesets/resets */ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +2
-0@@ -27,6 +27,7 @@#include <drm/drm_atomic_helper.h> #include <drm/dp/drm_dp_mst_helper.h> #include <drm/dp/drm_dp_helper.h> +#include <drm/drm_privacy_screen_consumer.h> #include "dm_services.h" #include "amdgpu.h" #include "amdgpu_dm.h" @@ -506,6 +507,7 @@ void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm, struct amdgpu_dm_connector *aconnector, int link_index) { +struct drm_device *dev = dm->ddev;struct dc_link_settings max_link_enc_cap = {0 }; aconnector->dm_dp_aux.aux.name =
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm, · line 528
Quoted 9 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +5
-1@@ -519,8 +521,20 @@ void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm,drm_dp_cec_register_connector (&aconnector->dm_dp_aux.aux, &aconnector->base); -if (aconnector->base.connector_type == DRM_MODE_CONNECTOR_eDP) +if (aconnector->base.connector_type == DRM_MODE_CONNECTOR_eDP) { + struct drm_privacy_screen *privacy_screen) + +/* Reference given up in drm_connector_cleanup() */ + privacy_screen =drm_privacy_screen_get (dev->dev,NULL );
Can we try to be more specific when looking up for privacy screen, e.g.:
privacy_screen = drm_privacy_screen_get(dev->dev, "eDP-1"); (and then also making the corresponding change in arch_init_data[] in drm_privacy_screen_x86.c"
My comment applies to this driver as well as to i915. The reason being today there is only 1 internal display with privacy screen so we can just assume that there shall be only 1 privacy-screen and that shall apply to eDP-1/internal display. But dual display systems are not far enough out, and perhaps external monitors with inbuilt privacy-screens?
Essentially the gap today is that today on Chromeos ACPI side, the device GOOG0010 represents the privacy-screen attached to the internal display/eDP-1, but there isn't a way to make it clear in the i915 and now amdgpu code.
Thanks,
Rajat
Quoted 15 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +8
-1+if (!IS_ERR (privacy_screen)) { +drm_connector_attach_privacy_screen_provider (&aconnector->base, + privacy_screen); + }else if (PTR_ERR (privacy_screen) != -ENODEV ) { +drm_err (dev,"Error getting privacy screen, ret=%d\n" , +PTR_ERR (privacy_screen)); + }return ; + }dc_link_dp_get_max_link_enc_cap (aconnector->dc_link, &max_link_enc_cap); aconnector->mst_mgr.cbs = &dm_mst_cbs; --Sean Paul, Software Engineer, Google / Chromium OS
Quoted 114 lines · Rajat Jain
Quoted 89 lines · Sean Paul
From: Sean Paul <[email protected]>
This patch adds the necessary hooks to make amdgpu aware of privacy screens. On devices with privacy screen drivers (such as thinkpad-acpi), the amdgpu driver will defer probe until it's ready and then sync the sw and hw state on each commit the connector is involved and enabled.
Changes in v2:
-Tweaked thedrm_privacy_screen_get()error check to avoid logging
errors when privacy screen is absent (Hans)Signed-off-by Sean Paul <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 9 +++++++++ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +++ .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 16 +++++++++++++++- 3 files changed, 27 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +9
-0@@ -26,6 +26,7 @@#include <drm/drm_aperture.h> #include <drm/drm_drv.h> #include <drm/drm_gem.h> +#include <drm/drm_privacy_screen_consumer.h> #include <drm/drm_vblank.h> #include <drm/drm_managed.h> #include "amdgpu_drv.h" @@ -1988,6 +1989,7 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, {struct drm_device *ddev;struct amdgpu_device *adev; +struct drm_privacy_screen *privacy_screen;unsigned long flags = ent->driver_data;int ret, retry =0 , i;bool supports_atomic = false;@@ -2063,6 +2065,13 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, size =pci_resource_len (pdev,0 ); is_fw_fb =amdgpu_is_fw_framebuffer (base, size); +/* If the LCD panel has a privacy screen, defer probe until its ready */ + privacy_screen =drm_privacy_screen_get (&pdev->dev,NULL ); +if (IS_ERR (privacy_screen) &&PTR_ERR (privacy_screen) == -EPROBE_DEFER ) +return -EPROBE_DEFER ; + +drm_privacy_screen_put (privacy_screen); +/* Get rid of things like offb */ ret =drm_aperture_remove_conflicting_pci_framebuffers (pdev, &amdgpu_kms_driver);if (ret)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +3
-0@@ -9781,6 +9781,9 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)if (acrtc) { new_crtc_state =drm_atomic_get_new_crtc_state (state, &acrtc->base); old_crtc_state =drm_atomic_get_old_crtc_state (state, &acrtc->base); + +/* Sync the privacy screen state between hw and sw */ +drm_connector_update_privacy_screen (new_con_state); }/* Skip any modesets/resets */ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +2
-0@@ -27,6 +27,7 @@#include <drm/drm_atomic_helper.h> #include <drm/dp/drm_dp_mst_helper.h> #include <drm/dp/drm_dp_helper.h> +#include <drm/drm_privacy_screen_consumer.h> #include "dm_services.h" #include "amdgpu.h" #include "amdgpu_dm.h" @@ -506,6 +507,7 @@ void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm, struct amdgpu_dm_connector *aconnector, int link_index) { +struct drm_device *dev = dm->ddev;struct dc_link_settings max_link_enc_cap = {0 }; aconnector->dm_dp_aux.aux.name =drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm, · line 528
Quoted 9 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +5
-1@@ -519,8 +521,20 @@ void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm,drm_dp_cec_register_connector (&aconnector->dm_dp_aux.aux, &aconnector->base); -if (aconnector->base.connector_type == DRM_MODE_CONNECTOR_eDP) +if (aconnector->base.connector_type == DRM_MODE_CONNECTOR_eDP) { + struct drm_privacy_screen *privacy_screen) + +/* Reference given up in drm_connector_cleanup() */ + privacy_screen =drm_privacy_screen_get (dev->dev,NULL );Can we try to be more specific when looking up for privacy screen, e.g.:
privacy_screen=drm_privacy_screen_get(dev->dev, "eDP-1"); (and then also making the corresponding change in arch_init_data[] indrm_privacy_screen_x86.c"My comment applies to this driver as well as to i915. The reason being today there is only 1 internal display with privacy screen so we can just assume that there shall be only 1 privacy-screen and that shall apply to eDP-1/internal display. But dual display systems are not far enough out, and perhaps external monitors with inbuilt privacy-screens?
Quoted 4 lines
Essentially the gap today is that today on Chromeos ACPI side, the device GOOG0010 represents the privacy-screen attached to the internal display/eDP-1, but there isn't a way to make it clear in the i915 and now amdgpu code.
I was wondering the same thing. There are devices out there today that have multiple eDP panels already. I don't know that there are any platforms today with privacy screens and multiple panels, but as you say, I suppose it is only a matter of time. Additionally what if you have several eDP panels and only one has a privacy screen? How do you map to the appropriate display?
Alex
Quoted 21 lines
Thanks,
Rajat
Quoted 15 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +8
-1+if (!IS_ERR (privacy_screen)) { +drm_connector_attach_privacy_screen_provider (&aconnector->base, + privacy_screen); + }else if (PTR_ERR (privacy_screen) != -ENODEV ) { +drm_err (dev,"Error getting privacy screen, ret=%d\n" , +PTR_ERR (privacy_screen)); + }return ; + }dc_link_dp_get_max_link_enc_cap (aconnector->dc_link, &max_link_enc_cap); aconnector->mst_mgr.cbs = &dm_mst_cbs; --Sean Paul, Software Engineer, Google / Chromium OS
Hi All,
Quoted 102 lines · Rajat Jain
Quoted 89 lines · Sean Paul
From: Sean Paul <[email protected]>
This patch adds the necessary hooks to make amdgpu aware of privacy screens. On devices with privacy screen drivers (such as thinkpad-acpi), the amdgpu driver will defer probe until it's ready and then sync the sw and hw state on each commit the connector is involved and enabled.
Changes in v2:
-Tweaked thedrm_privacy_screen_get()error check to avoid logging
errors when privacy screen is absent (Hans)Signed-off-by Sean Paul <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 9 +++++++++ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +++ .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 16 +++++++++++++++- 3 files changed, 27 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +9
-0@@ -26,6 +26,7 @@#include <drm/drm_aperture.h> #include <drm/drm_drv.h> #include <drm/drm_gem.h> +#include <drm/drm_privacy_screen_consumer.h> #include <drm/drm_vblank.h> #include <drm/drm_managed.h> #include "amdgpu_drv.h" @@ -1988,6 +1989,7 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, {struct drm_device *ddev;struct amdgpu_device *adev; +struct drm_privacy_screen *privacy_screen;unsigned long flags = ent->driver_data;int ret, retry =0 , i;bool supports_atomic = false;@@ -2063,6 +2065,13 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, size =pci_resource_len (pdev,0 ); is_fw_fb =amdgpu_is_fw_framebuffer (base, size); +/* If the LCD panel has a privacy screen, defer probe until its ready */ + privacy_screen =drm_privacy_screen_get (&pdev->dev,NULL ); +if (IS_ERR (privacy_screen) &&PTR_ERR (privacy_screen) == -EPROBE_DEFER ) +return -EPROBE_DEFER ; + +drm_privacy_screen_put (privacy_screen); +/* Get rid of things like offb */ ret =drm_aperture_remove_conflicting_pci_framebuffers (pdev, &amdgpu_kms_driver);if (ret)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +3
-0@@ -9781,6 +9781,9 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)if (acrtc) { new_crtc_state =drm_atomic_get_new_crtc_state (state, &acrtc->base); old_crtc_state =drm_atomic_get_old_crtc_state (state, &acrtc->base); + +/* Sync the privacy screen state between hw and sw */ +drm_connector_update_privacy_screen (new_con_state); }/* Skip any modesets/resets */ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +2
-0@@ -27,6 +27,7 @@#include <drm/drm_atomic_helper.h> #include <drm/dp/drm_dp_mst_helper.h> #include <drm/dp/drm_dp_helper.h> +#include <drm/drm_privacy_screen_consumer.h> #include "dm_services.h" #include "amdgpu.h" #include "amdgpu_dm.h" @@ -506,6 +507,7 @@ void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm, struct amdgpu_dm_connector *aconnector, int link_index) { +struct drm_device *dev = dm->ddev;struct dc_link_settings max_link_enc_cap = {0 }; aconnector->dm_dp_aux.aux.name =drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm, · line 528
Quoted 9 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +5
-1@@ -519,8 +521,20 @@ void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm,drm_dp_cec_register_connector (&aconnector->dm_dp_aux.aux, &aconnector->base); -if (aconnector->base.connector_type == DRM_MODE_CONNECTOR_eDP) +if (aconnector->base.connector_type == DRM_MODE_CONNECTOR_eDP) { + struct drm_privacy_screen *privacy_screen) + +/* Reference given up in drm_connector_cleanup() */ + privacy_screen =drm_privacy_screen_get (dev->dev,NULL );Can we try to be more specific when looking up for privacy screen, e.g.:
Quoted 3 lines
privacy_screen=drm_privacy_screen_get(dev->dev, "eDP-1"); (and then also making the corresponding change in arch_init_data[] indrm_privacy_screen_x86.c"
So I just checked and yes I think we can be more specific at least for the thinkpad_acpi supported models. See the attached patch which has been tested on a ThinkPad T14 gen 1 with a builtin privacy-screen.
Rajat, can you adjust the chrome code in drivers/gpu/drm/drm_privacy_screen_x86.c to match and check that with the chrome code changes, my patch does not break things on chromebooks? (Note your changes will need to be squashed into the patch so that we change all of this in one go) .
Sean, same request to you, can you adjust your amdgpu patch to match the i915 changes in the attached patch and then check if a kernel with both changes still works ?
Regards,
Hans
Quoted 8 lines
My comment applies to this driver as well as to i915. The reason being today there is only 1 internal display with privacy screen so we can just assume that there shall be only 1 privacy-screen and that shall apply to eDP-1/internal display. But dual display systems are not far enough out, and perhaps external monitors with inbuilt privacy-screens?
Quoted 26 lines
Essentially the gap today is that today on Chromeos ACPI side, the device GOOG0010 represents the privacy-screen attached to the internal display/eDP-1, but there isn't a way to make it clear in the i915 and now amdgpu code.
Thanks,
Rajat
Quoted 15 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +8
-1+if (!IS_ERR (privacy_screen)) { +drm_connector_attach_privacy_screen_provider (&aconnector->base, + privacy_screen); + }else if (PTR_ERR (privacy_screen) != -ENODEV ) { +drm_err (dev,"Error getting privacy screen, ret=%d\n" , +PTR_ERR (privacy_screen)); + }return ; + }dc_link_dp_get_max_link_enc_cap (aconnector->dc_link, &max_link_enc_cap); aconnector->mst_mgr.cbs = &dm_mst_cbs; --Sean Paul, Software Engineer, Google / Chromium OS
From 04320f93075eeb13a305ec703cc9e591ce334749 Mon Sep 17 00:00:00 2001
From: Hans de Goede <[email protected]>
Date: Fri, 11 Mar 2022 12:28:47 +0100
Subject: [PATCH] drm/privacy-screen: Hardcode
ATM the drm privacy-screen code is not using connector names to lookup drm privacy-screen providers, drm_privacy_screen_get() does support this, but before this change the con_id is set to NULL everywhere which is treated as a wildcard.
There are some worries that we may see devices with 2 displays with a privacy-screen, be it 2 internal displays or 1 internal + 1 external.
All laptop-models which currently are supported by the drm_privacy_screen code use an eDP display connected to eDP-1.
This commits enables the use of the con_id parameter, hardcoding this to "eDP-1" in the lookup tables in drivers/gpu/drm/drm_privacy_screen_x86.c and adjusting the i915 driver to match.
Using the con_id parameter paves the way for potentially having another display (attached to a different connector) which also has a builtin privacy-screen.
--- drivers/gpu/drm/drm_privacy_screen_x86.c | 2 +- drivers/gpu/drm/i915/display/intel_ddi.c | 2 +- drivers/gpu/drm/i915/display/intel_display.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/drm_privacy_screen_x86.c +1 -1
@@ -55,7 +55,7 @@ static const struct arch_init_data arch_init_data[] __initconst = { { .lookup = { .dev_id = NULL, - .con_id = NULL, + .con_id = "eDP-1", .provider = "privacy_screen-thinkpad_acpi", }, .detect = detect_thinkpad_privacy_screen,
drivers/gpu/drm/i915/display/intel_ddi.c +1 -1
@@ -3951,7 +3951,7 @@ intel_ddi_init_dp_connector(struct intel_digital_port *dig_port)struct drm_device *dev = dig_port->base.base.dev;struct drm_privacy_screen *privacy_screen; - privacy_screen =drm_privacy_screen_get (dev->dev,NULL ); + privacy_screen =drm_privacy_screen_get (dev->dev, connector->base.name);if (!IS_ERR (privacy_screen)) {drm_connector_attach_privacy_screen_provider (&connector->base, privacy_screen);
drivers/gpu/drm/i915/display/intel_display.c +1 -1
@@ -10835,7 +10835,7 @@ bool intel_modeset_probe_defer(struct pci_dev *pdev)return true;/* If the LCD panel has a privacy-screen, wait for it */ - privacy_screen =drm_privacy_screen_get (&pdev->dev,NULL ); + privacy_screen =drm_privacy_screen_get (&pdev->dev,"eDP-1" );if (IS_ERR (privacy_screen) &&PTR_ERR (privacy_screen) == -EPROBE_DEFER )return true;
Signature · 1 line
2.35.1
() Hello Hans, Sean,
Quoted 110 lines · Hans de Goede
Hi All,
Quoted 102 lines · Rajat Jain
Quoted 89 lines · Sean Paul
From: Sean Paul <[email protected]>
This patch adds the necessary hooks to make amdgpu aware of privacy screens. On devices with privacy screen drivers (such as thinkpad-acpi), the amdgpu driver will defer probe until it's ready and then sync the sw and hw state on each commit the connector is involved and enabled.
Changes in v2:
-Tweaked thedrm_privacy_screen_get()error check to avoid logging
errors when privacy screen is absent (Hans)Signed-off-by Sean Paul <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 9 +++++++++ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +++ .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 16 +++++++++++++++- 3 files changed, 27 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +9
-0@@ -26,6 +26,7 @@#include <drm/drm_aperture.h> #include <drm/drm_drv.h> #include <drm/drm_gem.h> +#include <drm/drm_privacy_screen_consumer.h> #include <drm/drm_vblank.h> #include <drm/drm_managed.h> #include "amdgpu_drv.h" @@ -1988,6 +1989,7 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, {struct drm_device *ddev;struct amdgpu_device *adev; +struct drm_privacy_screen *privacy_screen;unsigned long flags = ent->driver_data;int ret, retry =0 , i;bool supports_atomic = false;@@ -2063,6 +2065,13 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, size =pci_resource_len (pdev,0 ); is_fw_fb =amdgpu_is_fw_framebuffer (base, size); +/* If the LCD panel has a privacy screen, defer probe until its ready */ + privacy_screen =drm_privacy_screen_get (&pdev->dev,NULL ); +if (IS_ERR (privacy_screen) &&PTR_ERR (privacy_screen) == -EPROBE_DEFER ) +return -EPROBE_DEFER ; + +drm_privacy_screen_put (privacy_screen); +/* Get rid of things like offb */ ret =drm_aperture_remove_conflicting_pci_framebuffers (pdev, &amdgpu_kms_driver);if (ret)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +3
-0@@ -9781,6 +9781,9 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)if (acrtc) { new_crtc_state =drm_atomic_get_new_crtc_state (state, &acrtc->base); old_crtc_state =drm_atomic_get_old_crtc_state (state, &acrtc->base); + +/* Sync the privacy screen state between hw and sw */ +drm_connector_update_privacy_screen (new_con_state); }/* Skip any modesets/resets */ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +2
-0@@ -27,6 +27,7 @@#include <drm/drm_atomic_helper.h> #include <drm/dp/drm_dp_mst_helper.h> #include <drm/dp/drm_dp_helper.h> +#include <drm/drm_privacy_screen_consumer.h> #include "dm_services.h" #include "amdgpu.h" #include "amdgpu_dm.h" @@ -506,6 +507,7 @@ void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm, struct amdgpu_dm_connector *aconnector, int link_index) { +struct drm_device *dev = dm->ddev;struct dc_link_settings max_link_enc_cap = {0 }; aconnector->dm_dp_aux.aux.name =drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm, · line 528
Quoted 9 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +5
-1@@ -519,8 +521,20 @@ void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm,drm_dp_cec_register_connector (&aconnector->dm_dp_aux.aux, &aconnector->base); -if (aconnector->base.connector_type == DRM_MODE_CONNECTOR_eDP) +if (aconnector->base.connector_type == DRM_MODE_CONNECTOR_eDP) { + struct drm_privacy_screen *privacy_screen) + +/* Reference given up in drm_connector_cleanup() */ + privacy_screen =drm_privacy_screen_get (dev->dev,NULL );Can we try to be more specific when looking up for privacy screen, e.g.:
Quoted 3 lines
privacy_screen=drm_privacy_screen_get(dev->dev, "eDP-1"); (and then also making the corresponding change in arch_init_data[] indrm_privacy_screen_x86.c"
Quoted 8 lines
So I just checked and yes I think we can be more specific at least for the
thinkpad_acpisupported models. See the attached patch which has been tested on a ThinkPad T14 gen 1 with a builtin privacy-screen.Rajat, can you adjust the chrome code in
drivers/gpu/drm/drm_privacy_screen_x86.cto match and check that with the chrome code changes, my patch does not break things on chromebooks? (Note your changes will need to be squashed into the patch so that we change all of this in one go) .
Thanks, I just confirmed that with a change similar to yours (use "eDP-1"), it works fine on the Intel chromebooks at my end, so feel free to do it:
===================================================
(quoted diff) +0 -0
b/drivers/gpu/drm/drm_privacy_screen_x86.c
index 88802cd7a1ee..894beefb6628 100644
drivers/gpu/drm/drm_privacy_screen_x86.c +0 -0
@@ -69,7 +69,7 @@ static const struct arch_init_data arch_init_data[]
__initconst = {
{
.lookup = {
.dev_id = NULL,
- .con_id = NULL,
+ .con_id = "eDP-1",
.provider = "privacy_screen-GOOG0010:00",
},
.detect = detect_chromeos_privacy_screen,(quoted diff) +0 -0
b/drivers/gpu/drm/i915/display/intel_ddi.c
index 1682ace5cd53..2666ba7b5a28 100644
drivers/gpu/drm/i915/display/intel_ddi.c +0 -0
@@ -4250,7 +4250,7 @@ intel_ddi_init_dp_connector(struct
intel_digital_port *dig_port)
struct drm_device *dev = dig_port->base.base.dev;
struct drm_privacy_screen *privacy_screen;- privacy_screen = drm_privacy_screen_get(dev->dev, NULL);
+ privacy_screen = drm_privacy_screen_get(dev->dev,
connector->base.name);
if (!IS_ERR(privacy_screen)) {drm_connector_attach_privacy_screen_provider(&connector->base,
privacy_screen);
(quoted diff) +0 -0
b/drivers/gpu/drm/i915/display/intel_display.c
index 89be498127e4..b2903a55f910 100644
drivers/gpu/drm/i915/display/intel_display.c +1 -1
@@ -13360,7 +13360,7 @@ bool intel_modeset_probe_defer(struct pci_dev *pdev)return true;/* If the LCD panel has a privacy-screen, wait for it */ - privacy_screen =drm_privacy_screen_get (&pdev->dev,NULL ); + privacy_screen =drm_privacy_screen_get (&pdev->dev,"eDP-1" );if (IS_ERR (privacy_screen) &&PTR_ERR (privacy_screen) == -EPROBE_DEFER )return true; =================================================
I found it a little surprising though. From what I remembered from my early venture, was that connector->base.name did not get filled in at the time intel_ddi_init_dp_connector() was called, but I guess I was remembering it wrong.
Quoted 4 lines
Sean, same request to you, can you adjust your amdgpu patch to match the i915 changes in the attached patch and then check if a kernel with both changes still works ?
Defer to Sean since I do not have the AMD chromebook to test.
Thanks & Best Regards,
Rajat
Quoted 41 lines
Regards,
Hans
Quoted 34 lines
My comment applies to this driver as well as to i915. The reason being today there is only 1 internal display with privacy screen so we can just assume that there shall be only 1 privacy-screen and that shall apply to eDP-1/internal display. But dual display systems are not far enough out, and perhaps external monitors with inbuilt privacy-screens?
Essentially the gap today is that today on Chromeos ACPI side, the device GOOG0010 represents the privacy-screen attached to the internal display/eDP-1, but there isn't a way to make it clear in the i915 and now amdgpu code.
Thanks,
Rajat
Quoted 15 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +8
-1+if (!IS_ERR (privacy_screen)) { +drm_connector_attach_privacy_screen_provider (&aconnector->base, + privacy_screen); + }else if (PTR_ERR (privacy_screen) != -ENODEV ) { +drm_err (dev,"Error getting privacy screen, ret=%d\n" , +PTR_ERR (privacy_screen)); + }return ; + }dc_link_dp_get_max_link_enc_cap (aconnector->dc_link, &max_link_enc_cap); aconnector->mst_mgr.cbs = &dm_mst_cbs; --Sean Paul, Software Engineer, Google / Chromium OS
Hi,
Quoted 119 lines · Rajat Jain
() Hello Hans, Sean,
Quoted 114 lines · Hans de Goede
Hi All,
Quoted 102 lines · Rajat Jain
Quoted 89 lines · Sean Paul
From: Sean Paul <[email protected]>
This patch adds the necessary hooks to make amdgpu aware of privacy screens. On devices with privacy screen drivers (such as thinkpad-acpi), the amdgpu driver will defer probe until it's ready and then sync the sw and hw state on each commit the connector is involved and enabled.
Changes in v2:
-Tweaked thedrm_privacy_screen_get()error check to avoid logging
errors when privacy screen is absent (Hans)Signed-off-by Sean Paul <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 9 +++++++++ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +++ .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 16 +++++++++++++++- 3 files changed, 27 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +9
-0@@ -26,6 +26,7 @@#include <drm/drm_aperture.h> #include <drm/drm_drv.h> #include <drm/drm_gem.h> +#include <drm/drm_privacy_screen_consumer.h> #include <drm/drm_vblank.h> #include <drm/drm_managed.h> #include "amdgpu_drv.h" @@ -1988,6 +1989,7 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, {struct drm_device *ddev;struct amdgpu_device *adev; +struct drm_privacy_screen *privacy_screen;unsigned long flags = ent->driver_data;int ret, retry =0 , i;bool supports_atomic = false;@@ -2063,6 +2065,13 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, size =pci_resource_len (pdev,0 ); is_fw_fb =amdgpu_is_fw_framebuffer (base, size); +/* If the LCD panel has a privacy screen, defer probe until its ready */ + privacy_screen =drm_privacy_screen_get (&pdev->dev,NULL ); +if (IS_ERR (privacy_screen) &&PTR_ERR (privacy_screen) == -EPROBE_DEFER ) +return -EPROBE_DEFER ; + +drm_privacy_screen_put (privacy_screen); +/* Get rid of things like offb */ ret =drm_aperture_remove_conflicting_pci_framebuffers (pdev, &amdgpu_kms_driver);if (ret)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +3
-0@@ -9781,6 +9781,9 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)if (acrtc) { new_crtc_state =drm_atomic_get_new_crtc_state (state, &acrtc->base); old_crtc_state =drm_atomic_get_old_crtc_state (state, &acrtc->base); + +/* Sync the privacy screen state between hw and sw */ +drm_connector_update_privacy_screen (new_con_state); }/* Skip any modesets/resets */ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +2
-0@@ -27,6 +27,7 @@#include <drm/drm_atomic_helper.h> #include <drm/dp/drm_dp_mst_helper.h> #include <drm/dp/drm_dp_helper.h> +#include <drm/drm_privacy_screen_consumer.h> #include "dm_services.h" #include "amdgpu.h" #include "amdgpu_dm.h" @@ -506,6 +507,7 @@ void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm, struct amdgpu_dm_connector *aconnector, int link_index) { +struct drm_device *dev = dm->ddev;struct dc_link_settings max_link_enc_cap = {0 }; aconnector->dm_dp_aux.aux.name =drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm, · line 528
Quoted 9 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +5
-1@@ -519,8 +521,20 @@ void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm,drm_dp_cec_register_connector (&aconnector->dm_dp_aux.aux, &aconnector->base); -if (aconnector->base.connector_type == DRM_MODE_CONNECTOR_eDP) +if (aconnector->base.connector_type == DRM_MODE_CONNECTOR_eDP) { + struct drm_privacy_screen *privacy_screen) + +/* Reference given up in drm_connector_cleanup() */ + privacy_screen =drm_privacy_screen_get (dev->dev,NULL );Can we try to be more specific when looking up for privacy screen, e.g.:
Quoted 3 lines
privacy_screen=drm_privacy_screen_get(dev->dev, "eDP-1"); (and then also making the corresponding change in arch_init_data[] indrm_privacy_screen_x86.c"So I just checked and yes I think we can be more specific at least for the
thinkpad_acpisupported models. See the attached patch which has been tested on a ThinkPad T14 gen 1 with a builtin privacy-screen.
Quoted 8 lines
Quoted 4 lines
Rajat, can you adjust the chrome code in
drivers/gpu/drm/drm_privacy_screen_x86.cto match and check that with the chrome code changes, my patch does not break things on chromebooks? (Note your changes will need to be squashed into the patch so that we change all of this in one go) .Thanks, I just confirmed that with a change similar to yours (use "eDP-1"), it works fine on the Intel chromebooks at my end, so feel free to do it:
Ok, I've just send out a patch for this including the changes for the Chromebook entry in drivers/gpu/drm/drm_privacy_screen_x86.c .
Note I've modified the changes to drivers/gpu/drm/i915/display/intel_display.c intel_modeset_probe_defer() a bit to walk over an array of internal-panel connector-names, to make it a bit more future proof. I expect / hope this new version to be better liked by the i915 maintainers.
Regards,
Hans
Quoted 107 lines
===================================================
drivers/gpu/drm/drm_privacy_screen_x86.c +1
-1@@ -69,7 +69,7 @@ static const struct arch_init_data arch_init_data[] __initconst = { { .lookup = { .dev_id = NULL, - .con_id = NULL, + .con_id = "eDP-1", .provider = "privacy_screen-GOOG0010:00", },.detect =
detect_chromeos_privacy_screen,drivers/gpu/drm/i915/display/intel_ddi.c +1
-1@@ -4250,7 +4250,7 @@ intel_ddi_init_dp_connector(struct intel_digital_port *dig_port)struct drm_device *dev = dig_port->base.base.dev;struct drm_privacy_screen *privacy_screen; - privacy_screen =drm_privacy_screen_get (dev->dev,NULL ); + privacy_screen =drm_privacy_screen_get (dev->dev, connector->base.name);if (!IS_ERR (privacy_screen)) {drm_connector_attach_privacy_screen_provider(&connector->base,
privacy_screen);drivers/gpu/drm/i915/display/intel_display.c +1
-1@@ -13360,7 +13360,7 @@ bool intel_modeset_probe_defer(struct pci_dev *pdev)return true;/* If the LCD panel has a privacy-screen, wait for it */ - privacy_screen =drm_privacy_screen_get (&pdev->dev,NULL ); + privacy_screen =drm_privacy_screen_get (&pdev->dev,"eDP-1" );if (IS_ERR (privacy_screen) &&PTR_ERR (privacy_screen) == -EPROBE_DEFER )return true; =================================================I found it a little surprising though. From what I remembered from my early venture, was that
connector->base.namedid not get filled in at the timeintel_ddi_init_dp_connector()was called, but I guess I was remembering it wrong.Quoted 4 lines
Sean, same request to you, can you adjust your amdgpu patch to match the i915 changes in the attached patch and then check if a kernel with both changes still works ?
Defer to Sean since I do not have the AMD chromebook to test.
Thanks & Best Regards,
Rajat
Quoted 41 lines
Regards,
Hans
Quoted 34 lines
My comment applies to this driver as well as to i915. The reason being today there is only 1 internal display with privacy screen so we can just assume that there shall be only 1 privacy-screen and that shall apply to eDP-1/internal display. But dual display systems are not far enough out, and perhaps external monitors with inbuilt privacy-screens?
Essentially the gap today is that today on Chromeos ACPI side, the device GOOG0010 represents the privacy-screen attached to the internal display/eDP-1, but there isn't a way to make it clear in the i915 and now amdgpu code.
Thanks,
Rajat
Quoted 15 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +8
-1+if (!IS_ERR (privacy_screen)) { +drm_connector_attach_privacy_screen_provider (&aconnector->base, + privacy_screen); + }else if (PTR_ERR (privacy_screen) != -ENODEV ) { +drm_err (dev,"Error getting privacy screen, ret=%d\n" , +PTR_ERR (privacy_screen)); + }return ; + }dc_link_dp_get_max_link_enc_cap (aconnector->dc_link, &max_link_enc_cap); aconnector->mst_mgr.cbs = &dm_mst_cbs; --Sean Paul, Software Engineer, Google / Chromium OS
kernel test robot
build botI love your patch! Perhaps something to improve:
Hi Sean,
I love your patch! Perhaps something to improve:
[auto build test WARNING on drm/drm-next]
[also build test WARNING on drm-intel/for-linux-next drm-tip/drm-tip drm-exynos/exynos-drm-next next-20220309] [cannot apply to tegra-drm/drm/tegra/for-next airlied/drm-next v5.17-rc7]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Sean-Paul/drm-amdgpu-Add-support-for-drm_privacy_screen/20220309-230712 base: git://anongit.freedesktop.org/drm/drm drm-next config: arc-randconfig-r043-20220309 (https://download.01.org/0day-ci/archive/20220310/[email protected]/config) compiler: arceb-elf-gcc (GCC) 11.2.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/6fedd7f8ea75c68634df4fa3cbacb0ee5f2fc984
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Sean-Paul/drm-amdgpu-Add-support-for-drm_privacy_screen/20220309-230712 git checkout 6fedd7f8ea75c68634df4fa3cbacb0ee5f2fc984
# save the config file to linux build tree
mkdir build_dir
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross O=build_dir ARCH=arc SHELL=/bin/bash drivers/gpu/
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
In file included from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_mst_types.c:44:
drivers/gpu/drm/amd/amdgpu/../display/dmub/inc/dmub_cmd.h: In function 'dmub_rb_flush_pending':
drivers/gpu/drm/amd/amdgpu/../display/dmub/inc/dmub_cmd.h:2961:26: warning: variable 'temp' set but not used [-Wunused-but-set-variable]
2961 | uint64_t temp;
| ^~~~
In file included from include/linux/device.h:15,
from include/linux/acpi.h:15,
from include/linux/i2c.h:13,
from include/drm/drm_crtc.h:28,
from include/drm/drm_atomic.h:31,
from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_mst_types.c:26:
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_mst_types.c: In function 'amdgpu_dm_initialize_dp_connector':
>> drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgpu.h:41:22: warning: format '%d' expects argument of type 'int', but argument 3 has type 'long int' [-Wformat=]
41 | #define dev_fmt(fmt) "amdgpu: " fmt
| ^~~~~~~~~~
include/linux/dev_printk.h:110:30: note: in definition of macro 'dev_printk_index_wrap'
110 | _p_func(dev, fmt, ##__VA_ARGS__); \
| ^~~
include/linux/dev_printk.h:144:56: note: in expansion of macro 'dev_fmt'
144 | dev_printk_index_wrap(_dev_err, KERN_ERR, dev, dev_fmt(fmt), ##__VA_ARGS__)
| ^~~~~~~
include/drm/drm_print.h:425:9: note: in expansion of macro 'dev_err'
425 | dev_##level##type((drm)->dev, "[drm] " fmt, ##__VA_ARGS__)
| ^~~~
include/drm/drm_print.h:438:9: note: in expansion of macro '__drm_printk'
438 | __drm_printk((drm), err,, "*ERROR* " fmt, ##__VA_ARGS__)
| ^~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_mst_types.c:533:25: note: in expansion of macro 'drm_err'
533 | drm_err(dev, "Error getting privacy screen, ret=%d\n",
| ^~~~~~~
In file included from drivers/gpu/drm/amd/amdgpu/../display/dc/inc/dc_link_ddc.h:29,
from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_mst_types.c:39:
At top level:
drivers/gpu/drm/amd/amdgpu/../display/include/ddc_service_types.h:128:22: warning: 'SYNAPTICS_DEVICE_ID' defined but not used [-Wunused-const-variable=]
128 | static const uint8_t SYNAPTICS_DEVICE_ID[] = "SYNA";
| ^~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../display/include/ddc_service_types.h:125:22: warning: 'DP_SINK_DEVICE_STR_ID_2' defined but not used [-Wunused-const-variable=]
125 | static const uint8_t DP_SINK_DEVICE_STR_ID_2[] = {7, 1, 8, 7, 5, 0};
| ^~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../display/include/ddc_service_types.h:124:22: warning: 'DP_SINK_DEVICE_STR_ID_1' defined but not used [-Wunused-const-variable=]
124 | static const uint8_t DP_SINK_DEVICE_STR_ID_1[] = {7, 1, 8, 7, 3, 0};
| ^~~~~~~~~~~~~~~~~~~~~~~vim +41 drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgpu.h
539489fc91ea77 Aurabindo Pillai 2020-04-08 40539489fc91ea77 Aurabindo Pillai 2020-04-08 @41 #define dev_fmt(fmt) "amdgpu: " fmt 539489fc91ea77 Aurabindo Pillai 2020-04-08 42
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/[email protected]