openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/amd/display: Remove fb_location parameter from get_fb_info 

It's dead code.

Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Michel Dänzer 2017-10-26 16:56:35 +02:00 committed by Alex Deucher
parent 8fb0450c94
commit 9817d5f52d
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
View File

@ -1762,8 +1762,7 @@ static bool fill_rects_from_plane_state(const struct drm_plane_state *state,
return true; return true;
} }
static int get_fb_info(const struct amdgpu_framebuffer *amdgpu_fb, static int get_fb_info(const struct amdgpu_framebuffer *amdgpu_fb,
uint64_t *tiling_flags, uint64_t *tiling_flags)
uint64_t *fb_location)
{ {
struct amdgpu_bo *rbo = gem_to_amdgpu_bo(amdgpu_fb->obj); struct amdgpu_bo *rbo = gem_to_amdgpu_bo(amdgpu_fb->obj);
int r = amdgpu_bo_reserve(rbo, false); int r = amdgpu_bo_reserve(rbo, false);
@ -1775,9 +1774,6 @@ static int get_fb_info(const struct amdgpu_framebuffer *amdgpu_fb,
return r; return r;
} }
if (fb_location)
*fb_location = amdgpu_bo_gpu_offset(rbo);
if (tiling_flags) if (tiling_flags)
amdgpu_bo_get_tiling_flags(rbo, tiling_flags); amdgpu_bo_get_tiling_flags(rbo, tiling_flags);
@ -1788,8 +1784,7 @@ static int get_fb_info(const struct amdgpu_framebuffer *amdgpu_fb,
static int fill_plane_attributes_from_fb(struct amdgpu_device *adev, static int fill_plane_attributes_from_fb(struct amdgpu_device *adev,
struct dc_plane_state *plane_state, struct dc_plane_state *plane_state,
const struct amdgpu_framebuffer *amdgpu_fb, const struct amdgpu_framebuffer *amdgpu_fb)
bool addReq)
{ {
uint64_t tiling_flags; uint64_t tiling_flags;
uint64_t fb_location = 0; uint64_t fb_location = 0;
@ -1801,8 +1796,7 @@ static int fill_plane_attributes_from_fb(struct amdgpu_device *adev,
ret = get_fb_info( ret = get_fb_info(
amdgpu_fb, amdgpu_fb,
&tiling_flags, &tiling_flags);
addReq == true ? &fb_location:NULL);
if (ret) if (ret)
return ret; return ret;
@ -1972,8 +1966,7 @@ static void fill_gamma_from_crtc_state(const struct drm_crtc_state *crtc_state,
static int fill_plane_attributes(struct amdgpu_device *adev, static int fill_plane_attributes(struct amdgpu_device *adev,
struct dc_plane_state *dc_plane_state, struct dc_plane_state *dc_plane_state,
struct drm_plane_state *plane_state, struct drm_plane_state *plane_state,
struct drm_crtc_state *crtc_state, struct drm_crtc_state *crtc_state)
bool addrReq)
{ {
const struct amdgpu_framebuffer *amdgpu_fb = const struct amdgpu_framebuffer *amdgpu_fb =
to_amdgpu_framebuffer(plane_state->fb); to_amdgpu_framebuffer(plane_state->fb);
@ -1987,8 +1980,7 @@ static int fill_plane_attributes(struct amdgpu_device *adev,
ret = fill_plane_attributes_from_fb( ret = fill_plane_attributes_from_fb(
crtc->dev->dev_private, crtc->dev->dev_private,
dc_plane_state, dc_plane_state,
amdgpu_fb, amdgpu_fb);
addrReq);
if (ret) if (ret)
return ret; return ret;
@ -4660,8 +4652,7 @@ static int dm_update_planes_state(struct dc *dc,
new_plane_crtc->dev->dev_private, new_plane_crtc->dev->dev_private,
dm_new_plane_state->dc_state, dm_new_plane_state->dc_state,
new_plane_state, new_plane_state,
new_crtc_state, new_crtc_state);
false);
if (ret) if (ret)
return ret; return ret;