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
This commit is contained in:
Jani Nikula 2022-08-29 16:18:23 +03:00
parent deb141510f
commit 6493d4a96f
3 changed files with 6 additions and 3 deletions

View file

@ -365,6 +365,10 @@ struct intel_display {
struct mutex mutex;
} pps;
struct {
unsigned long mask;
} quirks;
struct {
enum {
I915_SAGV_UNKNOWN = 0,

View file

@ -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);
}

View file

@ -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;