Commit 9c8c9c7c authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge tag 'exynos-drm-fixes-for-v5.3-rc3' of... 

Merge tag 'exynos-drm-fixes-for-v5.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos

 into drm-fixes

- Two cleanup patches
  . use dev_get_drvdata for readability instead of platform_get_drvdata
  . remove redundant assignment to node.
- Two fixup patches
  . fix undefined reference to 'vmf_insert_mixed' with NOMMU configuration.
  . fix potential infinite spin issue by decrementing 'retry' variable in
    scaler_reset function of exynos_drm_scaler.c

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
From: Inki Dae <inki.dae@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1564734791-745-1-git-send-email-inki.dae@samsung.com
parents 63dc6e63 1bbbab09

drivers/gpu/drm/exynos/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
config DRM_EXYNOS

	tristate "DRM Support for Samsung SoC EXYNOS Series"

	depends on OF && DRM && (ARCH_S3C64XX || ARCH_S5PV210 || ARCH_EXYNOS || ARCH_MULTIPLATFORM || COMPILE_TEST)

	depends on MMU

	select DRM_KMS_HELPER

	select VIDEOMODE_HELPERS

	select SND_SOC_HDMI_CODEC if SND_SOC

drivers/gpu/drm/exynos/exynos_drm_fimc.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static unsigned int fimc_mask = 0xc; 
module_param_named(fimc_devs, fimc_mask, uint, 0644);

MODULE_PARM_DESC(fimc_devs, "Alias mask for assigning FIMC devices to Exynos DRM");



#define get_fimc_context(dev)	platform_get_drvdata(to_platform_device(dev))

#define get_fimc_context(dev)	dev_get_drvdata(dev)



enum {

	FIMC_CLK_LCLK,

drivers/gpu/drm/exynos/exynos_drm_g2d.c

+1 −1
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ static inline void g2d_hw_reset(struct g2d_data *g2d) 
static int g2d_init_cmdlist(struct g2d_data *g2d)

{

	struct device *dev = g2d->dev;

	struct g2d_cmdlist_node *node = g2d->cmdlist_node;

	struct g2d_cmdlist_node *node;

	int nr;

	int ret;

	struct g2d_buf_info *buf_info;

drivers/gpu/drm/exynos/exynos_drm_gsc.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 
#define GSC_COEF_DEPTH	3

#define GSC_AUTOSUSPEND_DELAY		2000



#define get_gsc_context(dev)	platform_get_drvdata(to_platform_device(dev))

#define get_gsc_context(dev)	dev_get_drvdata(dev)

#define gsc_read(offset)		readl(ctx->regs + (offset))

#define gsc_write(cfg, offset)	writel(cfg, ctx->regs + (offset))

drivers/gpu/drm/exynos/exynos_drm_scaler.c

+2 −2
Original line number Diff line number Diff line
@@ -94,12 +94,12 @@ static inline int scaler_reset(struct scaler_context *scaler) 
	scaler_write(SCALER_CFG_SOFT_RESET, SCALER_CFG);

	do {

		cpu_relax();

	} while (retry > 1 &&

	} while (--retry > 1 &&

		 scaler_read(SCALER_CFG) & SCALER_CFG_SOFT_RESET);

	do {

		cpu_relax();

		scaler_write(1, SCALER_INT_EN);

	} while (retry > 0 && scaler_read(SCALER_INT_EN) != 1);

	} while (--retry > 0 && scaler_read(SCALER_INT_EN) != 1);



	return retry ? 0 : -EIO;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE