diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0523-drm-amd-dal-Pass-in-adapter_service-to-stream-encode.patch')
| -rw-r--r-- | common/recipes-kernel/linux/files/0523-drm-amd-dal-Pass-in-adapter_service-to-stream-encode.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0523-drm-amd-dal-Pass-in-adapter_service-to-stream-encode.patch b/common/recipes-kernel/linux/files/0523-drm-amd-dal-Pass-in-adapter_service-to-stream-encode.patch new file mode 100644 index 00000000..cf03f5c6 --- /dev/null +++ b/common/recipes-kernel/linux/files/0523-drm-amd-dal-Pass-in-adapter_service-to-stream-encode.patch @@ -0,0 +1,55 @@ +From 0a37f0789f0a7bd36972ad1efa94419dd968c240 Mon Sep 17 00:00:00 2001 +From: Chris Park <Chris.Park@amd.com> +Date: Wed, 25 Nov 2015 17:50:31 -0500 +Subject: [PATCH 0523/1110] drm/amd/dal: Pass in adapter_service to stream + encoder + +Fix BSOD issue. + +Signed-off-by: Harry Wentland <harry.wentland@amd.com> +Acked-by: Harry Wentland <harry.wentland@amd.com> +--- + drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.c | 1 + + drivers/gpu/drm/amd/dal/dc/dce110/dce110_stream_encoder.c | 1 + + drivers/gpu/drm/amd/dal/dc/dce110/dce110_stream_encoder.h | 1 + + 3 files changed, 3 insertions(+) + +diff --git a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.c b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.c +index 6eb8152..205cd22 100644 +--- a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.c ++++ b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.c +@@ -628,6 +628,7 @@ bool dce110_construct_resource_pool( + /* TODO: rework fragile code*/ + enc_init_data.stream_engine_id = i; + enc_init_data.ctx = dc->ctx; ++ enc_init_data.adapter_service = adapter_serv; + if (pool->stream_engines.u_all & 1 << i) { + pool->stream_enc[i] = dce110_stream_encoder_create( + &enc_init_data); +diff --git a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_stream_encoder.c b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_stream_encoder.c +index 37781ab..55be9f6 100644 +--- a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_stream_encoder.c ++++ b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_stream_encoder.c +@@ -55,6 +55,7 @@ static void construct( + { + enc->ctx = init->ctx; + enc->id = init->stream_engine_id; ++ enc->adapter_service = init->adapter_service; + } + + static void update_avi_info_packet( +diff --git a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_stream_encoder.h b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_stream_encoder.h +index 9c0302a..285d70e 100644 +--- a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_stream_encoder.h ++++ b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_stream_encoder.h +@@ -28,6 +28,7 @@ + + struct stream_enc_init_data { + enum engine_id stream_engine_id; ++ struct adapter_service *adapter_service; + struct dc_context *ctx; + }; + +-- +2.7.4 + |