diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0268-drm-amdgpu-don-t-enable-disable-display-twice-on-sus.patch')
| -rw-r--r-- | common/recipes-kernel/linux/files/0268-drm-amdgpu-don-t-enable-disable-display-twice-on-sus.patch | 159 |
1 files changed, 0 insertions, 159 deletions
diff --git a/common/recipes-kernel/linux/files/0268-drm-amdgpu-don-t-enable-disable-display-twice-on-sus.patch b/common/recipes-kernel/linux/files/0268-drm-amdgpu-don-t-enable-disable-display-twice-on-sus.patch deleted file mode 100644 index 1824e90f..00000000 --- a/common/recipes-kernel/linux/files/0268-drm-amdgpu-don-t-enable-disable-display-twice-on-sus.patch +++ /dev/null @@ -1,159 +0,0 @@ -From 633ed3df9a65614f14e756424aaff0d317b1b637 Mon Sep 17 00:00:00 2001 -From: Alex Deucher <alexander.deucher@amd.com> -Date: Wed, 10 Jun 2015 11:52:00 -0400 -Subject: [PATCH 0268/1050] drm/amdgpu: don't enable/disable display twice on - suspend/resume -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -We were doing it in the common code and in the IP specific code. -Remove the IP specific code. The common code handles the -ordering properly. - -Reviewed-by: Christian König <christian.koenig@amd.com> -Signed-off-by: Alex Deucher <alexander.deucher@amd.com> ---- - drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 18 ------------------ - drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 18 ------------------ - drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 18 ------------------ - 3 files changed, 54 deletions(-) - -diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c -index 192dfe5..5cde635 100644 ---- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c -+++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c -@@ -3017,16 +3017,8 @@ static int dce_v10_0_hw_fini(void *handle) - - static int dce_v10_0_suspend(void *handle) - { -- struct drm_connector *connector; - struct amdgpu_device *adev = (struct amdgpu_device *)handle; - -- drm_kms_helper_poll_disable(adev->ddev); -- -- /* turn off display hw */ -- list_for_each_entry(connector, &adev->ddev->mode_config.connector_list, head) { -- drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF); -- } -- - amdgpu_atombios_scratch_regs_save(adev); - - dce_v10_0_hpd_fini(adev); -@@ -3036,7 +3028,6 @@ static int dce_v10_0_suspend(void *handle) - - static int dce_v10_0_resume(void *handle) - { -- struct drm_connector *connector; - struct amdgpu_device *adev = (struct amdgpu_device *)handle; - - dce_v10_0_init_golden_registers(adev); -@@ -3057,15 +3048,6 @@ static int dce_v10_0_resume(void *handle) - /* initialize hpd */ - dce_v10_0_hpd_init(adev); - -- /* blat the mode back in */ -- drm_helper_resume_force_mode(adev->ddev); -- /* turn on display hw */ -- list_for_each_entry(connector, &adev->ddev->mode_config.connector_list, head) { -- drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON); -- } -- -- drm_kms_helper_poll_enable(adev->ddev); -- - return 0; - } - -diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c -index a530c5d..95efd98 100644 ---- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c -+++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c -@@ -3015,16 +3015,8 @@ static int dce_v11_0_hw_fini(void *handle) - - static int dce_v11_0_suspend(void *handle) - { -- struct drm_connector *connector; - struct amdgpu_device *adev = (struct amdgpu_device *)handle; - -- drm_kms_helper_poll_disable(adev->ddev); -- -- /* turn off display hw */ -- list_for_each_entry(connector, &adev->ddev->mode_config.connector_list, head) { -- drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF); -- } -- - amdgpu_atombios_scratch_regs_save(adev); - - dce_v11_0_hpd_fini(adev); -@@ -3034,7 +3026,6 @@ static int dce_v11_0_suspend(void *handle) - - static int dce_v11_0_resume(void *handle) - { -- struct drm_connector *connector; - struct amdgpu_device *adev = (struct amdgpu_device *)handle; - - dce_v11_0_init_golden_registers(adev); -@@ -3056,15 +3047,6 @@ static int dce_v11_0_resume(void *handle) - /* initialize hpd */ - dce_v11_0_hpd_init(adev); - -- /* blat the mode back in */ -- drm_helper_resume_force_mode(adev->ddev); -- /* turn on display hw */ -- list_for_each_entry(connector, &adev->ddev->mode_config.connector_list, head) { -- drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON); -- } -- -- drm_kms_helper_poll_enable(adev->ddev); -- - return 0; - } - -diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c -index 9e8b9f1..72c27ac 100644 ---- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c -+++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c -@@ -2948,16 +2948,8 @@ static int dce_v8_0_hw_fini(void *handle) - - static int dce_v8_0_suspend(void *handle) - { -- struct drm_connector *connector; - struct amdgpu_device *adev = (struct amdgpu_device *)handle; - -- drm_kms_helper_poll_disable(adev->ddev); -- -- /* turn off display hw */ -- list_for_each_entry(connector, &adev->ddev->mode_config.connector_list, head) { -- drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF); -- } -- - amdgpu_atombios_scratch_regs_save(adev); - - dce_v8_0_hpd_fini(adev); -@@ -2967,7 +2959,6 @@ static int dce_v8_0_suspend(void *handle) - - static int dce_v8_0_resume(void *handle) - { -- struct drm_connector *connector; - struct amdgpu_device *adev = (struct amdgpu_device *)handle; - - amdgpu_atombios_scratch_regs_restore(adev); -@@ -2986,15 +2977,6 @@ static int dce_v8_0_resume(void *handle) - /* initialize hpd */ - dce_v8_0_hpd_init(adev); - -- /* blat the mode back in */ -- drm_helper_resume_force_mode(adev->ddev); -- /* turn on display hw */ -- list_for_each_entry(connector, &adev->ddev->mode_config.connector_list, head) { -- drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON); -- } -- -- drm_kms_helper_poll_enable(adev->ddev); -- - return 0; - } - --- -1.9.1 - |