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

Commit d50c192a authored by Archit Taneja's avatar Archit Taneja Committed by Rob Clark
Browse files

drm/msm/mdp: Remove CONFIG_OF checks from MDP drivers 



We don't intend to use downstream non-DT kernels anymore, so remove
CONFIG_OF checks.

Update the TODO comment so that we don't forget about max_clk setting
for non APQ8064 chips having MDP4.

Signed-off-by: default avatarArchit Taneja <architt@codeaurora.org>
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent d2252563

drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c

+3 −17
Original line number Diff line number Diff line
@@ -240,7 +240,6 @@ int mdp4_enable(struct mdp4_kms *mdp4_kms) 
	return 0;

}



#ifdef CONFIG_OF

static struct drm_panel *detect_panel(struct drm_device *dev)

{

	struct device_node *endpoint, *panel_node;
@@ -270,12 +269,6 @@ static struct drm_panel *detect_panel(struct drm_device *dev) 


	return panel;

}

#else

static struct drm_panel *detect_panel(struct drm_device *dev)

{

	// ??? maybe use a module param to specify which panel is attached?

}

#endif



static int modeset_init(struct mdp4_kms *mdp4_kms)

{
@@ -558,17 +551,10 @@ struct msm_kms *mdp4_kms_init(struct drm_device *dev) 
static struct mdp4_platform_config *mdp4_get_config(struct platform_device *dev)

{

	static struct mdp4_platform_config config = {};

#ifdef CONFIG_OF

	/* TODO */



	/* TODO: Chips that aren't apq8064 have a 200 Mhz max_clk */

	config.max_clk = 266667000;

	config.iommu = iommu_domain_alloc(&platform_bus_type);

#else

	if (cpu_is_apq8064())

		config.max_clk = 266667000;

	else

		config.max_clk = 200000000;



	config.iommu = msm_get_iommu_domain(DISPLAY_READ_DOMAIN);

#endif

	return &config;

}

drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c

+1 −3
Original line number Diff line number Diff line
@@ -553,9 +553,7 @@ struct mdp5_cfg_handler *mdp5_cfg_init(struct mdp5_kms *mdp5_kms, 
static struct mdp5_cfg_platform *mdp5_get_config(struct platform_device *dev)

{

	static struct mdp5_cfg_platform config = {};

#ifdef CONFIG_OF

	/* TODO */

#endif



	config.iommu = iommu_domain_alloc(&platform_bus_type);



	return &config;