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

gma500: Make crtc count a property of the device 



Octavian Purdila posted a patch that sets num_crtc to 1 for Moorestown, but
Oaktrail has 2 so we need to split Oaktrail/Moorestown more sensibly, and
also cope with some other differences later on.

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

drivers/staging/gma500/framebuffer.c

+1 −1
Original line number Diff line number Diff line
@@ -578,7 +578,7 @@ int psb_fbdev_init(struct drm_device *dev) 
	dev_priv->fbdev = fbdev;

	fbdev->psb_fb_helper.funcs = &psb_fb_helper_funcs;



	drm_fb_helper_init(dev, &fbdev->psb_fb_helper, 2,

	drm_fb_helper_init(dev, &fbdev->psb_fb_helper, dev_priv->ops->crtcs,

							INTELFB_CONN_LIMIT);



	drm_fb_helper_single_add_all_connectors(&fbdev->psb_fb_helper);

drivers/staging/gma500/mdfld_device.c

+1 −0
Original line number Diff line number Diff line
@@ -691,6 +691,7 @@ const struct psb_ops mdfld_chip_ops = { 
	.name = "Medfield",

	.accel_2d = 0,

	.pipes = 3,

	.crtcs = 2,

	.sgx_offset = MRST_SGX_OFFSET,



	.chip_setup = mid_chip_setup,

drivers/staging/gma500/mrst_device.c

+41 −0
Original line number Diff line number Diff line
@@ -24,9 +24,12 @@ 
#include "psb_drv.h"

#include "psb_reg.h"

#include "psb_intel_reg.h"

#include <asm/mrst.h>

#include <asm/intel_scu_ipc.h>

#include "mid_bios.h"



static const struct psb_ops oaktrail_chip_ops;



/* IPC message and command defines used to enable/disable mipi panel voltages */

#define IPC_MSG_PANEL_ON_OFF    0xE9

#define IPC_CMD_PANEL_ON        1
@@ -352,10 +355,48 @@ static int mrst_power_up(struct drm_device *dev) 
	return 0;

}



static int mrst_chip_setup(struct drm_device *dev)

{

	struct drm_psb_private *dev_priv = dev->dev_private;



#if defined(CONFIG_X86_MRST)

	if (mrst_identify_cpu())

		return mid_chip_setup(dev);

#endif

	dev_priv->ops = &oaktrail_chip_ops;

	/* Check - may be better to go via BIOS paths ? */

	return mid_chip_setup(dev);

}

	

const struct psb_ops mrst_chip_ops = {

	.name = "Moorestown",

	.accel_2d = 1,

	.pipes = 1,

	.crtcs = 1,

	.sgx_offset = MRST_SGX_OFFSET,



	.chip_setup = mrst_chip_setup,

	.crtc_helper = &mrst_helper_funcs,

	.crtc_funcs = &psb_intel_crtc_funcs,



	.output_init = mrst_output_init,



#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE

	.backlight_init = mrst_backlight_init,

#endif



	.init_pm = mrst_init_pm,

	.save_regs = mrst_save_display_registers,

	.restore_regs = mrst_restore_display_registers,

	.power_down = mrst_power_down,

	.power_up = mrst_power_up,

};



static const struct psb_ops oaktrail_chip_ops = {

	.name = "Oaktrail",

	.accel_2d = 1,

	.pipes = 2,

	.crtcs = 2,

	.sgx_offset = MRST_SGX_OFFSET,



	.chip_setup = mid_chip_setup,

drivers/staging/gma500/psb_device.c

+1 −0
Original line number Diff line number Diff line
@@ -331,6 +331,7 @@ const struct psb_ops psb_chip_ops = { 
	.name = "Poulsbo",

	.accel_2d = 1,

	.pipes = 2,

	.crtcs = 2,

	.sgx_offset = PSB_SGX_OFFSET,

	.chip_setup = psb_chip_setup,

drivers/staging/gma500/psb_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -622,6 +622,7 @@ struct psb_ops { 
	const char *name;

	unsigned int accel_2d:1;

	int pipes;		/* Number of output pipes */

	int crtcs;		/* Number of CRTCs */

	int sgx_offset;		/* Base offset of SGX device */



	/* Sub functions */

CRA Git | Maintained and supported by SUSTech CRA and CCSE