gma500: clean up some of the struct fields we no longer use
Subsystems (3)
PATCH 1/4 gma500: clean up some of the struct fields we no longer use
From: Alan Cox <[email protected]>
Some this is Medfield stuff that may reappear in some form later, other bits are just dead stuff
---
drivers/gpu/drm/gma500/oaktrail_crtc.c | 3 - drivers/gpu/drm/gma500/psb_drv.h | 94 +------------------------------- 2 files changed, 2 insertions(+), 95 deletions(-)
drivers/gpu/drm/gma500/oaktrail_crtc.c +0 -3
@@ -428,9 +428,6 @@ static int oaktrail_crtc_mode_set(struct drm_crtc *crtc,else dspcntr |=DISPPLANE_SEL_PIPE_B ; - dev_priv->dspcntr = dspcntr |=DISPLAY_PLANE_ENABLE ; - dev_priv->pipeconf = pipeconf |=PIPEACONF_ENABLE ; -if (is_mipi) goto oaktrail_crtc_mode_set_exit;
drivers/gpu/drm/gma500/psb_drv.h +2 -92
113 lines not on this page · raw message
PATCH 2/4 gma500: now move the Oaktrail save state into its own structure
From: Alan Cox <[email protected]>
---
drivers/gpu/drm/gma500/cdv_intel_display.c | 27 ++- drivers/gpu/drm/gma500/cdv_intel_lvds.c | 6 - drivers/gpu/drm/gma500/oaktrail_device.c | 204 +++++++++++++------------ drivers/gpu/drm/gma500/oaktrail_hdmi.c | 72 +++++---- drivers/gpu/drm/gma500/oaktrail_lvds.c | 2 drivers/gpu/drm/gma500/power.c | 8 - drivers/gpu/drm/gma500/psb_device.c | 34 ++-- drivers/gpu/drm/gma500/psb_drv.h | 226 +++++++++++++++------------- drivers/gpu/drm/gma500/psb_intel_display.c | 27 ++- drivers/gpu/drm/gma500/psb_intel_lvds.c | 12 + 10 files changed, 322 insertions(+), 296 deletions(-)
drivers/gpu/drm/gma500/cdv_intel_display.c +16 -11
@@ -968,7 +968,7 @@ void cdv_intel_crtc_load_lut(struct drm_crtc *crtc)gma_power_end (dev); }else {for (i =0 ; i <256 ; i++) { - dev_priv->save_palette_a[i] = + dev_priv->regs.save_palette_a[i] = ((psb_intel_crtc->lut_r[i] + psb_intel_crtc->lut_adj[i]) << 16) | ((psb_intel_crtc->lut_g[i] +
@@ -1338,18 +1338,19 @@ static int cdv_intel_crtc_clock_get(struct drm_device *dev,gma_power_end (dev); }else { dpll = (pipe ==0 ) ? - dev_priv->saveDPLL_A : dev_priv->saveDPLL_B; + dev_priv->regs.saveDPLL_A : dev_priv->regs.saveDPLL_B;if ((dpll &DISPLAY_RATE_SELECT_FPA1 ) ==0 ) fp = (pipe ==0 ) ? - dev_priv->saveFPA0 : - dev_priv->saveFPB0; + dev_priv->regs.saveFPA0 : + dev_priv->regs.saveFPB0;else fp = (pipe ==0 ) ? - dev_priv->saveFPA1 : - dev_priv->saveFPB1; + dev_priv->regs.saveFPA1 : + dev_priv->regs.saveFPB1; - is_lvds = (pipe ==1 ) && (dev_priv->saveLVDS &LVDS_PORT_EN ); + is_lvds = (pipe ==1 ) && + (dev_priv->regs.saveLVDS &LVDS_PORT_EN ); } clock.m1 = (fp &FP_M1_DIV_MASK ) >>FP_M1_DIV_SHIFT ;
@@ -1419,13 +1420,17 @@ struct drm_display_mode *cdv_intel_crtc_mode_get(struct drm_device *dev,gma_power_end (dev); }else { htot = (pipe ==0 ) ? - dev_priv->saveHTOTAL_A : dev_priv->saveHTOTAL_B; + dev_priv->regs.saveHTOTAL_A : + dev_priv->regs.saveHTOTAL_B; hsync = (pipe ==0 ) ? - dev_priv->saveHSYNC_A : dev_priv->saveHSYNC_B; + dev_priv->regs.saveHSYNC_A : + dev_priv->regs.saveHSYNC_B; vtot = (pipe ==0 ) ? - dev_priv->saveVTOTAL_A : dev_priv->saveVTOTAL_B; + dev_priv->regs.saveVTOTAL_A : + dev_priv->regs.saveVTOTAL_B; vsync = (pipe ==0 ) ? - dev_priv->saveVSYNC_A : dev_priv->saveVSYNC_B; + dev_priv->regs.saveVSYNC_A : + dev_priv->regs.saveVSYNC_B; } mode =kzalloc (sizeof (*mode),GFP_KERNEL );
drivers/gpu/drm/gma500/cdv_intel_lvds.c +3 -3
@@ -78,7 +78,7 @@ static u32 cdv_intel_lvds_get_max_backlight(struct drm_device *dev)gma_power_end (dev); }else - retval = ((dev_priv->saveBLC_PWM_CTL & + retval = ((dev_priv->regs.saveBLC_PWM_CTL &BACKLIGHT_MODULATION_FREQ_MASK ) >>BACKLIGHT_MODULATION_FREQ_SHIFT ) *2 ;
@@ -184,9 +184,9 @@ static void cdv_intel_lvds_set_backlight(struct drm_device *dev, int level) (level << BACKLIGHT_DUTY_CYCLE_SHIFT)));gma_power_end (dev); }else { - blc_pwm_ctl = dev_priv->saveBLC_PWM_CTL & + blc_pwm_ctl = dev_priv->regs.saveBLC_PWM_CTL & ~BACKLIGHT_DUTY_CYCLE_MASK ; - dev_priv->saveBLC_PWM_CTL = (blc_pwm_ctl | + dev_priv->regs.saveBLC_PWM_CTL = (blc_pwm_ctl | (level <<BACKLIGHT_DUTY_CYCLE_SHIFT )); } }
drivers/gpu/drm/gma500/oaktrail_device.c +103 -101
283 lines not on this page · raw message
drivers/gpu/drm/gma500/oaktrail_hdmi.c +37 -35
119 lines not on this page · raw message
drivers/gpu/drm/gma500/oaktrail_lvds.c +1 -1
@@ -192,7 +192,7 @@ static u32 oaktrail_lvds_get_max_backlight(struct drm_device *dev)gma_power_end (dev); }else - ret = ((dev_priv->saveBLC_PWM_CTL & + ret = ((dev_priv->regs.saveBLC_PWM_CTL &BACKLIGHT_MODULATION_FREQ_MASK ) >>BACKLIGHT_MODULATION_FREQ_SHIFT ) *2 ;
drivers/gpu/drm/gma500/power.c +4 -4
@@ -132,9 +132,9 @@ static void gma_suspend_pci(struct pci_dev *pdev)pci_save_state (pdev);pci_read_config_dword (pdev,0x5C , &bsm); - dev_priv->saveBSM = bsm; + dev_priv->regs.saveBSM = bsm;pci_read_config_dword (pdev,0xFC , &vbt); - dev_priv->saveVBT = vbt; + dev_priv->regs.saveVBT = vbt;pci_read_config_dword (pdev, PSB_PCIx_MSI_ADDR_LOC, &dev_priv->msi_addr);pci_read_config_dword (pdev, PSB_PCIx_MSI_DATA_LOC, &dev_priv->msi_data);
@@ -162,8 +162,8 @@ static bool gma_resume_pci(struct pci_dev *pdev)pci_set_power_state (pdev,PCI_D0 );pci_restore_state (pdev); -pci_write_config_dword (pdev,0x5c , dev_priv->saveBSM); -pci_write_config_dword (pdev,0xFC , dev_priv->saveVBT); +pci_write_config_dword (pdev,0x5c , dev_priv->regs.saveBSM); +pci_write_config_dword (pdev,0xFC , dev_priv->regs.saveVBT);/* restoring MSI address and data in PCIx space */ pci_write_config_dword (pdev, PSB_PCIx_MSI_ADDR_LOC, dev_priv->msi_addr);pci_write_config_dword (pdev, PSB_PCIx_MSI_DATA_LOC, dev_priv->msi_data);
drivers/gpu/drm/gma500/psb_device.c +18 -16
@@ -177,16 +177,17 @@ static int psb_save_display_registers(struct drm_device *dev)struct drm_psb_private *dev_priv = dev->dev_private;struct drm_crtc *crtc;struct drm_connector *connector; +struct psb_state *regs = &dev_priv->regs;/* Display arbitration control + watermarks */ - dev_priv->saveDSPARB =PSB_RVDC32 (DSPARB ); - dev_priv->saveDSPFW1 =PSB_RVDC32 (DSPFW1 ); - dev_priv->saveDSPFW2 =PSB_RVDC32 (DSPFW2 ); - dev_priv->saveDSPFW3 =PSB_RVDC32 (DSPFW3 ); - dev_priv->saveDSPFW4 =PSB_RVDC32 (DSPFW4 ); - dev_priv->saveDSPFW5 =PSB_RVDC32 (DSPFW5 ); - dev_priv->saveDSPFW6 =PSB_RVDC32 (DSPFW6 ); - dev_priv->saveCHICKENBIT =PSB_RVDC32 (DSPCHICKENBIT ); + regs->saveDSPARB =PSB_RVDC32 (DSPARB ); + regs->saveDSPFW1 =PSB_RVDC32 (DSPFW1 ); + regs->saveDSPFW2 =PSB_RVDC32 (DSPFW2 ); + regs->saveDSPFW3 =PSB_RVDC32 (DSPFW3 ); + regs->saveDSPFW4 =PSB_RVDC32 (DSPFW4 ); + regs->saveDSPFW5 =PSB_RVDC32 (DSPFW5 ); + regs->saveDSPFW6 =PSB_RVDC32 (DSPFW6 ); + regs->saveCHICKENBIT =PSB_RVDC32 (DSPCHICKENBIT );/* Save crtc and output state */ mutex_lock (&dev->mode_config.mutex);
@@ -213,16 +214,17 @@ static int psb_restore_display_registers(struct drm_device *dev)struct drm_psb_private *dev_priv = dev->dev_private;struct drm_crtc *crtc;struct drm_connector *connector; +struct psb_state *regs = &dev_priv->regs;/* Display arbitration + watermarks */ -PSB_WVDC32 (dev_priv->saveDSPARB,DSPARB ); -PSB_WVDC32 (dev_priv->saveDSPFW1,DSPFW1 ); -PSB_WVDC32 (dev_priv->saveDSPFW2,DSPFW2 ); -PSB_WVDC32 (dev_priv->saveDSPFW3,DSPFW3 ); -PSB_WVDC32 (dev_priv->saveDSPFW4,DSPFW4 ); -PSB_WVDC32 (dev_priv->saveDSPFW5,DSPFW5 ); -PSB_WVDC32 (dev_priv->saveDSPFW6,DSPFW6 ); -PSB_WVDC32 (dev_priv->saveCHICKENBIT,DSPCHICKENBIT ); +PSB_WVDC32 (regs->saveDSPARB,DSPARB ); +PSB_WVDC32 (regs->saveDSPFW1,DSPFW1 ); +PSB_WVDC32 (regs->saveDSPFW2,DSPFW2 ); +PSB_WVDC32 (regs->saveDSPFW3,DSPFW3 ); +PSB_WVDC32 (regs->saveDSPFW4,DSPFW4 ); +PSB_WVDC32 (regs->saveDSPFW5,DSPFW5 ); +PSB_WVDC32 (regs->saveDSPFW6,DSPFW6 ); +PSB_WVDC32 (regs->saveCHICKENBIT,DSPCHICKENBIT );/*make sure VGA plane is off. it initializes to on after reset!*/ PSB_WVDC32 (0x80000000 ,VGACNTRL );
drivers/gpu/drm/gma500/psb_drv.h +118 -108
242 lines not on this page · raw message
drivers/gpu/drm/gma500/psb_intel_display.c +16 -11
@@ -845,7 +845,7 @@ void psb_intel_crtc_load_lut(struct drm_crtc *crtc)gma_power_end (dev); }else {for (i =0 ; i <256 ; i++) { - dev_priv->save_palette_a[i] = + dev_priv->regs.save_palette_a[i] = ((psb_intel_crtc->lut_r[i] + psb_intel_crtc->lut_adj[i]) << 16) | ((psb_intel_crtc->lut_g[i] +
@@ -1141,18 +1141,19 @@ static int psb_intel_crtc_clock_get(struct drm_device *dev,gma_power_end (dev); }else { dpll = (pipe ==0 ) ? - dev_priv->saveDPLL_A : dev_priv->saveDPLL_B; + dev_priv->regs.saveDPLL_A : dev_priv->regs.saveDPLL_B;if ((dpll &DISPLAY_RATE_SELECT_FPA1 ) ==0 ) fp = (pipe ==0 ) ? - dev_priv->saveFPA0 : - dev_priv->saveFPB0; + dev_priv->regs.saveFPA0 : + dev_priv->regs.saveFPB0;else fp = (pipe ==0 ) ? - dev_priv->saveFPA1 : - dev_priv->saveFPB1; + dev_priv->regs.saveFPA1 : + dev_priv->regs.saveFPB1; - is_lvds = (pipe ==1 ) && (dev_priv->saveLVDS &LVDS_PORT_EN ); + is_lvds = (pipe ==1 ) && (dev_priv->regs.saveLVDS & +LVDS_PORT_EN ); } clock.m1 = (fp &FP_M1_DIV_MASK ) >>FP_M1_DIV_SHIFT ;
@@ -1218,13 +1219,17 @@ struct drm_display_mode *psb_intel_crtc_mode_get(struct drm_device *dev,gma_power_end (dev); }else { htot = (pipe ==0 ) ? - dev_priv->saveHTOTAL_A : dev_priv->saveHTOTAL_B; + dev_priv->regs.saveHTOTAL_A : + dev_priv->regs.saveHTOTAL_B; hsync = (pipe ==0 ) ? - dev_priv->saveHSYNC_A : dev_priv->saveHSYNC_B; + dev_priv->regs.saveHSYNC_A : + dev_priv->regs.saveHSYNC_B; vtot = (pipe ==0 ) ? - dev_priv->saveVTOTAL_A : dev_priv->saveVTOTAL_B; + dev_priv->regs.saveVTOTAL_A : + dev_priv->regs.saveVTOTAL_B; vsync = (pipe ==0 ) ? - dev_priv->saveVSYNC_A : dev_priv->saveVSYNC_B; + dev_priv->regs.saveVSYNC_A : + dev_priv->regs.saveVSYNC_B; } mode =kzalloc (sizeof (*mode),GFP_KERNEL );
drivers/gpu/drm/gma500/psb_intel_lvds.c +6 -6
@@ -77,7 +77,7 @@ static u32 psb_intel_lvds_get_max_backlight(struct drm_device *dev) ret =REG_READ (BLC_PWM_CTL );gma_power_end (dev); }else /* Powered off, use the saved value */ - ret = dev_priv->saveBLC_PWM_CTL; + ret = dev_priv->regs.saveBLC_PWM_CTL;/* Top 15bits hold the frequency mask */ ret = (ret & BACKLIGHT_MODULATION_FREQ_MASK) >>
@@ -86,7 +86,7 @@ static u32 psb_intel_lvds_get_max_backlight(struct drm_device *dev) ret *=2 ;/* Return a 16bit range as needed for setting */ if (ret ==0 )dev_err (dev->dev,"BL bug: Reg %08x save %08X\n" , -REG_READ (BLC_PWM_CTL ), dev_priv->saveBLC_PWM_CTL); +REG_READ (BLC_PWM_CTL ), dev_priv->regs.saveBLC_PWM_CTL);return ret; }
@@ -203,13 +203,13 @@ static void psb_intel_lvds_set_backlight(struct drm_device *dev, int level)REG_WRITE (BLC_PWM_CTL , (blc_pwm_ctl | (level <<BACKLIGHT_DUTY_CYCLE_SHIFT ))); - dev_priv->saveBLC_PWM_CTL = (blc_pwm_ctl | + dev_priv->regs.saveBLC_PWM_CTL = (blc_pwm_ctl | (level <<BACKLIGHT_DUTY_CYCLE_SHIFT ));gma_power_end (dev); }else { - blc_pwm_ctl = dev_priv->saveBLC_PWM_CTL & + blc_pwm_ctl = dev_priv->regs.saveBLC_PWM_CTL & ~BACKLIGHT_DUTY_CYCLE_MASK ; - dev_priv->saveBLC_PWM_CTL = (blc_pwm_ctl | + dev_priv->regs.saveBLC_PWM_CTL = (blc_pwm_ctl | (level <<BACKLIGHT_DUTY_CYCLE_SHIFT )); } }
@@ -283,7 +283,7 @@ static void psb_intel_lvds_save(struct drm_connector *connector) lvds_priv->savePFIT_PGM_RATIOS =REG_READ (PFIT_PGM_RATIOS );/*TODO: move backlight_duty_cycle to psb_intel_lvds_priv*/ - dev_priv->backlight_duty_cycle = (dev_priv->saveBLC_PWM_CTL & + dev_priv->backlight_duty_cycle = (dev_priv->regs.saveBLC_PWM_CTL &BACKLIGHT_DUTY_CYCLE_MASK );/*
PATCH 3/4 gma500: Kconfig documentation tweak
In reply to Alan CoxFrom: Alan Cox <[email protected]>
Update this to better reflect the status
---
drivers/gpu/drm/gma500/Kconfig | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
drivers/gpu/drm/gma500/Kconfig +1 -2
@@ -16,8 +16,7 @@ config DRM_GMA600 depends on DRM_GMA500 help Say yes to include support for GMA600 (Intel Moorestown/Oaktrail) - platforms with LVDS ports. HDMI and MIPI are not currently - supported. + platforms with LVDS ports. MIPI is not currently supported. config DRM_GMA3600 bool "Intel GMA3600/3650 support (Experimental)"
PATCH 4/4 intel, gma500, lvds: Fix use after free and mem leak in psb_intel_lvds_init()
In reply to Alan CoxFrom: Jesper Juhl <[email protected]>
In psb_intel_lvds_init(), if we fail to allocate memory for 'psb_intel_connector' we free the memory we previously allocated for 'psb_intel_encoder', but we then proceed to use that free'd pointer when we do 'psb_intel_encoder->dev_priv = lvds_priv;'.
We may also leak the memory we allocated for 'psb_intel_encoder' if we 'goto failed_connector;' and the variable goes out of scope.
While I was there anyway, I also removed the pointless 'if (psb_intel_connector)' before freeing it at the 'failed_connector:' label - kfree() deals gracefully with NULL pointers, so it is not needed.
---
drivers/gpu/drm/gma500/psb_intel_lvds.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-)
drivers/gpu/drm/gma500/psb_intel_lvds.c +4 -5
@@ -713,7 +713,6 @@ void psb_intel_lvds_init(struct drm_device *dev, psb_intel_encoder =kzalloc (sizeof (struct psb_intel_encoder ),GFP_KERNEL ); -if (!psb_intel_encoder) {dev_err (dev->dev,"psb_intel_encoder allocation error\n" );return ;
@@ -721,10 +720,9 @@ void psb_intel_lvds_init(struct drm_device *dev, psb_intel_connector =kzalloc (sizeof (struct psb_intel_connector ),GFP_KERNEL ); -if (!psb_intel_connector) { -kfree (psb_intel_encoder);dev_err (dev->dev,"psb_intel_connector allocation error\n" ); + goto failed_encoder; } lvds_priv =kzalloc (sizeof (struct psb_intel_lvds_priv ),GFP_KERNEL );
@@ -862,7 +860,8 @@ failed_blc_i2c:drm_encoder_cleanup (encoder);drm_connector_cleanup (connector); failed_connector: -if (psb_intel_connector) -kfree (psb_intel_connector); +kfree (psb_intel_connector); +failed_encoder: +kfree (psb_intel_encoder); }