Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 351c4dbe authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/amdgpu: Use per-device driver_features to disable atomic 



Disable atomic on a per-device basis instead of for all devices.
Made possible by the new device.driver_features thing.

Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: "David (ChunMing) Zhou" <David1.Zhou@amd.com>
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Michel Dänzer <michel@daenzer.net>
Suggested-by: default avatarMichel Dänzer <michel@daenzer.net>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180913163147.27900-2-ville.syrjala@linux.intel.com


Reviewed-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1feb64c4

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

+4 −8
Original line number Diff line number Diff line
@@ -816,17 +816,13 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, 
	if (ret)

		return ret;



	/* warn the user if they mix atomic and non-atomic capable GPUs */

	if ((kms_driver.driver_features & DRIVER_ATOMIC) && !supports_atomic)

		DRM_ERROR("Mixing atomic and non-atomic capable GPUs!\n");

	/* support atomic early so the atomic debugfs stuff gets created */

	if (supports_atomic)

		kms_driver.driver_features |= DRIVER_ATOMIC;



	dev = drm_dev_alloc(&kms_driver, &pdev->dev);

	if (IS_ERR(dev))

		return PTR_ERR(dev);



	if (!supports_atomic)

		dev->driver_features &= ~DRIVER_ATOMIC;



	ret = pci_enable_device(pdev);

	if (ret)

		goto err_free;
@@ -1078,7 +1074,7 @@ amdgpu_get_crtc_scanout_position(struct drm_device *dev, unsigned int pipe, 


static struct drm_driver kms_driver = {

	.driver_features =

	    DRIVER_USE_AGP |

	    DRIVER_USE_AGP | DRIVER_ATOMIC |

	    DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM |

	    DRIVER_PRIME | DRIVER_RENDER | DRIVER_MODESET | DRIVER_SYNCOBJ,

	.load = amdgpu_driver_load_kms,