diff options
| author | Leon Elazar <leon.elazar@amd.com> | 2017-01-11 14:33:36 -0500 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-09-26 17:09:56 -0400 |
| commit | cc0cb445ae56890a322abe2cc8df63b1ccab74fb (patch) | |
| tree | 713287dc962863f7e3ef8afe80d492ba61898c8e /drivers/gpu/drm/amd/display/dc/dce/dce_opp.c | |
| parent | 7a1c37e00a660b380fe258fed54fd5af6735814e (diff) | |
| download | linux-cc0cb445ae56890a322abe2cc8df63b1ccab74fb.tar.gz linux-cc0cb445ae56890a322abe2cc8df63b1ccab74fb.tar.bz2 linux-cc0cb445ae56890a322abe2cc8df63b1ccab74fb.zip | |
drm/amd/display: Fixing some fallout from dc_target removal
Also avoid allocating memory dce110_set_output_transfer_func
if not needed
Signed-off-by: Leon Elazar <leon.elazar@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/dce/dce_opp.c')
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dce/dce_opp.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_opp.c b/drivers/gpu/drm/amd/display/dc/dce/dce_opp.c index 167f523df657..061de9e8249d 100644 --- a/drivers/gpu/drm/amd/display/dc/dce/dce_opp.c +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_opp.c @@ -973,6 +973,10 @@ bool dce110_opp_construct(struct dce110_opp *opp110, opp110->base.inst = inst; + opp110->base.regamma_params = dm_alloc(sizeof(struct pwl_params)); + if (opp110->base.regamma_params == NULL) + return false; + opp110->regs = regs; opp110->opp_shift = opp_shift; opp110->opp_mask = opp_mask; @@ -982,6 +986,9 @@ bool dce110_opp_construct(struct dce110_opp *opp110, void dce110_opp_destroy(struct output_pixel_processor **opp) { + dm_free((*opp)->regamma_params); + (*opp)->regamma_params = NULL; + dm_free(FROM_DCE11_OPP(*opp)); *opp = NULL; } |