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

Commit 25c6a853 authored by Andrzej Hajda's avatar Andrzej Hajda Committed by Inki Dae
Browse files

drm/exynos: build fbdev code conditionally 



Fbdev code should be compiled only if CONFIG_DRM_FBDEV_EMULATION option
is enabled. The patch fixes exynos-drm code trying to manipulate
fbdev data which is not initialized in case CONFIG_DRM_FBDEV_EMULATION
is disabled.

Signed-off-by: default avatarAndrzej Hajda <a.hajda@samsung.com>
Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
parent 81e50bcd

drivers/gpu/drm/exynos/Makefile

+3 −3
Original line number Original line Diff line number Diff line
@@ -2,10 +2,10 @@ 
# Makefile for the drm device driver.  This driver provides support for the

# Makefile for the drm device driver.  This driver provides support for the

# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.

# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.





exynosdrm-y := exynos_drm_drv.o exynos_drm_crtc.o exynos_drm_fbdev.o \

exynosdrm-y := exynos_drm_drv.o exynos_drm_crtc.o exynos_drm_fb.o \

		exynos_drm_fb.o exynos_drm_gem.o exynos_drm_core.o \

		exynos_drm_gem.o exynos_drm_core.o exynos_drm_plane.o

		exynos_drm_plane.o





exynosdrm-$(CONFIG_DRM_FBDEV_EMULATION) += exynos_drm_fbdev.o

exynosdrm-$(CONFIG_DRM_EXYNOS_IOMMU) += exynos_drm_iommu.o

exynosdrm-$(CONFIG_DRM_EXYNOS_IOMMU) += exynos_drm_iommu.o

exynosdrm-$(CONFIG_DRM_EXYNOS_FIMD)	+= exynos_drm_fimd.o

exynosdrm-$(CONFIG_DRM_EXYNOS_FIMD)	+= exynos_drm_fimd.o

exynosdrm-$(CONFIG_DRM_EXYNOS5433_DECON)	+= exynos5433_drm_decon.o

exynosdrm-$(CONFIG_DRM_EXYNOS5433_DECON)	+= exynos5433_drm_decon.o

drivers/gpu/drm/exynos/exynos_drm_fb.c

+0 −11
Original line number Original line Diff line number Diff line
@@ -199,17 +199,6 @@ dma_addr_t exynos_drm_fb_dma_addr(struct drm_framebuffer *fb, int index) 
	return exynos_fb->dma_addr[index];

	return exynos_fb->dma_addr[index];

}

}





static void exynos_drm_output_poll_changed(struct drm_device *dev)

{

	struct exynos_drm_private *private = dev->dev_private;

	struct drm_fb_helper *fb_helper = private->fb_helper;



	if (fb_helper)

		drm_fb_helper_hotplug_event(fb_helper);

	else

		exynos_drm_fbdev_init(dev);

}



static const struct drm_mode_config_funcs exynos_drm_mode_config_funcs = {

static const struct drm_mode_config_funcs exynos_drm_mode_config_funcs = {

	.fb_create = exynos_user_fb_create,

	.fb_create = exynos_user_fb_create,

	.output_poll_changed = exynos_drm_output_poll_changed,

	.output_poll_changed = exynos_drm_output_poll_changed,

drivers/gpu/drm/exynos/exynos_drm_fbdev.c

+11 −0
Original line number Original line Diff line number Diff line
@@ -311,3 +311,14 @@ void exynos_drm_fbdev_restore_mode(struct drm_device *dev) 




	drm_fb_helper_restore_fbdev_mode_unlocked(private->fb_helper);

	drm_fb_helper_restore_fbdev_mode_unlocked(private->fb_helper);

}

}



void exynos_drm_output_poll_changed(struct drm_device *dev)

{

	struct exynos_drm_private *private = dev->dev_private;

	struct drm_fb_helper *fb_helper = private->fb_helper;



	if (fb_helper)

		drm_fb_helper_hotplug_event(fb_helper);

	else

		exynos_drm_fbdev_init(dev);

}

drivers/gpu/drm/exynos/exynos_drm_fbdev.h

+22 −1
Original line number Original line Diff line number Diff line
@@ -15,9 +15,30 @@ 
#ifndef _EXYNOS_DRM_FBDEV_H_

#ifndef _EXYNOS_DRM_FBDEV_H_

#define _EXYNOS_DRM_FBDEV_H_

#define _EXYNOS_DRM_FBDEV_H_





#ifdef CONFIG_DRM_FBDEV_EMULATION



int exynos_drm_fbdev_init(struct drm_device *dev);

int exynos_drm_fbdev_init(struct drm_device *dev);

int exynos_drm_fbdev_reinit(struct drm_device *dev);

void exynos_drm_fbdev_fini(struct drm_device *dev);

void exynos_drm_fbdev_fini(struct drm_device *dev);

void exynos_drm_fbdev_restore_mode(struct drm_device *dev);

void exynos_drm_fbdev_restore_mode(struct drm_device *dev);

void exynos_drm_output_poll_changed(struct drm_device *dev);



#else



static inline int exynos_drm_fbdev_init(struct drm_device *dev)

{

	return 0;

}



static inline void exynos_drm_fbdev_fini(struct drm_device *dev)

{

}



static inline void exynos_drm_fbdev_restore_mode(struct drm_device *dev)

{

}



#define exynos_drm_output_poll_changed (NULL)



#endif





#endif
 
#endif