mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-09 05:31:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

drm/i915/display: remove the display platform enum as unnecessary

Browse Source 
The display platform enums are not really needed for anything. Remove.

Without the enum, PLATFORM_UNINITIALIZED is also no longer needed for
keeping the first enum 0. Also need to switch from sp->subplatform to
sp->pciidlist as the check for array end.

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/d20966f1d7a69a1e66768110b427be2fc611bcd2.1730144869.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
Jani Nikula
2024-10-28 21:48:41 +02:00
parent 3705e3f48e
commit e994c6f0b8
2 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpu/drm/i915/display/intel_display_device.c
View File

@@ -33,7 +33,6 @@ struct stepping_desc {
struct subplatform_desc {
struct intel_display_platforms platforms;
enum intel_display_platform subplatform;
const char *name;
const u16 *pciidlist;
struct stepping_desc step_info;
@@ -41,12 +40,10 @@ struct subplatform_desc {
#define SUBPLATFORM(_platform, _subplatform) \
.platforms._platform##_##_subplatform = 1, \
.subplatform = (INTEL_DISPLAY_##_platform##_##_subplatform), \
.name = #_subplatform
struct platform_desc {
struct intel_display_platforms platforms;
enum intel_display_platform platform;
const char *name;
const struct subplatform_desc *subplatforms;
const struct intel_display_device_info *info; /* NULL for GMD ID */
@@ -55,7 +52,6 @@ struct platform_desc {
#define PLATFORM(_platform) \
.platforms._platform = 1, \
.platform = (INTEL_DISPLAY_##_platform), \
.name = #_platform
#define ID(id) (id)
@@ -1467,7 +1463,7 @@ find_subplatform_desc(struct pci_dev *pdev, const struct platform_desc *desc)
const struct subplatform_desc *sp;
const u16 *id;
for (sp = desc->subplatforms; sp && sp->subplatform; sp++)
for (sp = desc->subplatforms; sp && sp->pciidlist; sp++)
for (id = sp->pciidlist; *id; id++)
if (*id == pdev->device)
return sp;
@@ -1584,17 +1580,15 @@ void intel_display_device_probe(struct drm_i915_private *i915)
&DISPLAY_INFO(i915)->__runtime_defaults,
sizeof(*DISPLAY_RUNTIME_INFO(i915)));
drm_WARN_ON(&i915->drm, !desc->platform || !desc->name ||
drm_WARN_ON(&i915->drm, !desc->name ||
!display_platforms_weight(&desc->platforms));
DISPLAY_RUNTIME_INFO(i915)->platform = desc->platform;
display->platform = desc->platforms;
subdesc = find_subplatform_desc(pdev, desc);
if (subdesc) {
drm_WARN_ON(&i915->drm, !subdesc->subplatform || !subdesc->name ||
drm_WARN_ON(&i915->drm, !subdesc->name ||
!display_platforms_weight(&subdesc->platforms));
DISPLAY_RUNTIME_INFO(i915)->subplatform = subdesc->subplatform;
display_platforms_or(&display->platform, &subdesc->platforms);

12
drivers/gpu/drm/i915/display/intel_display_device.h
View File

@@ -21,7 +21,6 @@ struct drm_printer;
* platform.
*/
#define INTEL_DISPLAY_PLATFORMS(func) \
func(PLATFORM_UNINITIALIZED) \
/* Display ver 2 */ \
func(i830) \
func(i845g) \
@@ -99,14 +98,6 @@ struct drm_printer;
/* Display ver 30 (based on GMD ID) */ \
func(pantherlake)
#define __ENUM(x) INTEL_DISPLAY_ ## x,
enum intel_display_platform {
INTEL_DISPLAY_PLATFORMS(__ENUM)
};
#undef __ENUM
#define __MEMBER(name) unsigned long name:1;
#define __COUNT(x) 1 +
@@ -234,9 +225,6 @@ struct intel_display_platforms {
INTEL_DISPLAY_STEP(__i915) >= (since) && INTEL_DISPLAY_STEP(__i915) < (until))
struct intel_display_runtime_info {
enum intel_display_platform platform;
enum intel_display_platform subplatform;
struct intel_display_ip_ver {
u16 ver;
u16 rel;