From: Tony Cheng <tony.cheng@amd.com>
Date: Thu, 19 Jan 2017 14:46:26 -0500
Subject: drm/amd/display: clean up redundant logic
Git-commit: e4e354b02fa8b6d53ec65bd5dbd27d014e4e752f
Patch-mainline: v4.15-rc1
References: FATE#326289 FATE#326079 FATE#326049 FATE#322398 FATE#326166
Signed-off-by: Tony Cheng <tony.cheng@amd.com>
Reviewed-by: Yongqiang Sun <yongqiang.sun@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Acked-by: Petr Tesarik <ptesarik@suse.com>
---
drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 23 ++++++++---------------
drivers/gpu/drm/amd/display/dc/dc.h | 1 -
2 files changed, 8 insertions(+), 16 deletions(-)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_surface.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_surface.c
@@ -121,26 +121,20 @@ const struct dc_surface_status *dc_surfa
const struct dc_surface *dc_surface)
{
struct dc_surface_status *surface_status;
- struct core_surface *core_surface;
+ struct core_surface *core_surface = DC_SURFACE_TO_CORE(dc_surface);;
struct core_dc *core_dc;
int i;
- if (dc_surface == NULL)
- return NULL;
-
- core_surface = DC_SURFACE_TO_CORE(dc_surface);
-
- if (core_surface == NULL || core_surface->ctx == NULL)
- return NULL;
+ if (!dc_surface ||
+ !core_surface->ctx ||
+ !core_surface->ctx->dc) {
+ ASSERT(0);
+ return NULL; /* remove this if above assert never hit */
+ }
surface_status = &core_surface->status;
-
- if (core_surface->ctx == NULL || core_surface->ctx->dc == NULL)
- return NULL;
-
core_dc = DC_TO_CORE(core_surface->ctx->dc);
-
if (core_dc->current_context == NULL)
return NULL;
@@ -149,8 +143,7 @@ const struct dc_surface_status *dc_surfa
struct pipe_ctx *pipe_ctx =
&core_dc->current_context->res_ctx.pipe_ctx[i];
- if (pipe_ctx->surface !=
- DC_SURFACE_TO_CORE(dc_surface))
+ if (pipe_ctx->surface != core_surface)
continue;
core_dc->hwss.update_pending_status(pipe_ctx);
--- a/drivers/gpu/drm/amd/display/dc/dc.h
+++ b/drivers/gpu/drm/amd/display/dc/dc.h
@@ -335,7 +335,6 @@ struct dc_transfer_func *dc_create_trans
struct dc_flip_addrs {
struct dc_plane_address address;
bool flip_immediate;
- /* TODO: DCC format info */
/* TODO: add flip duration for FreeSync */
};