| Message ID | 20220821062528.13416-1-tales.aparecida@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/amd/display: remove unneeded defines from bios parser | expand |
Applied. Thanks! Alex On Sun, Aug 21, 2022 at 2:41 AM Tales Aparecida <tales.aparecida@gmail.com> wrote: > > Removes DEFINEs that should have been removed after they were > introduced to ObjectID.h by the commit abea57d70e90 > ("drm/amdgpu: Add BRACKET_LAYOUT_ENUMs to ObjectID.h") > > Signed-off-by: Tales Aparecida <tales.aparecida@gmail.com> > --- > .../drm/amd/display/dc/bios/bios_parser2.c | 19 ------------------- > 1 file changed, 19 deletions(-) > > diff --git a/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c b/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c > index 09fbb7ad5362..ead4da11a992 100644 > --- a/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c > +++ b/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c > @@ -44,25 +44,6 @@ > > #include "bios_parser_common.h" > > -/* Temporarily add in defines until ObjectID.h patch is updated in a few days */ > -#ifndef GENERIC_OBJECT_ID_BRACKET_LAYOUT > -#define GENERIC_OBJECT_ID_BRACKET_LAYOUT 0x05 > -#endif /* GENERIC_OBJECT_ID_BRACKET_LAYOUT */ > - > -#ifndef GENERICOBJECT_BRACKET_LAYOUT_ENUM_ID1 > -#define GENERICOBJECT_BRACKET_LAYOUT_ENUM_ID1 \ > - (GRAPH_OBJECT_TYPE_GENERIC << OBJECT_TYPE_SHIFT |\ > - GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\ > - GENERIC_OBJECT_ID_BRACKET_LAYOUT << OBJECT_ID_SHIFT) > -#endif /* GENERICOBJECT_BRACKET_LAYOUT_ENUM_ID1 */ > - > -#ifndef GENERICOBJECT_BRACKET_LAYOUT_ENUM_ID2 > -#define GENERICOBJECT_BRACKET_LAYOUT_ENUM_ID2 \ > - (GRAPH_OBJECT_TYPE_GENERIC << OBJECT_TYPE_SHIFT |\ > - GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\ > - GENERIC_OBJECT_ID_BRACKET_LAYOUT << OBJECT_ID_SHIFT) > -#endif /* GENERICOBJECT_BRACKET_LAYOUT_ENUM_ID2 */ > - > #define DC_LOGGER \ > bp->base.ctx->logger > > -- > 2.37.2 >
diff --git a/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c b/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c index 09fbb7ad5362..ead4da11a992 100644 --- a/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c +++ b/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c @@ -44,25 +44,6 @@ #include "bios_parser_common.h" -/* Temporarily add in defines until ObjectID.h patch is updated in a few days */ -#ifndef GENERIC_OBJECT_ID_BRACKET_LAYOUT -#define GENERIC_OBJECT_ID_BRACKET_LAYOUT 0x05 -#endif /* GENERIC_OBJECT_ID_BRACKET_LAYOUT */ - -#ifndef GENERICOBJECT_BRACKET_LAYOUT_ENUM_ID1 -#define GENERICOBJECT_BRACKET_LAYOUT_ENUM_ID1 \ - (GRAPH_OBJECT_TYPE_GENERIC << OBJECT_TYPE_SHIFT |\ - GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\ - GENERIC_OBJECT_ID_BRACKET_LAYOUT << OBJECT_ID_SHIFT) -#endif /* GENERICOBJECT_BRACKET_LAYOUT_ENUM_ID1 */ - -#ifndef GENERICOBJECT_BRACKET_LAYOUT_ENUM_ID2 -#define GENERICOBJECT_BRACKET_LAYOUT_ENUM_ID2 \ - (GRAPH_OBJECT_TYPE_GENERIC << OBJECT_TYPE_SHIFT |\ - GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\ - GENERIC_OBJECT_ID_BRACKET_LAYOUT << OBJECT_ID_SHIFT) -#endif /* GENERICOBJECT_BRACKET_LAYOUT_ENUM_ID2 */ - #define DC_LOGGER \ bp->base.ctx->logger
Removes DEFINEs that should have been removed after they were introduced to ObjectID.h by the commit abea57d70e90 ("drm/amdgpu: Add BRACKET_LAYOUT_ENUMs to ObjectID.h") Signed-off-by: Tales Aparecida <tales.aparecida@gmail.com> --- .../drm/amd/display/dc/bios/bios_parser2.c | 19 ------------------- 1 file changed, 19 deletions(-)