drm/amd/display: Remove grph_object_id.c and move function to bios_parser

Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Reviewed-by: Jordan Lazare <Jordan.Lazare@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/basics/Makefile b/drivers/gpu/drm/amd/display/dc/basics/Makefile
index 6af8c8a9ad8096a1521ac908a143767d21a3c61b..bca33bd9a0d250d55734cc0d440839937dcbd71d 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/basics/Makefile
+++ b/drivers/gpu/drm/amd/display/dc/basics/Makefile
@@ -24,7 +24,7 @@
 # It provides the general basic services required by other DAL
 # subcomponents.
 
-BASICS = conversion.o fixpt31_32.o fixpt32_32.o grph_object_id.o \
+BASICS = conversion.o fixpt31_32.o fixpt32_32.o \
        logger.o log_helpers.o vector.o
 
 AMD_DAL_BASICS = $(addprefix $(AMDDALPATH)/dc/basics/,$(BASICS))

diff --git a/drivers/gpu/drm/amd/display/dc/basics/grph_object_id.c b/drivers/gpu/drm/amd/display/dc/basics/grph_object_id.c
deleted file mode 100644 (file)
index 1478225..0000000
--- a/drivers/gpu/drm/amd/display/dc/basics/grph_object_id.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright 2012-15 Advanced Micro Devices, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors: AMD
- *
- */
-
-#include "dm_services.h"
-#include "include/grph_object_id.h"
-
-static bool dal_graphics_object_id_is_valid(struct graphics_object_id id)
-{
-       bool rc = true;
-
-       switch (id.type) {
-       case OBJECT_TYPE_UNKNOWN:
-               rc = false;
-               break;
-       case OBJECT_TYPE_GPU:
-       case OBJECT_TYPE_ENGINE:
-               /* do NOT check for id.id == 0 */
-               if (id.enum_id == ENUM_ID_UNKNOWN)
-                       rc = false;
-               break;
-       default:
-               if (id.id == 0 || id.enum_id == ENUM_ID_UNKNOWN)
-                       rc = false;
-               break;
-       }
-
-       return rc;
-}
-
-bool dal_graphics_object_id_is_equal(
-       struct graphics_object_id id1,
-       struct graphics_object_id id2)
-{
-       if (false == dal_graphics_object_id_is_valid(id1)) {
-               dm_output_to_console(
-               "%s: Warning: comparing invalid object 'id1'!\n", __func__);
-               return false;
-       }
-
-       if (false == dal_graphics_object_id_is_valid(id2)) {
-               dm_output_to_console(
-               "%s: Warning: comparing invalid object 'id2'!\n", __func__);
-               return false;
-       }
-
-       if (id1.id == id2.id && id1.enum_id == id2.enum_id
-               && id1.type == id2.type)
-               return true;
-
-       return false;
-}
-
-

diff --git a/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c b/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c
index 86e6438c5cf35a6c0f981524454d58af417a183d..21fb78e8048d81e4a2371dbba2d3165f5e4da776 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c
+++ b/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c
@@ -2254,6 +2254,52 @@ static enum bp_result get_gpio_i2c_info(struct bios_parser *bp,
        return BP_RESULT_OK;
 }
 
+static bool dal_graphics_object_id_is_valid(struct graphics_object_id id)
+{
+       bool rc = true;
+
+       switch (id.type) {
+       case OBJECT_TYPE_UNKNOWN:
+               rc = false;
+               break;
+       case OBJECT_TYPE_GPU:
+       case OBJECT_TYPE_ENGINE:
+               /* do NOT check for id.id == 0 */
+               if (id.enum_id == ENUM_ID_UNKNOWN)
+                       rc = false;
+               break;
+       default:
+               if (id.id == 0 || id.enum_id == ENUM_ID_UNKNOWN)
+                       rc = false;
+               break;
+       }
+
+       return rc;
+}
+
+static bool dal_graphics_object_id_is_equal(
+       struct graphics_object_id id1,
+       struct graphics_object_id id2)
+{
+       if (false == dal_graphics_object_id_is_valid(id1)) {
+               dm_output_to_console(
+               "%s: Warning: comparing invalid object 'id1'!\n", __func__);
+               return false;
+       }
+
+       if (false == dal_graphics_object_id_is_valid(id2)) {
+               dm_output_to_console(
+               "%s: Warning: comparing invalid object 'id2'!\n", __func__);
+               return false;
+       }
+
+       if (id1.id == id2.id && id1.enum_id == id2.enum_id
+               && id1.type == id2.type)
+               return true;
+
+       return false;
+}
+
 static ATOM_OBJECT *get_bios_object(struct bios_parser *bp,
        struct graphics_object_id id)
 {

diff --git a/drivers/gpu/drm/amd/display/include/grph_object_id.h b/drivers/gpu/drm/amd/display/include/grph_object_id.h
index 03a7a9ca95eac6de24698679790fefba984a7c2a..c4197432eb7c34542952364fc4027ff4819f63f3 100644 (file)
--- a/drivers/gpu/drm/amd/display/include/grph_object_id.h
+++ b/drivers/gpu/drm/amd/display/include/grph_object_id.h
@@ -233,10 +233,6 @@ static inline struct graphics_object_id dal_graphics_object_id_init(
        return result;
 }
 
-bool dal_graphics_object_id_is_equal(
-       struct graphics_object_id id1,
-       struct graphics_object_id id2);
-
 /* Based on internal data members memory layout */
 static inline uint32_t dal_graphics_object_id_to_uint(
        struct graphics_object_id id)