Commit 21cc8aad authored by Matt Roper's avatar Matt Roper Committed by Rodrigo Vivi

drm/xe: Clean up xe_device_desc

Now that most of the characteristics of a device are associated with the
graphics and media IPs, the remaining contents of xe_device_desc can be
cleaned up a bit:

 * 'gt' is unused; drop it
 * DEV_INFO_FOR_EACH_FLAG only covers two flags and is only used in this
   one file; drop the unnecessary macro complexity
 * Convert .has_4tile to a single bitfield bit so that it can be packed
   with the other feature flags
 * Move 'platform' lower in the structure for better packing

Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Link: https://lore.kernel.org/r/20230406235621.1914492-10-matthew.d.roper@intel.comSigned-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 3713ed52
...@@ -24,11 +24,6 @@ ...@@ -24,11 +24,6 @@
#include "xe_pm.h" #include "xe_pm.h"
#include "xe_step.h" #include "xe_step.h"
#define DEV_INFO_FOR_EACH_FLAG(func) \
func(require_force_probe); \
func(is_dgfx); \
/* Keep has_* in alphabetical order */ \
struct xe_subplatform_desc { struct xe_subplatform_desc {
enum xe_subplatform subplatform; enum xe_subplatform subplatform;
const char *name; const char *name;
...@@ -46,23 +41,20 @@ struct xe_device_desc { ...@@ -46,23 +41,20 @@ struct xe_device_desc {
const struct xe_graphics_desc *graphics; const struct xe_graphics_desc *graphics;
const struct xe_media_desc *media; const struct xe_media_desc *media;
enum xe_platform platform;
const char *platform_name; const char *platform_name;
const struct xe_subplatform_desc *subplatforms; const struct xe_subplatform_desc *subplatforms;
const struct xe_gt_desc *extra_gts; const struct xe_gt_desc *extra_gts;
u8 gt; /* GT number, 0 if undefined */ enum xe_platform platform;
#define DEFINE_FLAG(name) u8 name:1
DEV_INFO_FOR_EACH_FLAG(DEFINE_FLAG);
#undef DEFINE_FLAG
u8 require_force_probe:1;
u8 is_dgfx:1;
/* /*
* FIXME: Xe doesn't care about presence/lack of 4tile since we can * FIXME: Xe doesn't care about presence/lack of 4tile since we can
* already determine that from the graphics IP version. This flag * already determine that from the graphics IP version. This flag
* should eventually move entirely into the display code's own logic. * should eventually move entirely into the display code's own logic.
*/ */
bool has_4tile; u8 has_4tile:1;
}; };
#define PLATFORM(x) \ #define PLATFORM(x) \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment