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

Commit 3a970ac1 authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman
Browse files

gma500: Clean up the DPU config and make it runtime 



We really don't want this all done by ifdeffery - and this isn't any need
as it's fairly easy to sort out.

Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 3caa89e9

drivers/staging/gma500/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ psb_gfx-$(CONFIG_DRM_PSB_MFLD) += mdfld_device.o \ 
	  mdfld_dsi_dpi.o \

	  mdfld_dsi_output.o \

	  mdfld_dsi_dbi.o \

	  mdfld_dsi_dbi_dpu.o \

	  mdfld_intel_display.o



obj-$(CONFIG_DRM_PSB) += psb_gfx.o

drivers/staging/gma500/mdfld_dsi_dbi.c

+4 −15
Original line number Diff line number Diff line
@@ -327,7 +327,6 @@ void mdfld_dsi_dbi_enter_dsr(struct mdfld_dsi_dbi_output *dbi_output, int pipe) 
	}

}



#ifndef CONFIG_MDFLD_DSI_DPU

static void mdfld_dbi_output_exit_dsr(struct mdfld_dsi_dbi_output *dbi_output,

			int pipe)

{
@@ -562,7 +561,6 @@ void mdfld_dbi_dsr_exit(struct drm_device *dev) 
		dev_priv->dbi_dsr_info = NULL;

	}

}

#endif



void mdfld_dsi_controller_dbi_init(struct mdfld_dsi_config *dsi_config,

								int pipe)
@@ -648,12 +646,8 @@ struct mdfld_dsi_encoder *mdfld_dsi_dbi_init(struct drm_device *dev, 
	struct drm_encoder *encoder = NULL;

	struct drm_display_mode *fixed_mode = NULL;

	struct psb_gtt *pg = dev_priv ? (&dev_priv->gtt) : NULL;



#ifdef CONFIG_MDFLD_DSI_DPU

	struct mdfld_dbi_dpu_info *dpu_info = dev_priv ? (dev_priv->dbi_dpu_info) : NULL;

#else

	struct mdfld_dbi_dsr_info *dsr_info = dev_priv ? (dev_priv->dbi_dsr_info) : NULL;

#endif

	u32 data = 0;

	int pipe;

	int ret;
@@ -742,20 +736,16 @@ struct mdfld_dsi_encoder *mdfld_dsi_dbi_init(struct drm_device *dev, 
	dbi_output->first_boot = true;

	dbi_output->mode_flags = MODE_SETTING_IN_ENCODER;



#ifdef CONFIG_MDFLD_DSI_DPU

	/* Add this output to dpu_info */

	if (dsi_connector->status == connector_status_connected) {

	/* Add this output to dpu_info if in DPU mode */

	if (dpu_info && dsi_connector->status == connector_status_connected) {

		if (dsi_connector->pipe == 0)

			dpu_info->dbi_outputs[0] = dbi_output;

		else

			dpu_info->dbi_outputs[1] = dbi_output;



		dpu_info->dbi_output_num++;

	}



#else /*CONFIG_MDFLD_DSI_DPU*/

	if (dsi_connector->status == connector_status_connected) {

		/* Add this output to dsr_info */

	} else if (dsi_connector->status == connector_status_connected) {

		/* Add this output to dsr_info if not */

		if (dsi_connector->pipe == 0)

			dsr_info->dbi_outputs[0] = dbi_output;

		else
@@ -763,7 +753,6 @@ struct mdfld_dsi_encoder *mdfld_dsi_dbi_init(struct drm_device *dev, 


		dsr_info->dbi_output_num++;

	}

#endif

	return &dbi_output->base;

out_err1:

	kfree(dbi_output);

drivers/staging/gma500/mdfld_dsi_dbi_dpu.c

0 → 100644
+778 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/staging/gma500/mdfld_dsi_output.c

+4 −4
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ module_param (LABC_control, int, 0644); 
 * we don't need 'movl' everytime we send them.

 * FIXME: these datas were provided by OEM, we should get them from GCT.

 **/

static const u32 mdfld_dbi_mcs_hysteresis[] = {

static u32 mdfld_dbi_mcs_hysteresis[] = {

	0x42000f57, 0x8c006400, 0xff00bf00, 0xffffffff,

	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,

	0x38000aff, 0x82005000, 0xff00ab00, 0xffffffff,
@@ -54,16 +54,16 @@ static const u32 mdfld_dbi_mcs_hysteresis[] = { 
	0x000000ff,

};



static const u32 mdfld_dbi_mcs_display_profile[] = {

static u32 mdfld_dbi_mcs_display_profile[] = {

	0x50281450, 0x0000c882, 0x00000000, 0x00000000,

	0x00000000,

};



static const u32 mdfld_dbi_mcs_kbbc_profile[] = {

static u32 mdfld_dbi_mcs_kbbc_profile[] = {

	0x00ffcc60, 0x00000000, 0x00000000, 0x00000000,

}; 

	

static const u32 mdfld_dbi_mcs_gamma_profile[] = {

static u32 mdfld_dbi_mcs_gamma_profile[] = {

	0x81111158, 0x88888888, 0x88888888,

};

drivers/staging/gma500/mdfld_intel_display.c

+20 −29

File changed.

Preview size limit exceeded, changes collapsed.