···1212 * more details.1313 *1414 * You should have received a copy of the GNU General Public License along with1515- * this program; if not, write to the Free Software Foundation, Inc., 1515+ * this program; if not, write to the Free Software Foundation, Inc.,1616 * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.1717 *1818 **************************************************************************/···232232#define MDFLD_DSR_MIPI_CONTROL BIT6233233#define MDFLD_DSR_2D_3D (MDFLD_DSR_2D_3D_0 | MDFLD_DSR_2D_3D_2)234234235235-#define MDFLD_DSR_RR 45 235235+#define MDFLD_DSR_RR 45236236#define MDFLD_DPU_ENABLE BIT31237237#define MDFLD_DSR_FULLSCREEN BIT30238238#define MDFLD_DSR_DELAY (DRM_HZ / MDFLD_DSR_RR)···344344345345struct drm_psb_private {346346 /*347347- * DSI info. 347347+ * DSI info.348348 */349349- void * dbi_dsr_info; 349349+ void * dbi_dsr_info;350350 void * dsi_configs[2];351351352352 /*···387387 uint8_t *sgx_reg;388388 uint8_t *vdc_reg;389389 uint32_t gatt_free_offset;390390-390390+391391 /* IMG video context */392392 struct list_head video_ctx;393393
+1-1
drivers/staging/gma500/psb_fb.h
···1111 * more details.1212 *1313 * You should have received a copy of the GNU General Public License along with1414- * this program; if not, write to the Free Software Foundation, Inc., 1414+ * this program; if not, write to the Free Software Foundation, Inc.,1515 * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.1616 *1717 * Authors:
+1-1
drivers/staging/gma500/psb_gtt.h
···1212 * more details.1313 *1414 * You should have received a copy of the GNU General Public License along with1515- * this program; if not, write to the Free Software Foundation, Inc., 1515+ * this program; if not, write to the Free Software Foundation, Inc.,1616 * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.1717 *1818 **************************************************************************/
+1-1
drivers/staging/gma500/psb_intel_bios.h
···1111 * more details.1212 *1313 * You should have received a copy of the GNU General Public License along with1414- * this program; if not, write to the Free Software Foundation, Inc., 1414+ * this program; if not, write to the Free Software Foundation, Inc.,1515 * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.1616 *1717 * Authors:
+2-2
drivers/staging/gma500/psb_intel_display.h
···11/* copyright (c) 2008, Intel Corporation22- * 22+ *33 * This program is free software; you can redistribute it and/or modify it44 * under the terms and conditions of the GNU General Public License,55 * version 2, as published by the Free Software Foundation.···1010 * more details.1111 *1212 * You should have received a copy of the GNU General Public License along with1313- * this program; if not, write to the Free Software Foundation, Inc., 1313+ * this program; if not, write to the Free Software Foundation, Inc.,1414 * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.1515 *1616 * Authors:
+1-1
drivers/staging/gma500/psb_intel_drv.h
···1111 * more details.1212 *1313 * You should have received a copy of the GNU General Public License along with1414- * this program; if not, write to the Free Software Foundation, Inc., 1414+ * this program; if not, write to the Free Software Foundation, Inc.,1515 * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.1616 *1717 */
+11-11
drivers/staging/gma500/psb_intel_reg.h
···11/*22 * Copyright (c) 2009, Intel Corporation.33- * 33+ *44 * This program is free software; you can redistribute it and/or modify it55 * under the terms and conditions of the GNU General Public License,66 * version 2, as published by the Free Software Foundation.···1111 * more details.1212 *1313 * You should have received a copy of the GNU General Public License along with1414- * this program; if not, write to the Free Software Foundation, Inc., 1414+ * this program; if not, write to the Free Software Foundation, Inc.,1515 * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.1616 */1717#ifndef __PSB_INTEL_REG_H__···589589/*590590 * Some BIOS scratch area registers. The 845 (and 830?) store the amount591591 * of video memory available to the BIOS in SWF1.592592- */ 592592+ */593593#define SWF0 0x71410594594#define SWF1 0x71414595595#define SWF2 0x71418···695695 */696696#define MRST_DPLL_A 0x0f014697697#define MDFLD_DPLL_B 0x0f018698698-#define MDFLD_INPUT_REF_SEL (1 << 14) 699699-#define MDFLD_VCO_SEL (1 << 16) 698698+#define MDFLD_INPUT_REF_SEL (1 << 14)699699+#define MDFLD_VCO_SEL (1 << 16)700700#define DPLLA_MODE_LVDS (2 << 26) /* mrst */701701-#define MDFLD_PLL_LATCHEN (1 << 28) 702702-#define MDFLD_PWR_GATE_EN (1 << 30) 703703-#define MDFLD_P1_MASK (0x1FF << 17) 701701+#define MDFLD_PLL_LATCHEN (1 << 28)702702+#define MDFLD_PWR_GATE_EN (1 << 30)703703+#define MDFLD_P1_MASK (0x1FF << 17)704704#define MRST_FPA0 0x0f040705705#define MRST_FPA1 0x0f044706706#define MDFLD_DPLL_DIV0 0x0f048···10941094 #define DCS_PIXEL_FORMAT_3bbp 0x110951095 #define DCS_PIXEL_FORMAT_8bbp 0x210961096 #define DCS_PIXEL_FORMAT_12bbp 0x310971097- #define DCS_PIXEL_FORMAT_16bbp 0x5 10981098- #define DCS_PIXEL_FORMAT_18bbp 0x6 10971097+ #define DCS_PIXEL_FORMAT_16bbp 0x510981098+ #define DCS_PIXEL_FORMAT_18bbp 0x610991099 #define DCS_PIXEL_FORMAT_24bbp 0x711001100#define write_mem_cont 0x3c11011101/* ************************************************************************* *\···11901190 * byte alignment11911191 */11921192#define DBI_CB_TIME_OUT 0xFFFF11931193-#define GEN_FB_TIME_OUT 2000 11931193+#define GEN_FB_TIME_OUT 200011941194#define ALIGNMENT_32BYTE_MASK (~(BIT0|BIT1|BIT2|BIT3|BIT4))11951195#define SKU_83 0x0111961196#define SKU_100 0x02
+2-2
drivers/staging/gma500/psb_intel_sdvo_regs.h
···11/*22 * SDVO command definitions and structures.33- * 33+ *44 * Copyright (c) 2008, Intel Corporation55 *66 * This program is free software; you can redistribute it and/or modify it···1313 * more details.1414 *1515 * You should have received a copy of the GNU General Public License along with1616- * this program; if not, write to the Free Software Foundation, Inc., 1616+ * this program; if not, write to the Free Software Foundation, Inc.,1717 * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.1818 *1919 * Authors:
+15-15
drivers/staging/gma500/psb_powermgmt.c
···119119 crtc->funcs->save(crtc);120120 }121121 }122122-122122+123123 list_for_each_entry(connector, &dev->mode_config.connector_list, head) {124124 connector->funcs->save(connector);125125 }···194194 return;195195196196 save_display_registers(dev);197197-197197+198198 if (dev_priv->iLVDS_enable) {199199 /*shutdown the panel*/200200 PSB_WVDC32(0, PP_CONTROL);···243243 struct psb_gtt *pg = dev_priv->pg;244244245245 printk(KERN_ALERT "%s \n", __func__);246246-246246+247247#ifdef OSPM_GFX_DPK248248 printk(KERN_ALERT "%s \n", __func__);249249#endif···263263 * above.264264 */265265 /*psb_gtt_init(dev_priv->pg, 1);*/266266-266266+267267 restore_display_registers(dev);268268}269269···356356 int videoenc_access_count;357357 int videodec_access_count;358358 int display_access_count;359359- bool suspend_pci = true; 359359+ bool suspend_pci = true;360360361361 if(gbSuspendInProgress || gbResumeInProgress)362362 {···518518519519 if (islands & OSPM_DISPLAY_ISLAND) {520520 pwr_mask = PSB_PWRGT_DISPLAY_MASK;521521-521521+522522 outl(pwr_mask, (dev_priv->ospm_base + PSB_PM_SSC));523523524524 while (true) {···529529 udelay(10);530530 }531531 }532532-#endif 532532+#endif533533}534534535535···553553 * specified island's hw so don't power it off. If force_on is true,554554 * this will power on the specified island if it is off.555555 * Otherwise, this will return false and the caller is expected to not556556- * access the hw. 557557- * 558558- * NOTE *** If this is called from and interrupt handler or other atomic 556556+ * access the hw.557557+ *558558+ * NOTE *** If this is called from and interrupt handler or other atomic559559 * context, then it will return false if we are in the middle of a560560 * power state transition and the caller will be expected to handle that561561 * even if force_on is set to true.···563563bool ospm_power_using_hw_begin(int hw_island, UHBUsage usage)564564{565565 return 1; /*FIXMEAC */566566-#if 0 566566+#if 0567567 bool ret = true;568568 bool island_is_off = false;569569 bool b_atomic = (in_interrupt() || in_atomic());···702702 mutex_unlock(&power_mutex);703703704704 return ret;705705-#endif 705705+#endif706706}707707708708···739739 WARN_ON(atomic_read(&g_videoenc_access_count) < 0);740740 WARN_ON(atomic_read(&g_videodec_access_count) < 0);741741 WARN_ON(atomic_read(&g_display_access_count) < 0);742742-#endif 742742+#endif743743}744744745745int ospm_runtime_pm_allow(struct drm_device * dev)···750750void ospm_runtime_pm_forbid(struct drm_device * dev)751751{752752 struct drm_psb_private * dev_priv = dev->dev_private;753753-753753+754754 DRM_INFO("%s\n", __FUNCTION__);755755-755755+756756 pm_runtime_forbid(&dev->pdev->dev);757757 dev_priv->rpm_enabled = 0;758758}
+1-1
drivers/staging/gma500/psb_pvr_glue.h
···1111 * more details.1212 *1313 * You should have received a copy of the GNU General Public License along with1414- * this program; if not, write to the Free Software Foundation, Inc., 1414+ * this program; if not, write to the Free Software Foundation, Inc.,1515 * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.1616 *1717 */
+6-6
drivers/staging/gma500/psb_reg.h
···1414 * more details.1515 *1616 * You should have received a copy of the GNU General Public License along with1717- * this program; if not, write to the Free Software Foundation, Inc., 1717+ * this program; if not, write to the Free Software Foundation, Inc.,1818 * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA..1919 *2020 **************************************************************************/···568568#define PSB_PM_SSC 0x20569569#define PSB_PM_SSS 0x30570570#define PSB_PWRGT_DISPLAY_MASK 0xc /*on a different BA than video/gfx*/571571-#define MDFLD_PWRGT_DISPLAY_A_CNTR 0x0000000c 572572-#define MDFLD_PWRGT_DISPLAY_B_CNTR 0x0000c000 573573-#define MDFLD_PWRGT_DISPLAY_C_CNTR 0x00030000 574574-#define MDFLD_PWRGT_DISP_MIPI_CNTR 0x000c0000 571571+#define MDFLD_PWRGT_DISPLAY_A_CNTR 0x0000000c572572+#define MDFLD_PWRGT_DISPLAY_B_CNTR 0x0000c000573573+#define MDFLD_PWRGT_DISPLAY_C_CNTR 0x00030000574574+#define MDFLD_PWRGT_DISP_MIPI_CNTR 0x000c0000575575#define MDFLD_PWRGT_DISPLAY_CNTR (MDFLD_PWRGT_DISPLAY_A_CNTR | MDFLD_PWRGT_DISPLAY_B_CNTR | MDFLD_PWRGT_DISPLAY_C_CNTR | MDFLD_PWRGT_DISP_MIPI_CNTR)// 0x000fc00c576576// Display SSS register bits are different in A0 vs. B0577577#define PSB_PWRGT_GFX_MASK 0x3···582582#define MDFLD_PWRGT_DISPLAY_A_STS_B0 0x0000000c583583#define MDFLD_PWRGT_DISPLAY_B_STS_B0 0x0000c000584584#define MDFLD_PWRGT_DISPLAY_C_STS_B0 0x00030000585585-#define MDFLD_PWRGT_DISP_MIPI_STS 0x000c0000 585585+#define MDFLD_PWRGT_DISP_MIPI_STS 0x000c0000586586#define MDFLD_PWRGT_DISPLAY_STS_A0 (MDFLD_PWRGT_DISPLAY_A_STS | MDFLD_PWRGT_DISPLAY_B_STS | MDFLD_PWRGT_DISPLAY_C_STS | MDFLD_PWRGT_DISP_MIPI_STS)// 0x000fc00c587587#define MDFLD_PWRGT_DISPLAY_STS_B0 (MDFLD_PWRGT_DISPLAY_A_STS_B0 | MDFLD_PWRGT_DISPLAY_B_STS_B0 | MDFLD_PWRGT_DISPLAY_C_STS_B0 | MDFLD_PWRGT_DISP_MIPI_STS)// 0x000fc00c588588#endif
+1-1
drivers/staging/gma500/psb_sgx.h
···1111 * more details.1212 *1313 * You should have received a copy of the GNU General Public License along with1414- * this program; if not, write to the Free Software Foundation, Inc., 1414+ * this program; if not, write to the Free Software Foundation, Inc.,1515 * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.1616 *1717 * Authors:
+1-1
drivers/staging/gma500/psb_ttm_fence_api.h
···1515 * more details.1616 *1717 * You should have received a copy of the GNU General Public License along with1818- * this program; if not, write to the Free Software Foundation, Inc., 1818+ * this program; if not, write to the Free Software Foundation, Inc.,1919 * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.2020 *2121 **************************************************************************/
+1-1
drivers/staging/gma500/psb_ttm_fence_driver.h
···1515 * more details.1616 *1717 * You should have received a copy of the GNU General Public License along with1818- * this program; if not, write to the Free Software Foundation, Inc., 1818+ * this program; if not, write to the Free Software Foundation, Inc.,1919 * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.2020 *2121 **************************************************************************/
+1-1
drivers/staging/gma500/psb_ttm_fence_user.h
···1515 * more details.1616 *1717 * You should have received a copy of the GNU General Public License along with1818- * this program; if not, write to the Free Software Foundation, Inc., 1818+ * this program; if not, write to the Free Software Foundation, Inc.,1919 * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.2020 *2121 **************************************************************************/
+1-1
drivers/staging/gma500/psb_ttm_placement_user.h
···1515 * more details.1616 *1717 * You should have received a copy of the GNU General Public License along with1818- * this program; if not, write to the Free Software Foundation, Inc., 1818+ * this program; if not, write to the Free Software Foundation, Inc.,1919 * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.2020 *2121 **************************************************************************/
+1-1
drivers/staging/gma500/psb_ttm_userobj_api.h
···1515 * more details.1616 *1717 * You should have received a copy of the GNU General Public License along with1818- * this program; if not, write to the Free Software Foundation, Inc., 1818+ * this program; if not, write to the Free Software Foundation, Inc.,1919 * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.2020 *2121 **************************************************************************/