gma500: Final polish
PATCH 1/4 gma500: Final polish
From: Alan Cox <[email protected]>
This completes the clean up all the non Medfield C files to the point where checkpatch approves of them barring some silly 80 column whining.
The Medfield stuff is still in a lot of flux but the rest is now ready for general tidy and review.
---
drivers/staging/gma500/framebuffer.c | 8 ++++---- drivers/staging/gma500/gtt.c | 2 +- drivers/staging/gma500/psb_device.c | 2 +- drivers/staging/gma500/psb_drv.c | 8 ++++---- drivers/staging/gma500/psb_intel_display.c | 8 ++++---- 5 files changed, 14 insertions(+), 14 deletions(-)
drivers/staging/gma500/framebuffer.c +4 -4
@@ -756,10 +756,10 @@ static void psb_setup_outputs(struct drm_device *dev) clone_mask = (1 <<INTEL_OUTPUT_MIPI2 );break ;case INTEL_OUTPUT_HDMI : -if (IS_MFLD (dev)) - crtc_mask = (1 <<1 ); -else /* FIXME: review Oaktrail */ - crtc_mask = (1 <<0 );/* Cedarview */ +if (IS_MFLD (dev)) + crtc_mask = (1 <<1 ); +else /* FIXME: review Oaktrail */ + crtc_mask = (1 <<0 );/* Cedarview */ clone_mask = (1 <<INTEL_OUTPUT_HDMI );break ; }
drivers/staging/gma500/gtt.c +1 -1
@@ -398,7 +398,7 @@ int psb_gtt_init(struct drm_device *dev, int resume) dev_priv->gtt_initialized =1 ; pg->gtt_phys_start = dev_priv->pge_ctl &PAGE_MASK ; - +/* * FIXME: video mmu has hw bug to access 0x0D0000000, * then make gatt start at 0x0e000,0000
drivers/staging/gma500/psb_device.c +1 -1
@@ -347,6 +347,6 @@ const struct psb_ops psb_chip_ops = { .save_regs = psb_save_display_registers, .restore_regs = psb_restore_display_registers, .power_down = psb_power_down, - .power_up = psb_power_up, + .power_up = psb_power_up, };
drivers/staging/gma500/psb_drv.c +4 -4
@@ -52,7 +52,7 @@ module_param_named(trap_pagefaults, drm_psb_trap_pagefaults, int, 0600);static DEFINE_PCI_DEVICE_TABLE (pciidlist) = { {0x8086 ,0x8108 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , (long ) &psb_chip_ops }, {0x8086 ,0x8109 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , (long ) &psb_chip_ops }, -#if defined(CONFIG_DRM_PSB_MRST) +#if defined(CONFIG_DRM_PSB_MRST) {0x8086 ,0x4100 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , (long ) &mrst_chip_ops}, {0x8086 ,0x4101 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , (long ) &mrst_chip_ops}, { 0x8086, 0x4102, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &mrst_chip_ops},
@@ -72,7 +72,7 @@ static DEFINE_PCI_DEVICE_TABLE(pciidlist) = { { 0x8086, 0x0136, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &mdfld_chip_ops}, { 0x8086, 0x0137, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &mdfld_chip_ops}, #endif -#if defined(CONFIG_DRM_PSB_CDV) +#if defined(CONFIG_DRM_PSB_CDV) { 0x8086, 0x0be0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &cdv_chip_ops}, { 0x8086, 0x0be1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &cdv_chip_ops}, { 0x8086, 0x0be2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &cdv_chip_ops},
@@ -81,7 +81,7 @@ static DEFINE_PCI_DEVICE_TABLE(pciidlist) = { { 0x8086, 0x0be5, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &cdv_chip_ops}, { 0x8086, 0x0be6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &cdv_chip_ops}, { 0x8086, 0x0be7, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &cdv_chip_ops}, -#endif +#endif { 0, 0, 0} }; MODULE_DEVICE_TABLE(pci, pciidlist);
@@ -409,7 +409,7 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset)#ifdef CONFIG_MDFLD_DSI_DPU /*init dpu info*/ mdfld_dbi_dpu_init (dev); -#else +#else mdfld_dbi_dsr_init (dev);#endif /*CONFIG_MDFLD_DSI_DPU*/ /* INIT_WORK(&dev_priv->te_work, mdfld_te_handler_work);*/
drivers/staging/gma500/psb_intel_display.c +4 -4
@@ -1284,9 +1284,9 @@ const struct drm_crtc_funcs psb_intel_crtc_funcs = {*/ static void psb_intel_cursor_init (struct drm_device *dev,int pipe) { -u32 control[3 ] = {CURACNTR ,CURBCNTR ,CURCCNTR }; -u32 base[3 ] = {CURABASE ,CURBBASE ,CURCBASE }; - +u32 control[3 ] = {CURACNTR ,CURBCNTR ,CURCCNTR }; +u32 base[3 ] = {CURABASE ,CURBBASE ,CURCBASE }; +REG_WRITE (control[pipe],0 );REG_WRITE (base[pipe],0 ); }
@@ -1341,7 +1341,7 @@ void psb_intel_crtc_init(struct drm_device *dev, int pipe, psb_intel_crtc->cursor_addr =0 ;drm_crtc_helper_add (&psb_intel_crtc->base, - dev_priv->ops->crtc_helper); + dev_priv->ops->crtc_helper);/* Setup the array of drm_connector pointer array */ psb_intel_crtc->mode_set.crtc = &psb_intel_crtc->base;
PATCH 2/4 gma500: don't dynamically allocate the psb_gtt struct
From: Alan Cox <[email protected]>
It's part of the psb_device so just make it part of the struct not a pointer. This does cause a bit of noise shuffling indirections.
---
drivers/staging/gma500/accel_2d.c | 2 +- drivers/staging/gma500/framebuffer.c | 4 ++-- drivers/staging/gma500/gtt.c | 24 +++++++----------------- drivers/staging/gma500/gtt.h | 3 +-- drivers/staging/gma500/mdfld_dsi_dbi.c | 2 +- drivers/staging/gma500/mdfld_dsi_pkg_sender.c | 2 +- drivers/staging/gma500/psb_drv.c | 6 +++--- drivers/staging/gma500/psb_drv.h | 2 +- 8 files changed, 17 insertions(+), 28 deletions(-)
drivers/staging/gma500/accel_2d.c +1 -1
@@ -69,7 +69,7 @@ void psb_spank(struct drm_psb_private *dev_priv)PSB_WSGX32 (PSB_RSGX32 (PSB_CR_BIF_CTRL ) & ~_PSB_CB_CTRL_CLEAR_FAULT,PSB_CR_BIF_CTRL ); (void )PSB_RSGX32 (PSB_CR_BIF_CTRL ); -PSB_WSGX32 (dev_priv->pg->gatt_start,PSB_CR_BIF_TWOD_REQ_BASE ); +PSB_WSGX32 (dev_priv->gtt.gatt_start,PSB_CR_BIF_TWOD_REQ_BASE ); }/**
drivers/staging/gma500/framebuffer.c +2 -2
@@ -458,14 +458,14 @@ static int psbfb_create(struct psb_fbdev *fbdev, } info->screen_size = size; -if (dev_priv->pg->stolen_size) { +if (dev_priv->gtt.stolen_size) { info->apertures =alloc_apertures (1 );if (!info->apertures) { ret = -ENOMEM ; goto out_unref; } info->apertures->ranges[0 ].base = dev->mode_config.fb_base; - info->apertures->ranges[0 ].size = dev_priv->pg->stolen_size; + info->apertures->ranges[0 ].size = dev_priv->gtt.stolen_size; }drm_fb_helper_fill_fix (info, fb->pitch, fb->depth);
drivers/staging/gma500/gtt.c +7 -17
@@ -287,10 +287,10 @@ struct gtt_range *psb_gtt_alloc_range(struct drm_device *dev, int len,if (backed) {/* The start of the GTT is the stolen pages */ start = r->start; - end = r->start + dev_priv->pg->stolen_size -1 ; + end = r->start + dev_priv->gtt.stolen_size -1 ; }else {/* The rest we will use for GEM backed objects */ - start = r->start + dev_priv->pg->stolen_size; + start = r->start + dev_priv->gtt.stolen_size; end = r->end; }
@@ -332,17 +332,10 @@ void psb_gtt_free_range(struct drm_device *dev, struct gtt_range *gt)kfree (gt); } -struct psb_gtt *psb_gtt_alloc (struct drm_device *dev) +void psb_gtt_alloc (struct drm_device *dev) { -struct psb_gtt *tmp =kzalloc (sizeof (*tmp),GFP_KERNEL ); - -if (!tmp) -return NULL ; - -init_rwsem (&tmp->sem); - tmp->dev = dev; - -return tmp; +struct drm_psb_private *dev_priv = dev->dev_private; +init_rwsem (&dev_priv->gtt.sem); }void psb_gtt_takedown (struct drm_device *dev)
@@ -361,8 +354,6 @@ void psb_gtt_takedown(struct drm_device *dev) }if (dev_priv->vram_addr)iounmap (dev_priv->gtt_map); -kfree (dev_priv->pg); - dev_priv->pg =NULL ; }int psb_gtt_init (struct drm_device *dev,int resume)
@@ -381,9 +372,8 @@ int psb_gtt_init(struct drm_device *dev, int resume)mutex_init (&dev_priv->gtt_mutex); - dev_priv->pg = pg =psb_gtt_alloc (dev); -if (pg ==NULL ) -return -ENOMEM ; +psb_gtt_alloc (dev); + pg = &dev_priv->gtt;/* Enable the GTT */ pci_read_config_word (dev->pdev,PSB_GMCH_CTRL , &dev_priv->gmch_ctrl);
drivers/staging/gma500/gtt.h +1 -2
@@ -24,7 +24,6 @@/* This wants cleaning up with respect to the psb_dev and un-needed stuff */ struct psb_gtt { -struct drm_device *dev;uint32_t gatt_start;uint32_t mmu_gatt_start;uint32_t gtt_start;
@@ -36,7 +35,7 @@ struct psb_gtt {struct rw_semaphore sem; }; -/*Exported functions*/ +/* Exported functions */ extern int psb_gtt_init (struct drm_device *dev,int resume);extern void psb_gtt_takedown (struct drm_device *dev);
drivers/staging/gma500/mdfld_dsi_dbi.c +1 -1
@@ -769,7 +769,7 @@ struct mdfld_dsi_encoder *mdfld_dsi_dbi_init(struct drm_device *dev,struct drm_connector *connector =NULL ;struct drm_encoder *encoder =NULL ;struct drm_display_mode *fixed_mode =NULL ; -struct psb_gtt *pg = dev_priv ? (dev_priv->pg) :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 ;
drivers/staging/gma500/mdfld_dsi_pkg_sender.c +1 -1
@@ -953,7 +953,7 @@ int mdfld_dsi_pkg_sender_init(struct mdfld_dsi_connector *dsi_connector,mdfld_dsi_get_config (dsi_connector);struct drm_device *dev = dsi_config->dev;struct drm_psb_private *dev_priv = dev->dev_private; -struct psb_gtt *pg = dev_priv->pg; +struct psb_gtt *pg = &dev_priv->gtt;int i;struct mdfld_dsi_pkg *pkg, *tmp;
drivers/staging/gma500/psb_drv.c +3 -3
@@ -176,7 +176,7 @@ static int psb_do_init(struct drm_device *dev) {struct drm_psb_private *dev_priv = (struct drm_psb_private *) dev->dev_private; -struct psb_gtt *pg = dev_priv->pg; +struct psb_gtt *pg = &dev_priv->gtt;uint32_t stolen_gtt;
@@ -255,7 +255,7 @@ static int psb_driver_unload(struct drm_device *dev) dev_priv->pf_pd =NULL ; }if (dev_priv->mmu) { -struct psb_gtt *pg = dev_priv->pg; +struct psb_gtt *pg = &dev_priv->gtt;down_read (&pg->sem); psb_mmu_remove_pfn_sequence(
@@ -352,7 +352,7 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset)if (!dev_priv->mmu) goto out_err; - pg = dev_priv->pg; + pg = &dev_priv->gtt; tt_pages = (pg->gatt_pages <PSB_TT_PRIV0_PLIMIT ) ? (pg->gatt_pages) :PSB_TT_PRIV0_PLIMIT ;
drivers/staging/gma500/psb_drv.h +1 -1
@@ -263,7 +263,7 @@ struct drm_psb_private {struct drm_device *dev;const struct psb_ops *ops; -struct psb_gtt *pg; +struct psb_gtt gtt;/* GTT Memory manager */ struct psb_gtt_mm *gtt_mm;
PATCH 3/4 gma500: Sort out dither
In reply to Alan CoxFrom: Alan Cox <[email protected]>
Ubuntu users reported that dithering was not being set on Poulsbo, and they have a point as we set one variable and check another which is never set.
---
drivers/staging/gma500/cdv_intel_lvds.c | 3 ++- drivers/staging/gma500/mrst_lvds.c | 5 ++++- drivers/staging/gma500/psb_intel_lvds.c | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-)
drivers/staging/gma500/cdv_intel_lvds.c +2 -1
@@ -356,6 +356,7 @@ static void cdv_intel_lvds_mode_set(struct drm_encoder *encoder,struct psb_intel_mode_device *mode_dev =enc_to_psb_intel_output (encoder)->mode_dev;struct drm_device *dev = encoder->dev; +struct drm_psb_private *dev_priv = dev->dev_private;u32 pfit_control;/*
@@ -377,7 +378,7 @@ static void cdv_intel_lvds_mode_set(struct drm_encoder *encoder,else pfit_control =0 ; -if (mode_dev->panel_wants_dither) +if (dev_priv->lvds_dither) pfit_control |=PANEL_8TO6_DITHER_ENABLE ;REG_WRITE (PFIT_CONTROL , pfit_control);
drivers/staging/gma500/mrst_lvds.c +4 -1
@@ -91,6 +91,7 @@ static void mrst_lvds_mode_set(struct drm_encoder *encoder,struct psb_intel_mode_device *mode_dev =enc_to_psb_intel_output (encoder)->mode_dev;struct drm_device *dev = encoder->dev; +struct drm_psb_private *dev_priv = dev->dev_private;u32 lvds_port;uint64_t v =DRM_MODE_SCALE_FULLSCREEN ;
@@ -107,7 +108,9 @@ static void mrst_lvds_mode_set(struct drm_encoder *encoder,LVDS_PORT_EN |LVDS_BORDER_EN ; -if (mode_dev->panel_wants_dither) +/* If the firmware says dither on Moorestown, or the BIOS does +on Oaktrail then enable dithering */ +if (mode_dev->panel_wants_dither || dev_priv->lvds_dither) lvds_port |=MRST_PANEL_8TO6_DITHER_ENABLE ;REG_WRITE (LVDS , lvds_port);
drivers/staging/gma500/psb_intel_lvds.c +2 -1
@@ -470,6 +470,7 @@ static void psb_intel_lvds_mode_set(struct drm_encoder *encoder,struct psb_intel_mode_device *mode_dev =enc_to_psb_intel_output (encoder)->mode_dev;struct drm_device *dev = encoder->dev; +struct drm_psb_private *dev_priv = dev->dev_private;u32 pfit_control;/*
@@ -491,7 +492,7 @@ static void psb_intel_lvds_mode_set(struct drm_encoder *encoder,else pfit_control =0 ; -if (mode_dev->panel_wants_dither) +if (dev_priv->lvds_dither) pfit_control |=PANEL_8TO6_DITHER_ENABLE ;REG_WRITE (PFIT_CONTROL , pfit_control);
PATCH 4/4 gma500: Fix dependencies
In reply to Alan CoxFrom: Alan Cox <[email protected]>
ACPI Video is used by GMA500 so we need to depend upon it
---
drivers/staging/gma500/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/staging/gma500/Kconfig +1 -1
@@ -1,6 +1,6 @@ config DRM_PSB tristate "Intel GMA5/600 KMS Framebuffer" - depends on DRM && PCI && X86 + depends on DRM && PCI && X86 && ACPI_VIDEO select FB_CFB_COPYAREA select FB_CFB_FILLRECT select FB_CFB_IMAGEBLIT