Commit 8e592eab 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

   This pull request includes regression fixups, build warnings, and
   trivial cleanups which mostly remove some codes not used anymore.

* 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos:
  drm/exynos: Staticize local function in exynos_drm_gem.c
  drm/exynos: fimd: actually disable dp clock
  drm/exynos: dp: remove suspend/resume functions
  drm/exynos: remove unused mode_fixup() code
  drm/exynos: remove decon_mode_fixup()
  drm/exynos: remove fimd_mode_fixup()
  drm/exynos: rotator: Clock control is unused if !PM
  drm/exynos: fimc: Clock control is unused if !PM
  drm/exynos: Suspend/resume is unused if !PM
  drm/exynos: create a fake mmap offset with gem creation
  drm/exynos: remove call to drm_gem_free_mmap_offset()
  drm/exynos: Remove useless EXPORT_SYMBOL_GPLs
  drm/exynos: cleanup line feed in exynos_drm_gem_get_ioctl
  drm/exynos: cleanup function calling written twice
  drm/exynos: staticize exynos_drm_gem_init()
  drm/exynos: remove unnecessary NULL assignment
  drm/exynos: fix missed calling of drm_prime_gem_destroy()
  drm/exynos: fix layering violation of address
parents 5b638641 cda37425

drivers/gpu/drm/exynos/exynos7_drm_decon.c

+0 −12
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
 * DECON stands for Display and Enhancement controller.

 */



#define DECON_DEFAULT_FRAMERATE 60

#define MIN_FB_WIDTH_FOR_16WORD_BURST 128



#define WINDOWS_NR	2
@@ -165,16 +164,6 @@ static u32 decon_calc_clkdiv(struct decon_context *ctx, 
	return (clkdiv < 0x100) ? clkdiv : 0xff;

}



static bool decon_mode_fixup(struct exynos_drm_crtc *crtc,

		const struct drm_display_mode *mode,

		struct drm_display_mode *adjusted_mode)

{

	if (adjusted_mode->vrefresh == 0)

		adjusted_mode->vrefresh = DECON_DEFAULT_FRAMERATE;



	return true;

}



static void decon_commit(struct exynos_drm_crtc *crtc)

{

	struct decon_context *ctx = crtc->ctx;
@@ -637,7 +626,6 @@ static void decon_disable(struct exynos_drm_crtc *crtc) 
static const struct exynos_drm_crtc_ops decon_crtc_ops = {

	.enable = decon_enable,

	.disable = decon_disable,

	.mode_fixup = decon_mode_fixup,

	.commit = decon_commit,

	.enable_vblank = decon_enable_vblank,

	.disable_vblank = decon_disable_vblank,

drivers/gpu/drm/exynos/exynos_dp_core.c

+0 −23
Original line number Diff line number Diff line
@@ -1383,28 +1383,6 @@ static int exynos_dp_remove(struct platform_device *pdev) 
	return 0;

}



#ifdef CONFIG_PM_SLEEP

static int exynos_dp_suspend(struct device *dev)

{

	struct exynos_dp_device *dp = dev_get_drvdata(dev);



	exynos_dp_disable(&dp->encoder);

	return 0;

}



static int exynos_dp_resume(struct device *dev)

{

	struct exynos_dp_device *dp = dev_get_drvdata(dev);



	exynos_dp_enable(&dp->encoder);

	return 0;

}

#endif



static const struct dev_pm_ops exynos_dp_pm_ops = {

	SET_SYSTEM_SLEEP_PM_OPS(exynos_dp_suspend, exynos_dp_resume)

};



static const struct of_device_id exynos_dp_match[] = {

	{ .compatible = "samsung,exynos5-dp" },

	{},
@@ -1417,7 +1395,6 @@ struct platform_driver dp_driver = { 
	.driver		= {

		.name	= "exynos-dp",

		.owner	= THIS_MODULE,

		.pm	= &exynos_dp_pm_ops,

		.of_match_table = exynos_dp_match,

	},

};

drivers/gpu/drm/exynos/exynos_drm_core.c

+0 −6
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ int exynos_drm_subdrv_register(struct exynos_drm_subdrv *subdrv) 


	return 0;

}

EXPORT_SYMBOL_GPL(exynos_drm_subdrv_register);



int exynos_drm_subdrv_unregister(struct exynos_drm_subdrv *subdrv)

{
@@ -39,7 +38,6 @@ int exynos_drm_subdrv_unregister(struct exynos_drm_subdrv *subdrv) 


	return 0;

}

EXPORT_SYMBOL_GPL(exynos_drm_subdrv_unregister);



int exynos_drm_device_subdrv_probe(struct drm_device *dev)

{
@@ -69,7 +67,6 @@ int exynos_drm_device_subdrv_probe(struct drm_device *dev) 


	return 0;

}

EXPORT_SYMBOL_GPL(exynos_drm_device_subdrv_probe);



int exynos_drm_device_subdrv_remove(struct drm_device *dev)

{
@@ -87,7 +84,6 @@ int exynos_drm_device_subdrv_remove(struct drm_device *dev) 


	return 0;

}

EXPORT_SYMBOL_GPL(exynos_drm_device_subdrv_remove);



int exynos_drm_subdrv_open(struct drm_device *dev, struct drm_file *file)

{
@@ -111,7 +107,6 @@ err: 
	}

	return ret;

}

EXPORT_SYMBOL_GPL(exynos_drm_subdrv_open);



void exynos_drm_subdrv_close(struct drm_device *dev, struct drm_file *file)

{
@@ -122,4 +117,3 @@ void exynos_drm_subdrv_close(struct drm_device *dev, struct drm_file *file) 
			subdrv->close(dev, subdrv->dev, file);

	}

}
 
EXPORT_SYMBOL_GPL(exynos_drm_subdrv_close);

drivers/gpu/drm/exynos/exynos_drm_crtc.c

+0 −15
Original line number Diff line number Diff line
@@ -41,20 +41,6 @@ static void exynos_drm_crtc_disable(struct drm_crtc *crtc) 
		exynos_crtc->ops->disable(exynos_crtc);

}



static bool

exynos_drm_crtc_mode_fixup(struct drm_crtc *crtc,

			    const struct drm_display_mode *mode,

			    struct drm_display_mode *adjusted_mode)

{

	struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc);



	if (exynos_crtc->ops->mode_fixup)

		return exynos_crtc->ops->mode_fixup(exynos_crtc, mode,

						    adjusted_mode);



	return true;

}



static void

exynos_drm_crtc_mode_set_nofb(struct drm_crtc *crtc)

{
@@ -99,7 +85,6 @@ static void exynos_crtc_atomic_flush(struct drm_crtc *crtc, 
static struct drm_crtc_helper_funcs exynos_crtc_helper_funcs = {

	.enable		= exynos_drm_crtc_enable,

	.disable	= exynos_drm_crtc_disable,

	.mode_fixup	= exynos_drm_crtc_mode_fixup,

	.mode_set_nofb	= exynos_drm_crtc_mode_set_nofb,

	.atomic_begin	= exynos_crtc_atomic_begin,

	.atomic_flush	= exynos_crtc_atomic_flush,

drivers/gpu/drm/exynos/exynos_drm_drv.c

+2 −0
Original line number Diff line number Diff line
@@ -304,6 +304,7 @@ int exynos_atomic_commit(struct drm_device *dev, struct drm_atomic_state *state, 
	return 0;

}



#ifdef CONFIG_PM_SLEEP

static int exynos_drm_suspend(struct drm_device *dev, pm_message_t state)

{

	struct drm_connector *connector;
@@ -340,6 +341,7 @@ static int exynos_drm_resume(struct drm_device *dev) 


	return 0;

}

#endif



static int exynos_drm_open(struct drm_device *dev, struct drm_file *file)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE