Commit 0f36d074 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: use DISPLAY_VER() instead of accessing match_info directly 



We've just set up device info in i915_driver_create() so we can use
DISPLAY_VER() intead of looking at match_info directly.

Semantically we want to check the display version instead of the
graphics version, and for the earlier platforms they are always the
same.

v2: Use DISPLAY_VER() instead of GRAPHICS_VER() (Ville)

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220628141005.226252-1-jani.nikula@intel.com
parent e61f294c

drivers/gpu/drm/i915/i915_driver.c

+1 −3
Original line number Diff line number Diff line
@@ -833,8 +833,6 @@ i915_driver_create(struct pci_dev *pdev, const struct pci_device_id *ent) 
 */

int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

{

	const struct intel_device_info *match_info =

		(struct intel_device_info *)ent->driver_data;

	struct drm_i915_private *i915;

	int ret;
@@ -843,7 +841,7 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		return PTR_ERR(i915);



	/* Disable nuclear pageflip by default on pre-ILK */

	if (!i915->params.nuclear_pageflip && match_info->graphics.ver < 5)

	if (!i915->params.nuclear_pageflip && DISPLAY_VER(i915) < 5)

		i915->drm.driver_features &= ~DRIVER_ATOMIC;



	ret = pci_enable_device(pdev);