diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2022-08-29 16:18:23 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2022-08-31 17:21:51 +0300 |
| commit | 6493d4a96fc3d16ae946c886f51b74ddfc58f204 (patch) | |
| tree | 4253189ff8b42a475f4992acd89320dbaae6e474 | |
| parent | deb141510f6e55c6d5fe3b5b77fe3df8e57dce61 (diff) | |
| download | linux-6493d4a96fc3d16ae946c886f51b74ddfc58f204.tar.xz | |
drm/i915: move quirks under display sub-struct
Move display quirk related members under drm_i915_private display
sub-struct.
Prefer adding anonymous sub-structs even for single members that aren't
our own structs.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/c4a1a5657023efe24a362c67daf79260f179f0eb.1661779055.git.jani.nikula@intel.com
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_display_core.h | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_quirks.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 1 |
3 files changed, 6 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h b/drivers/gpu/drm/i915/display/intel_display_core.h index 31fd05a04bff..577ab7765fa9 100644 --- a/drivers/gpu/drm/i915/display/intel_display_core.h +++ b/drivers/gpu/drm/i915/display/intel_display_core.h @@ -366,6 +366,10 @@ struct intel_display { } pps; struct { + unsigned long mask; + } quirks; + + struct { enum { I915_SAGV_UNKNOWN = 0, I915_SAGV_DISABLED, diff --git a/drivers/gpu/drm/i915/display/intel_quirks.c b/drivers/gpu/drm/i915/display/intel_quirks.c index 41caeda795cb..6e48d3bcdfec 100644 --- a/drivers/gpu/drm/i915/display/intel_quirks.c +++ b/drivers/gpu/drm/i915/display/intel_quirks.c @@ -11,7 +11,7 @@ static void intel_set_quirk(struct drm_i915_private *i915, enum intel_quirk_id quirk) { - i915->quirks |= BIT(quirk); + i915->display.quirks.mask |= BIT(quirk); } /* @@ -224,5 +224,5 @@ void intel_init_quirks(struct drm_i915_private *i915) bool intel_has_quirk(struct drm_i915_private *i915, enum intel_quirk_id quirk) { - return i915->quirks & BIT(quirk); + return i915->display.quirks.mask & BIT(quirk); } diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index c486a1dcfb07..47f2629da226 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -291,7 +291,6 @@ struct drm_i915_private { unsigned short pch_id; unsigned long gem_quirks; - unsigned long quirks; struct drm_atomic_state *modeset_restore_state; struct drm_modeset_acquire_ctx reset_ctx; |