Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/i915/quirks: pass dev_priv instead of drm dev to quirk code

Pass the type we want to simplify. No functional changes.

v2: s/dev_priv/i915/g (Chris)

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181017093539.5468-1-jani.nikula@intel.com

+18 -25
+1 -1
drivers/gpu/drm/i915/intel_display.c
··· 14935 14935 INIT_WORK(&dev_priv->atomic_helper.free_work, 14936 14936 intel_atomic_helper_free_state_worker); 14937 14937 14938 - intel_init_quirks(dev); 14938 + intel_init_quirks(dev_priv); 14939 14939 14940 14940 intel_init_pm(dev_priv); 14941 14941
+1 -1
drivers/gpu/drm/i915/intel_drv.h
··· 1982 1982 u32 *out_value); 1983 1983 1984 1984 /* intel_quirks.c */ 1985 - void intel_init_quirks(struct drm_device *dev); 1985 + void intel_init_quirks(struct drm_i915_private *dev_priv); 1986 1986 1987 1987 /* intel_runtime_pm.c */ 1988 1988 int intel_power_domains_init(struct drm_i915_private *);
+16 -23
drivers/gpu/drm/i915/intel_quirks.c
··· 10 10 /* 11 11 * Some machines (Lenovo U160) do not work with SSC on LVDS for some reason 12 12 */ 13 - static void quirk_ssc_force_disable(struct drm_device *dev) 13 + static void quirk_ssc_force_disable(struct drm_i915_private *i915) 14 14 { 15 - struct drm_i915_private *dev_priv = to_i915(dev); 16 - dev_priv->quirks |= QUIRK_LVDS_SSC_DISABLE; 15 + i915->quirks |= QUIRK_LVDS_SSC_DISABLE; 17 16 DRM_INFO("applying lvds SSC disable quirk\n"); 18 17 } 19 18 ··· 20 21 * A machine (e.g. Acer Aspire 5734Z) may need to invert the panel backlight 21 22 * brightness value 22 23 */ 23 - static void quirk_invert_brightness(struct drm_device *dev) 24 + static void quirk_invert_brightness(struct drm_i915_private *i915) 24 25 { 25 - struct drm_i915_private *dev_priv = to_i915(dev); 26 - dev_priv->quirks |= QUIRK_INVERT_BRIGHTNESS; 26 + i915->quirks |= QUIRK_INVERT_BRIGHTNESS; 27 27 DRM_INFO("applying inverted panel brightness quirk\n"); 28 28 } 29 29 30 30 /* Some VBT's incorrectly indicate no backlight is present */ 31 - static void quirk_backlight_present(struct drm_device *dev) 31 + static void quirk_backlight_present(struct drm_i915_private *i915) 32 32 { 33 - struct drm_i915_private *dev_priv = to_i915(dev); 34 - dev_priv->quirks |= QUIRK_BACKLIGHT_PRESENT; 33 + i915->quirks |= QUIRK_BACKLIGHT_PRESENT; 35 34 DRM_INFO("applying backlight present quirk\n"); 36 35 } 37 36 38 37 /* Toshiba Satellite P50-C-18C requires T12 delay to be min 800ms 39 38 * which is 300 ms greater than eDP spec T12 min. 40 39 */ 41 - static void quirk_increase_t12_delay(struct drm_device *dev) 40 + static void quirk_increase_t12_delay(struct drm_i915_private *i915) 42 41 { 43 - struct drm_i915_private *dev_priv = to_i915(dev); 44 - 45 - dev_priv->quirks |= QUIRK_INCREASE_T12_DELAY; 42 + i915->quirks |= QUIRK_INCREASE_T12_DELAY; 46 43 DRM_INFO("Applying T12 delay quirk\n"); 47 44 } 48 45 ··· 46 51 * GeminiLake NUC HDMI outputs require additional off time 47 52 * this allows the onboard retimer to correctly sync to signal 48 53 */ 49 - static void quirk_increase_ddi_disabled_time(struct drm_device *dev) 54 + static void quirk_increase_ddi_disabled_time(struct drm_i915_private *i915) 50 55 { 51 - struct drm_i915_private *dev_priv = to_i915(dev); 52 - 53 - dev_priv->quirks |= QUIRK_INCREASE_DDI_DISABLED_TIME; 56 + i915->quirks |= QUIRK_INCREASE_DDI_DISABLED_TIME; 54 57 DRM_INFO("Applying Increase DDI Disabled quirk\n"); 55 58 } 56 59 ··· 56 63 int device; 57 64 int subsystem_vendor; 58 65 int subsystem_device; 59 - void (*hook)(struct drm_device *dev); 66 + void (*hook)(struct drm_i915_private *i915); 60 67 }; 61 68 62 69 /* For systems that don't have a meaningful PCI subdevice/subvendor ID */ 63 70 struct intel_dmi_quirk { 64 - void (*hook)(struct drm_device *dev); 71 + void (*hook)(struct drm_i915_private *i915); 65 72 const struct dmi_system_id (*dmi_id_list)[]; 66 73 }; 67 74 ··· 147 154 { 0x3184, 0x1849, 0x2212, quirk_increase_ddi_disabled_time }, 148 155 }; 149 156 150 - void intel_init_quirks(struct drm_device *dev) 157 + void intel_init_quirks(struct drm_i915_private *i915) 151 158 { 152 - struct pci_dev *d = dev->pdev; 159 + struct pci_dev *d = i915->drm.pdev; 153 160 int i; 154 161 155 162 for (i = 0; i < ARRAY_SIZE(intel_quirks); i++) { ··· 160 167 q->subsystem_vendor == PCI_ANY_ID) && 161 168 (d->subsystem_device == q->subsystem_device || 162 169 q->subsystem_device == PCI_ANY_ID)) 163 - q->hook(dev); 170 + q->hook(i915); 164 171 } 165 172 for (i = 0; i < ARRAY_SIZE(intel_dmi_quirks); i++) { 166 173 if (dmi_check_system(*intel_dmi_quirks[i].dmi_id_list) != 0) 167 - intel_dmi_quirks[i].hook(dev); 174 + intel_dmi_quirks[i].hook(i915); 168 175 } 169 176 }