* [PATCH 01/15] drm/amd/display: Fix incorrect backlight register offset for DCN
[not found] <20200916193635.5169-1-qingqing.zhuo@amd.com>
@ 2020-09-16 19:36 ` Qingqing Zhuo
2020-09-21 12:54 ` Sasha Levin
2020-09-16 19:36 ` [PATCH 07/15] drm/amd/display: Fix ODM policy implementation Qingqing Zhuo
2020-09-16 19:36 ` [PATCH 08/15] drm/amd/display: Increase timeout for DP Disable Qingqing Zhuo
2 siblings, 1 reply; 6+ messages in thread
From: Qingqing Zhuo @ 2020-09-16 19:36 UTC (permalink / raw)
To: amd-gfx
Cc: Harry.Wentland, Sunpeng.Li, Bhawanpreet.Lakha, Rodrigo.Siqueira,
Qingqing.Zhuo, Eryk.Brol, David Galiffi, stable
From: David Galiffi <David.Galiffi@amd.com>
[Why]
Typo in backlight refactor introduced wrong register offset.
[How]
SR(BIOS_SCRATCH_2) to NBIO_SR(BIOS_SCRATCH_2).
Signed-off-by: David Galiffi <David.Galiffi@amd.com>
Reviewed-by: Anthony Koo <Anthony.Koo@amd.com>
Acked-by: Qingqing Zhuo <qingqing.zhuo@amd.com>
Cc: <stable@vger.kernel.org>
---
drivers/gpu/drm/amd/display/dc/dce/dce_panel_cntl.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_panel_cntl.h b/drivers/gpu/drm/amd/display/dc/dce/dce_panel_cntl.h
index 99c68ca9c7e0..967d04d75b98 100644
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_panel_cntl.h
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_panel_cntl.h
@@ -54,7 +54,7 @@
SR(BL_PWM_CNTL2), \
SR(BL_PWM_PERIOD_CNTL), \
SR(BL_PWM_GRP1_REG_LOCK), \
- SR(BIOS_SCRATCH_2)
+ NBIO_SR(BIOS_SCRATCH_2)
#define DCE_PANEL_CNTL_SF(reg_name, field_name, post_fix)\
.field_name = reg_name ## __ ## field_name ## post_fix
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 01/15] drm/amd/display: Fix incorrect backlight register offset for DCN
2020-09-16 19:36 ` [PATCH 01/15] drm/amd/display: Fix incorrect backlight register offset for DCN Qingqing Zhuo
@ 2020-09-21 12:54 ` Sasha Levin
0 siblings, 0 replies; 6+ messages in thread
From: Sasha Levin @ 2020-09-21 12:54 UTC (permalink / raw)
To: Sasha Levin, Qingqing Zhuo, David Galiffi, amd-gfx
Cc: Harry.Wentland, Sunpeng.Li, stable, stable
Hi
[This is an automated email]
This commit has been processed because it contains a -stable tag.
The stable tag indicates that it's relevant for the following trees: all
The bot has tested the following trees: v5.8.10, v5.4.66, v4.19.146, v4.14.198, v4.9.236, v4.4.236.
v5.4.66: Failed to apply! Possible dependencies:
2b77dcc5e5aa ("drm/amd/display: rename core_dc to dc")
48af9b91b129 ("drm/amd/display: Don't allocate payloads if link lost")
4c1a1335dfe0 ("drm/amd/display: Driverside changes to support PSR in DMCUB")
7f7652ee8c8c ("drm/amd/display: enable single dp seamless boot")
904fb6e0f4e8 ("drm/amd/display: move panel power seq to new panel struct")
9ae1b27f31d0 ("drm/amd/display: fix hotplug during display off")
9dac88d8792a ("drm/amd/display: Add driver support for enabling PSR on DMCUB")
ab4a4072f260 ("drm/amd/display: exit PSR during detection")
d4252eee1f7c ("drm/amd/display: Add debugfs entry to force YUV420 output")
d462fcf5012b ("drm/amd/display: Update hdcp display config")
e0d08a40a63b ("drm/amd/display: Add debugfs entry for reading psr state")
e78a312f81c8 ("drm/amd/display: use requested_dispclk_khz instead of clk")
ef5a7d266e82 ("drm/amd/display: skip enable stream on disconnected display")
v4.19.146: Failed to apply! Possible dependencies:
1f6010a96273 ("drm/amd/display: Improve spelling, grammar, and formatting of amdgpu_dm.c comments")
813d20dccf93 ("drm/amd/display: Fix multi-thread writing to 1 state")
8c3db1284a01 ("drm/amdgpu: fill in amdgpu_dm_remove_sink_from_freesync_module")
904fb6e0f4e8 ("drm/amd/display: move panel power seq to new panel struct")
98e6436d3af5 ("drm/amd/display: Refactor FreeSync module")
a87fa9938749 ("drm/amd/display: Build stream update and plane updates in dm")
a94d5569b232 ("drm/amd: Add DM DMCU support")
b8592b48450b ("drm/amd/display: Initial documentation for AMDgpu DC")
dc88b4a684d2 ("drm/amd/display: make clk mgr soc specific")
eb3dc8978596 ("drm/amd/display: Use private obj helpers for dm_atomic_state")
v4.14.198: Failed to apply! Possible dependencies:
1296423bf23c ("drm/amd/display: define DC_LOGGER for logger")
1b0c0f9dc5ca ("drm/amdgpu: move userptr BOs to CPU domain during CS v2")
3fe89771cb0a ("drm/amdgpu: stop reserving the BO in the MMU callback v3")
4562236b3bc0 ("drm/amd/dc: Add dc display driver (v2)")
60de1c1740f3 ("drm/amdgpu: use a rw_semaphore for MMU notifiers")
74c49c7ac14f ("drm/amdgpu/display: Add calcs code for DCN")
904fb6e0f4e8 ("drm/amd/display: move panel power seq to new panel struct")
9a18999640fa ("drm/amdgpu: move MMU notifier related defines to amdgpu_mn.h")
9cca0b8e5df0 ("drm/amdgpu: move amdgpu_cs_sysvm_access_required into find_mapping")
a216ab09955d ("drm/amdgpu: fix userptr put_page handling")
b72cf4fca2bb ("drm/amdgpu: move taking mmap_sem into get_user_pages v2")
ca666a3c298f ("drm/amdgpu: stop using BO status for user pages")
dc88b4a684d2 ("drm/amd/display: make clk mgr soc specific")
f3efec54ed6a ("drm/amd/display: Allow option to use worst-case watermark")
v4.9.236: Failed to apply! Possible dependencies:
1296423bf23c ("drm/amd/display: define DC_LOGGER for logger")
1cec20f0ea0e ("dma-buf: Restart reservation_object_wait_timeout_rcu() after writes")
248a1d6f1ac4 ("drm/amd: fix include notation and remove -Iinclude/drm flag")
4562236b3bc0 ("drm/amd/dc: Add dc display driver (v2)")
74c49c7ac14f ("drm/amdgpu/display: Add calcs code for DCN")
78010cd9736e ("dma-buf/fence: add an lockdep_assert_held()")
904fb6e0f4e8 ("drm/amd/display: move panel power seq to new panel struct")
dc88b4a684d2 ("drm/amd/display: make clk mgr soc specific")
f3efec54ed6a ("drm/amd/display: Allow option to use worst-case watermark")
f54d1867005c ("dma-buf: Rename struct fence to dma_fence")
fedf54132d24 ("dma-buf: Restart reservation_object_get_fences_rcu() after writes")
v4.4.236: Failed to apply! Possible dependencies:
0f477c6dea70 ("staging/android/sync: add sync_fence_create_dma")
1296423bf23c ("drm/amd/display: define DC_LOGGER for logger")
1f7371b2a5fa ("drm/amd/powerplay: add basic powerplay framework")
248a1d6f1ac4 ("drm/amd: fix include notation and remove -Iinclude/drm flag")
288912cb95d1 ("drm/amdgpu: use $(src) in Makefile (v2)")
375fb53ec1be ("staging: android: replace explicit NULL comparison")
395dec6f6bc5 ("Documentation: add doc for sync_file_get_fence()")
4325198180e5 ("drm/amdgpu: remove GART page addr array")
4562236b3bc0 ("drm/amd/dc: Add dc display driver (v2)")
62304fb1fc08 ("dma-buf/sync_file: de-stage sync_file")
74c49c7ac14f ("drm/amdgpu/display: Add calcs code for DCN")
904fb6e0f4e8 ("drm/amd/display: move panel power seq to new panel struct")
a1d29476d666 ("drm/amdgpu: optionally enable GART debugfs file")
a8fe58cec351 ("drm/amd: add ACP driver support")
b70f014d58b9 ("drm/amdgpu: change default sched jobs to 32")
c784c82a3fd6 ("Documentation: add Sync File doc")
d4cab38e153d ("staging/android: prepare sync_file for de-staging")
d7fdb0ae9d11 ("staging/android: rename sync_fence to sync_file")
dc88b4a684d2 ("drm/amd/display: make clk mgr soc specific")
f3efec54ed6a ("drm/amd/display: Allow option to use worst-case watermark")
f54d1867005c ("dma-buf: Rename struct fence to dma_fence")
fac8434dab96 ("Documentation: Fix some grammar mistakes in sync_file.txt")
fdba11f4079e ("drm/amdgpu: move all Kconfig options to amdgpu/Kconfig")
NOTE: The patch will not be queued to stable trees until it is upstream.
How should we proceed with this patch?
--
Thanks
Sasha
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 07/15] drm/amd/display: Fix ODM policy implementation
[not found] <20200916193635.5169-1-qingqing.zhuo@amd.com>
2020-09-16 19:36 ` [PATCH 01/15] drm/amd/display: Fix incorrect backlight register offset for DCN Qingqing Zhuo
@ 2020-09-16 19:36 ` Qingqing Zhuo
2020-09-21 12:54 ` Sasha Levin
2020-09-16 19:36 ` [PATCH 08/15] drm/amd/display: Increase timeout for DP Disable Qingqing Zhuo
2 siblings, 1 reply; 6+ messages in thread
From: Qingqing Zhuo @ 2020-09-16 19:36 UTC (permalink / raw)
To: amd-gfx
Cc: Harry.Wentland, Sunpeng.Li, Bhawanpreet.Lakha, Rodrigo.Siqueira,
Qingqing.Zhuo, Eryk.Brol, Wesley Chalmers, stable
From: Wesley Chalmers <Wesley.Chalmers@amd.com>
[WHY]
Only the leftmost ODM pipe should be offset when scaling. A previous
code change was intended to implement this policy, but a section of code
was overlooked.
Signed-off-by: Wesley Chalmers <Wesley.Chalmers@amd.com>
Reviewed-by: Aric Cyr <Aric.Cyr@amd.com>
Acked-by: Qingqing Zhuo <qingqing.zhuo@amd.com>
Cc: <stable@vger.kernel.org>
---
drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
index 4cea9344d8aa..e430148e47cf 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
@@ -785,14 +785,15 @@ static void calculate_recout(struct pipe_ctx *pipe_ctx)
/*
* Only the leftmost ODM pipe should be offset by a nonzero distance
*/
- if (!pipe_ctx->prev_odm_pipe)
+ if (!pipe_ctx->prev_odm_pipe) {
data->recout.x = stream->dst.x;
- else
- data->recout.x = 0;
- if (stream->src.x < surf_clip.x)
- data->recout.x += (surf_clip.x - stream->src.x) * stream->dst.width
+ if (stream->src.x < surf_clip.x)
+ data->recout.x += (surf_clip.x - stream->src.x) * stream->dst.width
/ stream->src.width;
+ } else
+ data->recout.x = 0;
+
data->recout.width = surf_clip.width * stream->dst.width / stream->src.width;
if (data->recout.width + data->recout.x > stream->dst.x + stream->dst.width)
data->recout.width = stream->dst.x + stream->dst.width - data->recout.x;
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 07/15] drm/amd/display: Fix ODM policy implementation
2020-09-16 19:36 ` [PATCH 07/15] drm/amd/display: Fix ODM policy implementation Qingqing Zhuo
@ 2020-09-21 12:54 ` Sasha Levin
0 siblings, 0 replies; 6+ messages in thread
From: Sasha Levin @ 2020-09-21 12:54 UTC (permalink / raw)
To: Sasha Levin, Qingqing Zhuo, Wesley Chalmers, amd-gfx
Cc: Harry.Wentland, Sunpeng.Li, stable, stable
Hi
[This is an automated email]
This commit has been processed because it contains a -stable tag.
The stable tag indicates that it's relevant for the following trees: all
The bot has tested the following trees: v5.8.10, v5.4.66, v4.19.146, v4.14.198, v4.9.236, v4.4.236.
v5.4.66: Failed to apply! Possible dependencies:
2b77dcc5e5aa ("drm/amd/display: rename core_dc to dc")
48af9b91b129 ("drm/amd/display: Don't allocate payloads if link lost")
4c1a1335dfe0 ("drm/amd/display: Driverside changes to support PSR in DMCUB")
7f7652ee8c8c ("drm/amd/display: enable single dp seamless boot")
904fb6e0f4e8 ("drm/amd/display: move panel power seq to new panel struct")
9ae1b27f31d0 ("drm/amd/display: fix hotplug during display off")
9dac88d8792a ("drm/amd/display: Add driver support for enabling PSR on DMCUB")
ab4a4072f260 ("drm/amd/display: exit PSR during detection")
b739ab3a4fe6 ("drm/amd/display: Fix incorrect backlight register offset for DCN")
d4252eee1f7c ("drm/amd/display: Add debugfs entry to force YUV420 output")
d462fcf5012b ("drm/amd/display: Update hdcp display config")
e0d08a40a63b ("drm/amd/display: Add debugfs entry for reading psr state")
e78a312f81c8 ("drm/amd/display: use requested_dispclk_khz instead of clk")
ef5a7d266e82 ("drm/amd/display: skip enable stream on disconnected display")
v4.19.146: Failed to apply! Possible dependencies:
1f6010a96273 ("drm/amd/display: Improve spelling, grammar, and formatting of amdgpu_dm.c comments")
813d20dccf93 ("drm/amd/display: Fix multi-thread writing to 1 state")
8c3db1284a01 ("drm/amdgpu: fill in amdgpu_dm_remove_sink_from_freesync_module")
904fb6e0f4e8 ("drm/amd/display: move panel power seq to new panel struct")
98e6436d3af5 ("drm/amd/display: Refactor FreeSync module")
a87fa9938749 ("drm/amd/display: Build stream update and plane updates in dm")
a94d5569b232 ("drm/amd: Add DM DMCU support")
b739ab3a4fe6 ("drm/amd/display: Fix incorrect backlight register offset for DCN")
b8592b48450b ("drm/amd/display: Initial documentation for AMDgpu DC")
dc88b4a684d2 ("drm/amd/display: make clk mgr soc specific")
eb3dc8978596 ("drm/amd/display: Use private obj helpers for dm_atomic_state")
v4.14.198: Failed to apply! Possible dependencies:
1296423bf23c ("drm/amd/display: define DC_LOGGER for logger")
1b0c0f9dc5ca ("drm/amdgpu: move userptr BOs to CPU domain during CS v2")
3fe89771cb0a ("drm/amdgpu: stop reserving the BO in the MMU callback v3")
4562236b3bc0 ("drm/amd/dc: Add dc display driver (v2)")
60de1c1740f3 ("drm/amdgpu: use a rw_semaphore for MMU notifiers")
74c49c7ac14f ("drm/amdgpu/display: Add calcs code for DCN")
904fb6e0f4e8 ("drm/amd/display: move panel power seq to new panel struct")
9a18999640fa ("drm/amdgpu: move MMU notifier related defines to amdgpu_mn.h")
9cca0b8e5df0 ("drm/amdgpu: move amdgpu_cs_sysvm_access_required into find_mapping")
a216ab09955d ("drm/amdgpu: fix userptr put_page handling")
b72cf4fca2bb ("drm/amdgpu: move taking mmap_sem into get_user_pages v2")
b739ab3a4fe6 ("drm/amd/display: Fix incorrect backlight register offset for DCN")
ca666a3c298f ("drm/amdgpu: stop using BO status for user pages")
dc88b4a684d2 ("drm/amd/display: make clk mgr soc specific")
f3efec54ed6a ("drm/amd/display: Allow option to use worst-case watermark")
v4.9.236: Failed to apply! Possible dependencies:
1296423bf23c ("drm/amd/display: define DC_LOGGER for logger")
1cec20f0ea0e ("dma-buf: Restart reservation_object_wait_timeout_rcu() after writes")
248a1d6f1ac4 ("drm/amd: fix include notation and remove -Iinclude/drm flag")
4562236b3bc0 ("drm/amd/dc: Add dc display driver (v2)")
74c49c7ac14f ("drm/amdgpu/display: Add calcs code for DCN")
78010cd9736e ("dma-buf/fence: add an lockdep_assert_held()")
904fb6e0f4e8 ("drm/amd/display: move panel power seq to new panel struct")
b739ab3a4fe6 ("drm/amd/display: Fix incorrect backlight register offset for DCN")
dc88b4a684d2 ("drm/amd/display: make clk mgr soc specific")
f3efec54ed6a ("drm/amd/display: Allow option to use worst-case watermark")
f54d1867005c ("dma-buf: Rename struct fence to dma_fence")
fedf54132d24 ("dma-buf: Restart reservation_object_get_fences_rcu() after writes")
v4.4.236: Failed to apply! Possible dependencies:
0f477c6dea70 ("staging/android/sync: add sync_fence_create_dma")
1296423bf23c ("drm/amd/display: define DC_LOGGER for logger")
1f7371b2a5fa ("drm/amd/powerplay: add basic powerplay framework")
248a1d6f1ac4 ("drm/amd: fix include notation and remove -Iinclude/drm flag")
288912cb95d1 ("drm/amdgpu: use $(src) in Makefile (v2)")
375fb53ec1be ("staging: android: replace explicit NULL comparison")
395dec6f6bc5 ("Documentation: add doc for sync_file_get_fence()")
4325198180e5 ("drm/amdgpu: remove GART page addr array")
4562236b3bc0 ("drm/amd/dc: Add dc display driver (v2)")
62304fb1fc08 ("dma-buf/sync_file: de-stage sync_file")
74c49c7ac14f ("drm/amdgpu/display: Add calcs code for DCN")
904fb6e0f4e8 ("drm/amd/display: move panel power seq to new panel struct")
a1d29476d666 ("drm/amdgpu: optionally enable GART debugfs file")
a8fe58cec351 ("drm/amd: add ACP driver support")
b70f014d58b9 ("drm/amdgpu: change default sched jobs to 32")
b739ab3a4fe6 ("drm/amd/display: Fix incorrect backlight register offset for DCN")
c784c82a3fd6 ("Documentation: add Sync File doc")
d4cab38e153d ("staging/android: prepare sync_file for de-staging")
d7fdb0ae9d11 ("staging/android: rename sync_fence to sync_file")
dc88b4a684d2 ("drm/amd/display: make clk mgr soc specific")
f3efec54ed6a ("drm/amd/display: Allow option to use worst-case watermark")
f54d1867005c ("dma-buf: Rename struct fence to dma_fence")
fac8434dab96 ("Documentation: Fix some grammar mistakes in sync_file.txt")
fdba11f4079e ("drm/amdgpu: move all Kconfig options to amdgpu/Kconfig")
NOTE: The patch will not be queued to stable trees until it is upstream.
How should we proceed with this patch?
--
Thanks
Sasha
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 08/15] drm/amd/display: Increase timeout for DP Disable
[not found] <20200916193635.5169-1-qingqing.zhuo@amd.com>
2020-09-16 19:36 ` [PATCH 01/15] drm/amd/display: Fix incorrect backlight register offset for DCN Qingqing Zhuo
2020-09-16 19:36 ` [PATCH 07/15] drm/amd/display: Fix ODM policy implementation Qingqing Zhuo
@ 2020-09-16 19:36 ` Qingqing Zhuo
2020-09-21 12:54 ` Sasha Levin
2 siblings, 1 reply; 6+ messages in thread
From: Qingqing Zhuo @ 2020-09-16 19:36 UTC (permalink / raw)
To: amd-gfx
Cc: Harry.Wentland, Sunpeng.Li, Bhawanpreet.Lakha, Rodrigo.Siqueira,
Qingqing.Zhuo, Eryk.Brol, Wesley Chalmers, stable
From: Wesley Chalmers <Wesley.Chalmers@amd.com>
[WHY]
When disabling DP video, the current REG_WAIT timeout
of 50ms is too low for certain cases with very high
VSYNC intervals.
[HOW]
Increase the timeout to 102ms, so that
refresh rates as low as 10Hz can be handled properly.
Signed-off-by: Wesley Chalmers <Wesley.Chalmers@amd.com>
Reviewed-by: Aric Cyr <Aric.Cyr@amd.com>
Acked-by: Qingqing Zhuo <qingqing.zhuo@amd.com>
Cc: <stable@vger.kernel.org>
---
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.c
index 9cf139be3f40..f70fcadf1ee5 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.c
@@ -896,10 +896,10 @@ void enc1_stream_encoder_dp_blank(
*/
REG_UPDATE(DP_VID_STREAM_CNTL, DP_VID_STREAM_DIS_DEFER, 2);
/* Larger delay to wait until VBLANK - use max retry of
- * 10us*5000=50ms. This covers 41.7ms of minimum 24 Hz mode +
+ * 10us*10200=102ms. This covers 100.0ms of minimum 10 Hz mode +
* a little more because we may not trust delay accuracy.
*/
- max_retries = DP_BLANK_MAX_RETRY * 250;
+ max_retries = DP_BLANK_MAX_RETRY * 501;
/* disable DP stream */
REG_UPDATE(DP_VID_STREAM_CNTL, DP_VID_STREAM_ENABLE, 0);
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 08/15] drm/amd/display: Increase timeout for DP Disable
2020-09-16 19:36 ` [PATCH 08/15] drm/amd/display: Increase timeout for DP Disable Qingqing Zhuo
@ 2020-09-21 12:54 ` Sasha Levin
0 siblings, 0 replies; 6+ messages in thread
From: Sasha Levin @ 2020-09-21 12:54 UTC (permalink / raw)
To: Sasha Levin, Qingqing Zhuo, Wesley Chalmers, amd-gfx
Cc: Harry.Wentland, Sunpeng.Li, stable, stable
Hi
[This is an automated email]
This commit has been processed because it contains a -stable tag.
The stable tag indicates that it's relevant for the following trees: all
The bot has tested the following trees: v5.8.10, v5.4.66, v4.19.146, v4.14.198, v4.9.236, v4.4.236.
v5.8.10: Build OK!
v5.4.66: Build OK!
v4.19.146: Failed to apply! Possible dependencies:
3af91bb15093 ("drm/amd/display: Increase DP blank timeout from 30 ms to 50 ms")
v4.14.198: Failed to apply! Possible dependencies:
0c41891c81c0 ("drm/amd/display: Refactor stream encoder for HW review")
1b0c0f9dc5ca ("drm/amdgpu: move userptr BOs to CPU domain during CS v2")
3fe89771cb0a ("drm/amdgpu: stop reserving the BO in the MMU callback v3")
4562236b3bc0 ("drm/amd/dc: Add dc display driver (v2)")
587cdfe9463e ("drm/amd/display: Rename trasnform to dpp for dcn's")
5aff86c1b325 ("drm/amd/display: Implement input gamma LUT")
60de1c1740f3 ("drm/amdgpu: use a rw_semaphore for MMU notifiers")
70ccab604049 ("drm/amdgpu/display: Add core dc support for DCN")
9a18999640fa ("drm/amdgpu: move MMU notifier related defines to amdgpu_mn.h")
9a70eba7f2c6 ("drm/amd/display: consolidate dce8-11.2 display clock code")
9cca0b8e5df0 ("drm/amdgpu: move amdgpu_cs_sysvm_access_required into find_mapping")
a216ab09955d ("drm/amdgpu: fix userptr put_page handling")
b1a4eb992c17 ("drm/amd/display: enable diags compilation")
b51adc77e220 ("drm/amd/display: Only blank DCN when we have set_blank implementation")
b72cf4fca2bb ("drm/amdgpu: move taking mmap_sem into get_user_pages v2")
ca666a3c298f ("drm/amdgpu: stop using BO status for user pages")
v4.9.236: Failed to apply! Possible dependencies:
0c41891c81c0 ("drm/amd/display: Refactor stream encoder for HW review")
1cec20f0ea0e ("dma-buf: Restart reservation_object_wait_timeout_rcu() after writes")
248a1d6f1ac4 ("drm/amd: fix include notation and remove -Iinclude/drm flag")
4562236b3bc0 ("drm/amd/dc: Add dc display driver (v2)")
587cdfe9463e ("drm/amd/display: Rename trasnform to dpp for dcn's")
5aff86c1b325 ("drm/amd/display: Implement input gamma LUT")
70ccab604049 ("drm/amdgpu/display: Add core dc support for DCN")
78010cd9736e ("dma-buf/fence: add an lockdep_assert_held()")
9a70eba7f2c6 ("drm/amd/display: consolidate dce8-11.2 display clock code")
b1a4eb992c17 ("drm/amd/display: enable diags compilation")
b51adc77e220 ("drm/amd/display: Only blank DCN when we have set_blank implementation")
f54d1867005c ("dma-buf: Rename struct fence to dma_fence")
fedf54132d24 ("dma-buf: Restart reservation_object_get_fences_rcu() after writes")
v4.4.236: Failed to apply! Possible dependencies:
0c41891c81c0 ("drm/amd/display: Refactor stream encoder for HW review")
0f477c6dea70 ("staging/android/sync: add sync_fence_create_dma")
1f7371b2a5fa ("drm/amd/powerplay: add basic powerplay framework")
248a1d6f1ac4 ("drm/amd: fix include notation and remove -Iinclude/drm flag")
288912cb95d1 ("drm/amdgpu: use $(src) in Makefile (v2)")
375fb53ec1be ("staging: android: replace explicit NULL comparison")
395dec6f6bc5 ("Documentation: add doc for sync_file_get_fence()")
4325198180e5 ("drm/amdgpu: remove GART page addr array")
4562236b3bc0 ("drm/amd/dc: Add dc display driver (v2)")
587cdfe9463e ("drm/amd/display: Rename trasnform to dpp for dcn's")
5aff86c1b325 ("drm/amd/display: Implement input gamma LUT")
62304fb1fc08 ("dma-buf/sync_file: de-stage sync_file")
70ccab604049 ("drm/amdgpu/display: Add core dc support for DCN")
9a70eba7f2c6 ("drm/amd/display: consolidate dce8-11.2 display clock code")
a1d29476d666 ("drm/amdgpu: optionally enable GART debugfs file")
a8fe58cec351 ("drm/amd: add ACP driver support")
b1a4eb992c17 ("drm/amd/display: enable diags compilation")
b51adc77e220 ("drm/amd/display: Only blank DCN when we have set_blank implementation")
b70f014d58b9 ("drm/amdgpu: change default sched jobs to 32")
c784c82a3fd6 ("Documentation: add Sync File doc")
d4cab38e153d ("staging/android: prepare sync_file for de-staging")
d7fdb0ae9d11 ("staging/android: rename sync_fence to sync_file")
f54d1867005c ("dma-buf: Rename struct fence to dma_fence")
fac8434dab96 ("Documentation: Fix some grammar mistakes in sync_file.txt")
fdba11f4079e ("drm/amdgpu: move all Kconfig options to amdgpu/Kconfig")
NOTE: The patch will not be queued to stable trees until it is upstream.
How should we proceed with this patch?
--
Thanks
Sasha
^ permalink raw reply [flat|nested] 6+ messages in thread