Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 259682
b: refs/heads/master
c: a95dfc1
h: refs/heads/master
v: v3
  • Loading branch information
Alan Cox authored and Greg Kroah-Hartman committed Jul 5, 2011
1 parent 2b2b619 commit caa3ba1
Show file tree
Hide file tree
Showing 8 changed files with 87 additions and 69 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 89e5d557171c5ce12c6f149633538582fe10ebb0
refs/heads/master: a95dfc1e1ce6d50129252d70078813a31ff7cc56
6 changes: 6 additions & 0 deletions trunk/drivers/staging/gma500/mdfld_device.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include "psb_drv.h"
#include "mdfld_output.h"
#include "mdfld_dsi_output.h"
#include "mrst_bios.h"

/*
* Provide the Medfield specific backlight management
Expand Down Expand Up @@ -689,6 +690,11 @@ static int mdfld_power_up(struct drm_device *dev)
const struct psb_ops mdfld_chip_ops = {
.name = "Medfield",
.accel_2d = 0,
.pipes = 3,
.sgx_offset = MRST_SGX_OFFSET,

.chip_setup = mid_chip_setup,

.crtc_helper = &mdfld_helper_funcs,
.crtc_funcs = &mdfld_intel_crtc_funcs,

Expand Down
14 changes: 11 additions & 3 deletions trunk/drivers/staging/gma500/mrst_bios.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ module_param_named(panel_id, panel_id, int, 0600);
MODULE_PARM_DESC(panel_id, "Panel Identifier");


void mrst_get_fuse_settings(struct drm_device *dev)
static void mid_get_fuse_settings(struct drm_device *dev)
{
struct drm_psb_private *dev_priv = dev->dev_private;
struct pci_dev *pci_root = pci_get_bus_and_slot(0, 0);
Expand Down Expand Up @@ -102,7 +102,7 @@ void mrst_get_fuse_settings(struct drm_device *dev)
/*
* Get the revison ID, B0:D2:F0;0x08
*/
void mid_get_pci_revID(struct drm_psb_private *dev_priv)
static void mid_get_pci_revID(struct drm_psb_private *dev_priv)
{
uint32_t platform_rev_id = 0;
struct pci_dev *pci_gfx_root = pci_get_bus_and_slot(0, PCI_DEVFN(2, 0));
Expand All @@ -114,7 +114,7 @@ void mid_get_pci_revID(struct drm_psb_private *dev_priv)
dev_priv->platform_rev_id);
}

void mrst_get_vbt_data(struct drm_psb_private *dev_priv)
static void mid_get_vbt_data(struct drm_psb_private *dev_priv)
{
struct drm_device *dev = dev_priv->dev;
struct mrst_vbt *vbt = &dev_priv->vbt_data;
Expand Down Expand Up @@ -261,3 +261,11 @@ void mrst_get_vbt_data(struct drm_psb_private *dev_priv)
}
}

int mid_chip_setup(struct drm_device *dev)
{
struct drm_psb_private *dev_priv = dev->dev_private;
mid_get_fuse_settings(dev);
mid_get_vbt_data(dev_priv);
mid_get_pci_revID(dev_priv);
return 0;
}
5 changes: 2 additions & 3 deletions trunk/drivers/staging/gma500/mrst_bios.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,5 @@
*
**************************************************************************/

extern void mrst_get_fuse_settings(struct drm_device *dev);
extern void mid_get_pci_revID(struct drm_psb_private *dev_priv);
extern void mrst_get_vbt_data(struct drm_psb_private *dev_priv);
extern int mid_chip_setup(struct drm_device *dev);

5 changes: 5 additions & 0 deletions trunk/drivers/staging/gma500/mrst_device.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include "psb_reg.h"
#include "psb_intel_reg.h"
#include <asm/intel_scu_ipc.h>
#include "mrst_bios.h"

/* IPC message and command defines used to enable/disable mipi panel voltages */
#define IPC_MSG_PANEL_ON_OFF 0xE9
Expand Down Expand Up @@ -354,6 +355,10 @@ static int mrst_power_up(struct drm_device *dev)
const struct psb_ops mrst_chip_ops = {
.name = "Moorestown",
.accel_2d = 1,
.pipes = 1,
.sgx_offset = MRST_SGX_OFFSET,

.chip_setup = mid_chip_setup,
.crtc_helper = &mrst_helper_funcs,
.crtc_funcs = &psb_intel_crtc_funcs,

Expand Down
54 changes: 52 additions & 2 deletions trunk/drivers/staging/gma500/psb_device.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,19 +271,69 @@ static int psb_restore_display_registers(struct drm_device *dev)
return 0;
}

int psb_power_down(struct drm_device *dev)
static int psb_power_down(struct drm_device *dev)
{
return 0;
}

int psb_power_up(struct drm_device *dev)
static int psb_power_up(struct drm_device *dev)
{
return 0;
}

static void psb_get_core_freq(struct drm_device *dev)
{
uint32_t clock;
struct pci_dev *pci_root = pci_get_bus_and_slot(0, 0);
struct drm_psb_private *dev_priv = dev->dev_private;

/*pci_write_config_dword(pci_root, 0xD4, 0x00C32004);*/
/*pci_write_config_dword(pci_root, 0xD0, 0xE0033000);*/

pci_write_config_dword(pci_root, 0xD0, 0xD0050300);
pci_read_config_dword(pci_root, 0xD4, &clock);
pci_dev_put(pci_root);

switch (clock & 0x07) {
case 0:
dev_priv->core_freq = 100;
break;
case 1:
dev_priv->core_freq = 133;
break;
case 2:
dev_priv->core_freq = 150;
break;
case 3:
dev_priv->core_freq = 178;
break;
case 4:
dev_priv->core_freq = 200;
break;
case 5:
case 6:
case 7:
dev_priv->core_freq = 266;
default:
dev_priv->core_freq = 0;
}
}

static int psb_chip_setup(struct drm_device *dev)
{
psb_get_core_freq(dev);
psb_intel_opregion_init(dev);
psb_intel_init_bios(dev);
return 0;
}

const struct psb_ops psb_chip_ops = {
.name = "Poulsbo",
.accel_2d = 1,
.pipes = 2,
.sgx_offset = PSB_SGX_OFFSET,
.chip_setup = psb_chip_setup,

.crtc_helper = &psb_intel_helper_funcs,
.crtc_funcs = &psb_intel_crtc_funcs,

Expand Down
65 changes: 5 additions & 60 deletions trunk/drivers/staging/gma500/psb_drv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,44 +158,6 @@ static void psb_do_takedown(struct drm_device *dev)
/* FIXME: do we need to clean up the gtt here ? */
}

static void psb_get_core_freq(struct drm_device *dev)
{
uint32_t clock;
struct pci_dev *pci_root = pci_get_bus_and_slot(0, 0);
struct drm_psb_private *dev_priv = dev->dev_private;

/*pci_write_config_dword(pci_root, 0xD4, 0x00C32004);*/
/*pci_write_config_dword(pci_root, 0xD0, 0xE0033000);*/

pci_write_config_dword(pci_root, 0xD0, 0xD0050300);
pci_read_config_dword(pci_root, 0xD4, &clock);
pci_dev_put(pci_root);

switch (clock & 0x07) {
case 0:
dev_priv->core_freq = 100;
break;
case 1:
dev_priv->core_freq = 133;
break;
case 2:
dev_priv->core_freq = 150;
break;
case 3:
dev_priv->core_freq = 178;
break;
case 4:
dev_priv->core_freq = 200;
break;
case 5:
case 6:
case 7:
dev_priv->core_freq = 266;
default:
dev_priv->core_freq = 0;
}
}

static int psb_do_init(struct drm_device *dev)
{
struct drm_psb_private *dev_priv =
Expand Down Expand Up @@ -336,13 +298,7 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset)
dev_priv->dev = dev;
dev->dev_private = (void *) dev_priv;

if (IS_MRST(dev))
dev_priv->num_pipe = 1;
else if (IS_MFLD(dev))
dev_priv->num_pipe = 3;
else
dev_priv->num_pipe = 2;

dev_priv->num_pipe = dev_priv->ops->pipes;

resource_start = pci_resource_start(dev->pdev, PSB_MMIO_RESOURCE);

Expand All @@ -351,25 +307,14 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset)
if (!dev_priv->vdc_reg)
goto out_err;

if (IS_MRST(dev) || IS_MFLD(dev))
dev_priv->sgx_reg = ioremap(resource_start + MRST_SGX_OFFSET,
dev_priv->sgx_reg = ioremap(resource_start + dev_priv->ops->sgx_offset,
PSB_SGX_SIZE);
else
dev_priv->sgx_reg = ioremap(resource_start + PSB_SGX_OFFSET,
PSB_SGX_SIZE);

if (!dev_priv->sgx_reg)
goto out_err;

if (IS_MRST(dev) || IS_MFLD(dev)) {
mrst_get_fuse_settings(dev);
mrst_get_vbt_data(dev_priv);
mid_get_pci_revID(dev_priv);
} else {
psb_get_core_freq(dev);
psb_intel_opregion_init(dev);
psb_intel_init_bios(dev);
}
ret = dev_priv->ops->chip_setup(dev);
if (ret)
goto out_err;

/* Init OSPM support */
gma_power_init(dev);
Expand Down
5 changes: 5 additions & 0 deletions trunk/drivers/staging/gma500/psb_drv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -619,11 +619,16 @@ struct drm_psb_private {
struct psb_ops {
const char *name;
unsigned int accel_2d:1;
int pipes; /* Number of output pipes */
int sgx_offset; /* Base offset of SGX device */

/* Sub functions */
struct drm_crtc_helper_funcs const *crtc_helper;
struct drm_crtc_funcs const *crtc_funcs;

/* Setup hooks */
int (*chip_setup)(struct drm_device *dev);

/* Display management hooks */
int (*output_init)(struct drm_device *dev);
/* Power management hooks */
Expand Down

0 comments on commit caa3ba1

Please sign in to comment.