Commit 2716a02f authored by Dave Airlie's avatar Dave Airlie Committed by Dave Airlie
Browse files

drm: call driver load function after initialising AGP 



needed to intel chipset flushing

Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent 7ffa05e0

drivers/char/drm/drm_stub.c

+4 −4
Original line number Diff line number Diff line
@@ -98,10 +98,6 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev, 


	dev->driver = driver;



	if (dev->driver->load)

		if ((retcode = dev->driver->load(dev, ent->driver_data)))

			goto error_out_unreg;



	if (drm_core_has_AGP(dev)) {

		if (drm_device_is_agp(dev))

			dev->agp = drm_agp_init(dev);
@@ -120,6 +116,10 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev, 
		}

	}



	if (dev->driver->load)

		if ((retcode = dev->driver->load(dev, ent->driver_data)))

			goto error_out_unreg;



	retcode = drm_ctxbitmap_init(dev);

	if (retcode) {

		DRM_ERROR("Cannot allocate memory for context bitmap.\n");