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

Commit ff3e84e8 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'exynos-drm-fixes' of... 

Merge branch 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-fixes

fix some exynos regressions.

* 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos:
  drm/exynos: Use VIDEO_SAMSUNG_S5P_G2D=n as G2D Kconfig dependency
  drm/exynos: fix a warning message
  drm/exynos: mic: fix an error code
  drm/exynos: fimd: fix broken dp_clock control
  drm/exynos: build fbdev code conditionally
  drm/exynos: fix adjusted_mode pointer in exynos_plane_mode_set
  drm/exynos: fix error handling in exynos_drm_subdrv_open
parents 25451c19 2072fe51

drivers/gpu/drm/exynos/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ comment "Sub-drivers" 


config DRM_EXYNOS_G2D

	bool "G2D"

	depends on !VIDEO_SAMSUNG_S5P_G2D

	depends on VIDEO_SAMSUNG_S5P_G2D=n

	select FRAME_VECTOR

	help

	  Choose this option if you want to use Exynos G2D for DRM.

drivers/gpu/drm/exynos/Makefile

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

# 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 \

		exynos_drm_fb.o exynos_drm_gem.o exynos_drm_core.o \

		exynos_drm_plane.o

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

		exynos_drm_gem.o exynos_drm_core.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_FIMD)	+= exynos_drm_fimd.o

exynosdrm-$(CONFIG_DRM_EXYNOS5433_DECON)	+= exynos5433_drm_decon.o

drivers/gpu/drm/exynos/exynos_drm_core.c

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ int exynos_drm_subdrv_open(struct drm_device *dev, struct drm_file *file) 
	return 0;



err:

	list_for_each_entry_reverse(subdrv, &subdrv->list, list) {

	list_for_each_entry_continue_reverse(subdrv, &exynos_drm_subdrv_list, list) {

		if (subdrv->close)

			subdrv->close(dev, subdrv->dev, file);

	}

drivers/gpu/drm/exynos/exynos_drm_fb.c

+0 −11
Original line number 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];

}



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 = {

	.fb_create = exynos_user_fb_create,

	.output_poll_changed = exynos_drm_output_poll_changed,

drivers/gpu/drm/exynos/exynos_drm_fbdev.c

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


	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);

}