| Message ID | 1476969615-4421-1-git-send-email-deathsimple@vodafone.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Ups my fault. I actually didn't want to send this patch out. Please ignore. Christian. Am 20.10.2016 um 15:20 schrieb Christian König: > From: Harry Wentland <harry.wentland@amd.com> > > This reverts commit 4a183f66e543f697271f2ef717fb72aed071e968. > > Change-Id: I331ab0afccf55bd4e50890c64f354249993fb20a > Acked-by: Alex Deucher <alexander.deucher@amd.com> > Reviewed-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com> > --- > drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > 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 0258aba..9187b34 100644 > --- a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.c > +++ b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.c > @@ -1053,15 +1053,14 @@ static bool construct( > *************************************************/ > > pool->base.pipe_count = 3; > - pool->base.stream_enc_count = 3; > pool->base.underlay_pipe_index = 3; > > if (ASIC_REV_IS_STONEY(asic_id.hw_internal_rev)) { > pool->base.pipe_count = 2; > - pool->base.stream_enc_count = 2; > pool->base.underlay_pipe_index = 2; > } > > + pool->base.stream_enc_count = 3; > dc->public.caps.max_downscale_ratio = 150; > dc->public.caps.i2c_speed_in_khz = 100; >
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 0258aba..9187b34 100644 --- a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.c +++ b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.c @@ -1053,15 +1053,14 @@ static bool construct( *************************************************/ pool->base.pipe_count = 3; - pool->base.stream_enc_count = 3; pool->base.underlay_pipe_index = 3; if (ASIC_REV_IS_STONEY(asic_id.hw_internal_rev)) { pool->base.pipe_count = 2; - pool->base.stream_enc_count = 2; pool->base.underlay_pipe_index = 2; } + pool->base.stream_enc_count = 3; dc->public.caps.max_downscale_ratio = 150; dc->public.caps.i2c_speed_in_khz = 100;