Commit d45e32c9 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/mgag200: Call mgag200_device_probe_vram() from per-model init 



Call mgag200_device_probe_vram() from each model's initializer. The
G200EW3 uses a special helper with additional instructions.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarJocelyn Falempe <jfalempe@redhat.com>
Tested-by: default avatarJocelyn Falempe <jfalempe@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220601112522.5774-5-tzimmermann@suse.de
parent ce19021f

drivers/gpu/drm/mgag200/mgag200_drv.c

+39 −0
Original line number Diff line number Diff line
@@ -50,6 +50,45 @@ int mgag200_init_pci_options(struct pci_dev *pdev, u32 option, u32 option2) 
	return 0;

}



resource_size_t mgag200_probe_vram(void __iomem *mem, resource_size_t size)

{

	int offset;

	int orig;

	int test1, test2;

	int orig1, orig2;

	size_t vram_size;



	/* Probe */

	orig = ioread16(mem);

	iowrite16(0, mem);



	vram_size = size;



	for (offset = 0x100000; offset < vram_size; offset += 0x4000) {

		orig1 = ioread8(mem + offset);

		orig2 = ioread8(mem + offset + 0x100);



		iowrite16(0xaa55, mem + offset);

		iowrite16(0xaa55, mem + offset + 0x100);



		test1 = ioread16(mem + offset);

		test2 = ioread16(mem);



		iowrite16(orig1, mem + offset);

		iowrite16(orig2, mem + offset + 0x100);



		if (test1 != 0xaa55)

			break;



		if (test2)

			break;

	}



	iowrite16(orig, mem);



	return offset - 65536;

}



/*

 * DRM driver

 */

drivers/gpu/drm/mgag200/mgag200_drv.h

+4 −2
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ struct mga_device { 
	struct mga_mc			mc;



	void __iomem			*vram;

	size_t				vram_fb_available;

	resource_size_t			vram_available;



	enum mga_type			type;
@@ -257,6 +257,7 @@ static inline struct mgag200_g200se_device *to_mgag200_g200se_device(struct drm_ 


				/* mgag200_drv.c */

int mgag200_init_pci_options(struct pci_dev *pdev, u32 option, u32 option2);

resource_size_t mgag200_probe_vram(void __iomem *mem, resource_size_t size);

int mgag200_regs_init(struct mga_device *mdev);



				/* mgag200_<device type>.c */
@@ -278,7 +279,8 @@ struct mga_device *mgag200_g200ew3_device_create(struct pci_dev *pdev, const str 
						 enum mga_type type, unsigned long flags);



				/* mgag200_mode.c */

int mgag200_modeset_init(struct mga_device *mdev);

resource_size_t mgag200_device_probe_vram(struct mga_device *mdev);

int mgag200_modeset_init(struct mga_device *mdev, resource_size_t vram_fb_available);



				/* mgag200_i2c.c */

int mgag200_i2c_init(struct mga_device *mdev, struct mga_i2c_chan *i2c);

drivers/gpu/drm/mgag200/mgag200_g200.c

+4 −1
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ struct mga_device *mgag200_g200_device_create(struct pci_dev *pdev, const struct 
	struct mgag200_g200_device *g200;

	struct mga_device *mdev;

	struct drm_device *dev;

	resource_size_t vram_available;

	int ret;



	g200 = devm_drm_dev_alloc(&pdev->dev, drv, struct mgag200_g200_device, base.base);
@@ -189,7 +190,9 @@ struct mga_device *mgag200_g200_device_create(struct pci_dev *pdev, const struct 
	if (ret)

		return ERR_PTR(ret);



	ret = mgag200_modeset_init(mdev);

	vram_available = mgag200_device_probe_vram(mdev);



	ret = mgag200_modeset_init(mdev, vram_available);

	if (ret)

		return ERR_PTR(ret);

drivers/gpu/drm/mgag200/mgag200_g200eh.c

+4 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ struct mga_device *mgag200_g200eh_device_create(struct pci_dev *pdev, const stru 
{

	struct mga_device *mdev;

	struct drm_device *dev;

	resource_size_t vram_available;

	int ret;



	mdev = devm_drm_dev_alloc(&pdev->dev, drv, struct mga_device, base);
@@ -39,7 +40,9 @@ struct mga_device *mgag200_g200eh_device_create(struct pci_dev *pdev, const stru 
	if (ret)

		return ERR_PTR(ret);



	ret = mgag200_modeset_init(mdev);

	vram_available = mgag200_device_probe_vram(mdev);



	ret = mgag200_modeset_init(mdev, vram_available);

	if (ret)

		return ERR_PTR(ret);

drivers/gpu/drm/mgag200/mgag200_g200eh3.c

+4 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ struct mga_device *mgag200_g200eh3_device_create(struct pci_dev *pdev, 
{

	struct mga_device *mdev;

	struct drm_device *dev;

	resource_size_t vram_available;

	int ret;



	mdev = devm_drm_dev_alloc(&pdev->dev, drv, struct mga_device, base);
@@ -40,7 +41,9 @@ struct mga_device *mgag200_g200eh3_device_create(struct pci_dev *pdev, 
	if (ret)

		return ERR_PTR(ret);



	ret = mgag200_modeset_init(mdev);

	vram_available = mgag200_device_probe_vram(mdev);



	ret = mgag200_modeset_init(mdev, vram_available);

	if (ret)

		return ERR_PTR(ret);