Unverified Commit f99413e4 authored by Paul Cercueil's avatar Paul Cercueil
Browse files

drm/ingenic: Remove bogus register write 



Commit 1bdb542d ("drm/ingenic: Simplify code by using hwdescs
array") caused the dma_hwdesc_phys_f{0,1} variables to be used while
uninitialized in a mmio register write, which most certainly broke the
ingenic-drm driver.

However, the very same patchset also submitted commit 60554662
("drm/ingenic: Upload palette before frame"), which restored a correct
behaviour by doing the register writes in a different place in the code.

What's left of this, is just to remove the bogus register writes in the
probe function.

Signed-off-by: default avatarPaul Cercueil <paul@crapouillou.net>
Reported-by: default avatarkernel test robot <lkp@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211030100032.42066-1-paul@crapouillou.net


Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent dded0039

drivers/gpu/drm/ingenic/ingenic-drm-drv.c

+0 −5
Original line number Original line Diff line number Diff line
@@ -1013,7 +1013,6 @@ static int ingenic_drm_bind(struct device *dev, bool has_components) 
	void __iomem *base;

	void __iomem *base;

	long parent_rate;

	long parent_rate;

	unsigned int i, clone_mask = 0;

	unsigned int i, clone_mask = 0;

	dma_addr_t dma_hwdesc_phys_f0, dma_hwdesc_phys_f1;

	int ret, irq;

	int ret, irq;





	soc_info = of_device_get_match_data(dev);

	soc_info = of_device_get_match_data(dev);
@@ -1268,10 +1267,6 @@ static int ingenic_drm_bind(struct device *dev, bool has_components) 
		}

		}

	}

	}





	/* Set address of our DMA descriptor chain */

	regmap_write(priv->map, JZ_REG_LCD_DA0, dma_hwdesc_phys_f0);

	regmap_write(priv->map, JZ_REG_LCD_DA1, dma_hwdesc_phys_f1);



	/* Enable OSD if available */

	/* Enable OSD if available */

	if (soc_info->has_osd)

	if (soc_info->has_osd)

		regmap_write(priv->map, JZ_REG_LCD_OSDC, JZ_LCD_OSDC_OSDEN);

		regmap_write(priv->map, JZ_REG_LCD_OSDC, JZ_LCD_OSDC_OSDEN);