summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/display/dc/dce112
diff options
context:
space:
mode:
authorHarry Wentland2017-07-27 15:55:38 +0200
committerAlex Deucher2017-09-27 00:16:04 +0200
commit3be5262e353b8ab97c528bfc7d0dd3c820e4ba27 (patch)
tree99c0388f52e1aff8347d9c75dda1f077854ffe35 /drivers/gpu/drm/amd/display/dc/dce112
parentdrm/amd/display: Rename dc_stream to dc_stream_state (diff)
downloadkernel-qcow2-linux-3be5262e353b8ab97c528bfc7d0dd3c820e4ba27.tar.gz
kernel-qcow2-linux-3be5262e353b8ab97c528bfc7d0dd3c820e4ba27.tar.xz
kernel-qcow2-linux-3be5262e353b8ab97c528bfc7d0dd3c820e4ba27.zip
drm/amd/display: Rename more dc_surface stuff to plane_state
Signed-off-by: Harry Wentland <harry.wentland@amd.com> Reviewed-by: Tony Cheng <Tony.Cheng@amd.com> Acked-by: Harry Wentland <Harry.Wentland@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/dce112')
-rw-r--r--drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
index 68554d6edd94..420434d7283e 100644
--- a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
@@ -889,13 +889,13 @@ static bool dce112_validate_surface_sets(
int i;
for (i = 0; i < set_count; i++) {
- if (set[i].surface_count == 0)
+ if (set[i].plane_count == 0)
continue;
- if (set[i].surface_count > 1)
+ if (set[i].plane_count > 1)
return false;
- if (set[i].surfaces[0]->format
+ if (set[i].plane_states[0]->format
>= SURFACE_PIXEL_FORMAT_VIDEO_BEGIN)
return false;
}
@@ -1319,7 +1319,7 @@ static bool construct(
&res_create_funcs))
goto res_create_fail;
- dc->public.caps.max_surfaces = pool->base.pipe_count;
+ dc->public.caps.max_planes = pool->base.pipe_count;
/* Create hardware sequencer */
if (!dce112_hw_sequencer_construct(dc))