On 2018-04-06 03:49 PM, sunpeng.li at amd.com wrote: > From: "Leo (Sunpeng) Li" <sunpeng.li at amd.com> > > Input transfer function creation is now done when the plane is created. > This is done within the following change: > > Author: Anthony Koo <Anthony.Koo at amd.com> > drm/amd/display: Have DC manage its own allocation of gamma > > Therefore, we no longer need to create it when filling in the plane > attributes. > > Change-Id: I9f43d71e5018947ed3e3b6b2bb56cd87fbf06b32 > Signed-off-by: Leo (Sunpeng) Li <sunpeng.li at amd.com> Reviewed-by: Harry Wentland <harry.wentland at amd.com> I'll merge it to amd-stg with this week's promotion (the one that introduced the bug). I'll drop the Change-Id when I do. Harry > --- > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 -------- > 1 file changed, 8 deletions(-) > > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > index a3ca21b..689380d 100644 > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > @@ -2053,7 +2053,6 @@ static int fill_plane_attributes(struct amdgpu_device *adev, > const struct amdgpu_framebuffer *amdgpu_fb = > to_amdgpu_framebuffer(plane_state->fb); > const struct drm_crtc *crtc = plane_state->crtc; > - struct dc_transfer_func *input_tf; > int ret = 0; > > if (!fill_rects_from_plane_state(plane_state, dc_plane_state)) > @@ -2067,13 +2066,6 @@ static int fill_plane_attributes(struct amdgpu_device *adev, > if (ret) > return ret; > > - input_tf = dc_create_transfer_func(); > - > - if (input_tf == NULL) > - return -ENOMEM; > - > - dc_plane_state->in_transfer_func = input_tf; > - > /* > * Always set input transfer function, since plane state is refreshed > * every time. >
