From: Andrey Grodzovsky <Andrey.Grodzovsky@xxxxxxx>
Change-Id: I9e23df476423f216ac52727a288913ccb9c2ce94
Signed-off-by: Andrey Grodzovsky <Andrey.Grodzovsky at amd.com>
---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c
index 6a2548e8082b..fd03e4f7231b 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c
@@ -413,6 +413,7 @@ static bool get_fb_info(
return true;
}
static void fill_plane_attributes_from_fb(
+ struct amdgpu_device *adev,
struct dc_surface *surface,
const struct amdgpu_framebuffer *amdgpu_fb, bool addReq)
{
@@ -455,6 +456,7 @@ static void fill_plane_attributes_from_fb(
memset(&surface->tiling_info, 0, sizeof(surface->tiling_info));
+ /* Fill GFX8 params */
if (AMDGPU_TILING_GET(tiling_flags, ARRAY_MODE) == DC_ARRAY_2D_TILED_THIN1)
{
unsigned bankw, bankh, mtaspect, tile_split, num_banks;
@@ -545,6 +547,7 @@ static void fill_gamma_from_crtc(
}
static void fill_plane_attributes(
+ struct amdgpu_device *adev,
struct dc_surface *surface,
struct drm_plane_state *state, bool addrReq)
{
@@ -554,6 +557,7 @@ static void fill_plane_attributes(
fill_rects_from_plane_state(state, surface);
fill_plane_attributes_from_fb(
+ crtc->dev->dev_private,
surface,
amdgpu_fb,
addrReq);
@@ -668,7 +672,11 @@ static void dm_dc_surface_commit(
}
/* Surface programming */
- fill_plane_attributes(dc_surface, crtc->primary->state, true);
+ fill_plane_attributes(
+ crtc->dev->dev_private,
+ dc_surface,
+ crtc->primary->state,
+ true);
if (crtc->mode.private_flags &
AMDGPU_CRTC_MODE_PRIVATE_FLAGS_GAMMASET) {
/* reset trigger of gamma */
@@ -3167,6 +3175,7 @@ int amdgpu_dm_atomic_check(struct drm_device *dev,
surface = dc_create_surface(dc);
fill_plane_attributes(
+ crtc->dev->dev_private,
surface,
plane_state,
false);
--
2.9.3
