drm/i915/quirks: pass dev_priv instead of drm dev to quirk code
Subsystems (2)
PATCH v2 1/1 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)
--- drivers/gpu/drm/i915/intel_display.c | 2 +- drivers/gpu/drm/i915/intel_drv.h | 2 +- drivers/gpu/drm/i915/intel_quirks.c | 39 +++++++++++++++--------------------- 3 files changed, 18 insertions(+), 25 deletions(-)
drivers/gpu/drm/i915/intel_display.c +1 -1
@@ -14914,7 +14914,7 @@ int intel_modeset_init(struct drm_device *dev)INIT_WORK (&dev_priv->atomic_helper.free_work, intel_atomic_helper_free_state_worker); -intel_init_quirks (dev); +intel_init_quirks (dev_priv);intel_init_pm (dev_priv);
drivers/gpu/drm/i915/intel_drv.h +1 -1
@@ -1982,7 +1982,7 @@ int intel_psr_wait_for_idle(const struct intel_crtc_state *new_crtc_state, u32 *out_value);/* intel_quirks.c */ -void intel_init_quirks (struct drm_device *dev); +void intel_init_quirks (struct drm_i915_private *dev_priv);/* intel_runtime_pm.c */ int intel_power_domains_init (struct drm_i915_private *);
drivers/gpu/drm/i915/intel_quirks.c +16 -23
@@ -10,10 +10,9 @@/* * Some machines (Lenovo U160) do not work with SSC on LVDS for some reason */ -static void quirk_ssc_force_disable (struct drm_device *dev) +static void quirk_ssc_force_disable (struct drm_i915_private *i915) { -struct drm_i915_private *dev_priv =to_i915 (dev); - dev_priv->quirks |=QUIRK_LVDS_SSC_DISABLE ; + i915->quirks |=QUIRK_LVDS_SSC_DISABLE ;DRM_INFO ("applying lvds SSC disable quirk\n" ); }
@@ -21,29 +20,25 @@ static void quirk_ssc_force_disable(struct drm_device *dev)* A machine (e.g. Acer Aspire 5734Z) may need to invert the panel backlight * brightness value */ -static void quirk_invert_brightness (struct drm_device *dev) +static void quirk_invert_brightness (struct drm_i915_private *i915) { -struct drm_i915_private *dev_priv =to_i915 (dev); - dev_priv->quirks |=QUIRK_INVERT_BRIGHTNESS ; + i915->quirks |=QUIRK_INVERT_BRIGHTNESS ;DRM_INFO ("applying inverted panel brightness quirk\n" ); }/* Some VBT's incorrectly indicate no backlight is present */ -static void quirk_backlight_present (struct drm_device *dev) +static void quirk_backlight_present (struct drm_i915_private *i915) { -struct drm_i915_private *dev_priv =to_i915 (dev); - dev_priv->quirks |=QUIRK_BACKLIGHT_PRESENT ; + i915->quirks |=QUIRK_BACKLIGHT_PRESENT ;DRM_INFO ("applying backlight present quirk\n" ); }/* Toshiba Satellite P50-C-18C requires T12 delay to be min 800ms * which is 300 ms greater than eDP spec T12 min. */ -static void quirk_increase_t12_delay (struct drm_device *dev) +static void quirk_increase_t12_delay (struct drm_i915_private *i915) { -struct drm_i915_private *dev_priv =to_i915 (dev); - - dev_priv->quirks |=QUIRK_INCREASE_T12_DELAY ; + i915->quirks |=QUIRK_INCREASE_T12_DELAY ;DRM_INFO ("Applying T12 delay quirk\n" ); }
@@ -51,11 +46,9 @@ static void quirk_increase_t12_delay(struct drm_device *dev)* GeminiLake NUC HDMI outputs require additional off time * this allows the onboard retimer to correctly sync to signal */ -static void quirk_increase_ddi_disabled_time (struct drm_device *dev) +static void quirk_increase_ddi_disabled_time (struct drm_i915_private *i915) { -struct drm_i915_private *dev_priv =to_i915 (dev); - - dev_priv->quirks |=QUIRK_INCREASE_DDI_DISABLED_TIME ; + i915->quirks |=QUIRK_INCREASE_DDI_DISABLED_TIME ;DRM_INFO ("Applying Increase DDI Disabled quirk\n" ); }
@@ -63,12 +56,12 @@ struct intel_quirk {int device;int subsystem_vendor;int subsystem_device; -void (*hook)(struct drm_device *dev); +void (*hook)(struct drm_i915_private *i915); };/* For systems that don't have a meaningful PCI subdevice/subvendor ID */ struct intel_dmi_quirk { -void (*hook)(struct drm_device *dev); +void (*hook)(struct drm_i915_private *i915);const struct dmi_system_id (*dmi_id_list)[]; };
@@ -154,9 +147,9 @@ static struct intel_quirk intel_quirks[] = { { 0x3184, 0x1849, 0x2212, quirk_increase_ddi_disabled_time }, }; -void intel_init_quirks (struct drm_device *dev) +void intel_init_quirks (struct drm_i915_private *i915) { -struct pci_dev *d = dev->pdev; +struct pci_dev *d = i915->drm.pdev;int i;for (i =0 ; i <ARRAY_SIZE (intel_quirks); i++) {
@@ -167,10 +160,10 @@ void intel_init_quirks(struct drm_device *dev) q->subsystem_vendor == PCI_ANY_ID) && (d->subsystem_device == q->subsystem_device || q->subsystem_device == PCI_ANY_ID)) - q->hook(dev); + q->hook(i915); }for (i =0 ; i <ARRAY_SIZE (intel_dmi_quirks); i++) {if (dmi_check_system (*intel_dmi_quirks[i].dmi_id_list) !=0 ) - intel_dmi_quirks[i].hook (dev); + intel_dmi_quirks[i].hook (i915); } }
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Jani Nikula (2018-10-17 10:35:39)
Quoted 6 lines
Pass the type we want to simplify. No functional changes.
v2: s/dev_priv/i915/g (Chris)
Cc Chris Wilson <[email protected]>Signed-off-by Jani Nikula <[email protected]>
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 8 lines · Chris Wilson
Quoting Jani Nikula (2018-10-17 10:35:39)
Quoted 6 lines
Pass the type we want to simplify. No functional changes.
v2: s/dev_priv/i915/g (Chris)
Cc Chris Wilson <[email protected]>Signed-off-by Jani Nikula <[email protected]>Reviewed-by Chris Wilson <[email protected]>
Thanks, pushed.
BR,
Jani.
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915/quirks: pass dev_priv instead of drm dev to quirk code
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915/quirks: pass dev_priv instead of drm dev to quirk code
URL : https://patchwork.freedesktop.org/series/51111/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4995 -> Patchwork_10485 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/51111/revisions/1/mbox/
== Known issues ==
Here are the changes found in Patchwork_10485 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@kms_flip@basic-flip-vs-dpms:
fi-skl-6700hq: PASS -> DMESG-WARN (fdo#105998)
igt@kms_flip@basic-flip-vs-modeset:
fi-hsw-4770r: PASS -> DMESG-WARN (fdo#105602)
==== Possible fixes ====
igt@drv_selftest@live_hangcheck:
fi-kbl-7560u: INCOMPLETE (fdo#108044) -> PASS
igt@kms_flip@basic-flip-vs-modeset:
fi-skl-6700hq: DMESG-WARN (fdo#105998) -> PASS fdo#105602 https://bugs.freedesktop.org/show_bug.cgi?id=105602
fdo#105998 https://bugs.freedesktop.org/show_bug.cgi?id=105998
fdo#108044 https://bugs.freedesktop.org/show_bug.cgi?id=108044
== Participating hosts (46 -> 42) ==
Missing (4): fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-hsw-4200u
== Build changes ==
* Linux: CI_DRM_4995 -> Patchwork_10485
CI_DRM_4995: 54f2281117133d77122fe452af3ea0bd5b6161aa @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4683: 7766b1e2348b32cc8ed58a972c6fd53b20279549 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10485: 329db538051ac65ec980cef352d143e6d9e1a273 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
329db538051a drm/i915/quirks: pass dev_priv instead of drm dev to quirk code
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10485/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for drm/i915/quirks: pass dev_priv instead of drm dev to quirk code
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915/quirks: pass dev_priv instead of drm dev to quirk code
URL : https://patchwork.freedesktop.org/series/51111/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4995_full -> Patchwork_10485_full =
== Summary - SUCCESS ==
No regressions found.
== Known issues ==
Here are the changes found in Patchwork_10485_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@drv_suspend@shrink:
shard-skl: PASS -> INCOMPLETE (fdo#106886)
igt@gem_exec_fence@basic-wait-all:
shard-apl: PASS -> INCOMPLETE (fdo#103927)
igt@gem_exec_schedule@pi-ringfull-blt:
shard-skl: NOTRUN -> FAIL (fdo#103158)
igt@gem_exec_schedule@pi-ringfull-bsd:
shard-apl: NOTRUN -> FAIL (fdo#103158)
igt@kms_atomic_transition@plane-all-modeset-transition:
shard-hsw: PASS -> DMESG-WARN (fdo#102614)
igt@kms_cursor_crc@cursor-256x85-sliding:
shard-apl: PASS -> FAIL (fdo#103232)
igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-pri-indfb-draw-render:
shard-glk: PASS -> DMESG-FAIL (fdo#106538)
igt@kms_setmode@basic:
shard-kbl: PASS -> FAIL (fdo#99912)
igt@kms_vblank@pipe-b-ts-continuation-idle-hang:
shard-glk: PASS -> DMESG-WARN (fdo#105763, fdo#106538) +1
igt@pm_rpm@pc8-residency:
shard-skl: SKIP -> INCOMPLETE (fdo#107807)
==== Possible fixes ====
igt@gem_userptr_blits@readonly-unsync:
shard-skl: INCOMPLETE (fdo#108074) -> PASS
igt@kms_atomic_interruptible@legacy-cursor:
shard-kbl: DMESG-WARN (fdo#108473) -> PASS
igt@kms_atomic_transition@1x-modeset-transitions:
shard-skl: FAIL (fdo#108470) -> PASS
igt@kms_available_modes_crc@available_mode_test_crc:
shard-apl: FAIL (fdo#106641) -> PASS
igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-b:
shard-glk: DMESG-WARN (fdo#107956) -> PASS
igt@kms_color@pipe-c-ctm-max:
shard-skl: FAIL (fdo#108147) -> PASS
igt@kms_flip@flip-vs-modeset-interruptible:
shard-kbl: DMESG-WARN (fdo#103313) -> PASS +2
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-blt:
shard-glk: FAIL (fdo#103167) -> PASS +1
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-gtt:
shard-apl: FAIL (fdo#103167) -> PASS +2
igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-pwrite:
shard-skl: FAIL (fdo#103167) -> PASS +1
igt@kms_plane_lowres@pipe-b-tiling-none:
shard-kbl: DMESG-WARN (fdo#105345, fdo#103313) -> PASS
igt@kms_plane_multiple@atomic-pipe-a-tiling-x:
shard-apl: FAIL (fdo#103166) -> PASS +1 fdo#102614 https://bugs.freedesktop.org/show_bug.cgi?id=102614
fdo#103158 https://bugs.freedesktop.org/show_bug.cgi?id=103158
fdo#103166 https://bugs.freedesktop.org/show_bug.cgi?id=103166
fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#103232 https://bugs.freedesktop.org/show_bug.cgi?id=103232
fdo#103313 https://bugs.freedesktop.org/show_bug.cgi?id=103313
fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
fdo#105345 https://bugs.freedesktop.org/show_bug.cgi?id=105345
fdo#105763 https://bugs.freedesktop.org/show_bug.cgi?id=105763
fdo#106538 https://bugs.freedesktop.org/show_bug.cgi?id=106538
fdo#106641 https://bugs.freedesktop.org/show_bug.cgi?id=106641
fdo#106886 https://bugs.freedesktop.org/show_bug.cgi?id=106886
fdo#107807 https://bugs.freedesktop.org/show_bug.cgi?id=107807
fdo#107956 https://bugs.freedesktop.org/show_bug.cgi?id=107956
fdo#108074 https://bugs.freedesktop.org/show_bug.cgi?id=108074
fdo#108147 https://bugs.freedesktop.org/show_bug.cgi?id=108147
fdo#108470 https://bugs.freedesktop.org/show_bug.cgi?id=108470
fdo#108473 https://bugs.freedesktop.org/show_bug.cgi?id=108473
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
== Participating hosts (6 -> 6) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_4995 -> Patchwork_10485
CI_DRM_4995: 54f2281117133d77122fe452af3ea0bd5b6161aa @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4683: 7766b1e2348b32cc8ed58a972c6fd53b20279549 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10485: 329db538051ac65ec980cef352d143e6d9e1a273 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10485/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx