All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alan Cox <alan@lxorguk.ukuu.org.uk>
To: airlied@linux.ie, dri-devel@lists.freedesktop.org
Subject: [PATCH 02/47] gma500: clean up some of the struct fields we no longer use
Date: Thu, 08 Mar 2012 16:00:17 +0000	[thread overview]
Message-ID: <20120308160011.7973.11607.stgit@bob.linux.org.uk> (raw)
In-Reply-To: <20120308155914.7973.16588.stgit@bob.linux.org.uk>

From: Alan Cox <alan@linux.intel.com>

Some this is Medfield stuff that may reappear in some form later, other
bits are just dead stuff

Signed-off-by: Alan Cox <alan@linux.intel.com>
---

 drivers/gpu/drm/gma500/oaktrail_crtc.c |    3 -
 drivers/gpu/drm/gma500/psb_drv.h       |   94 +-------------------------------
 2 files changed, 2 insertions(+), 95 deletions(-)


diff --git a/drivers/gpu/drm/gma500/oaktrail_crtc.c b/drivers/gpu/drm/gma500/oaktrail_crtc.c
index 9d12a3e..ff4f7ad 100644
--- a/drivers/gpu/drm/gma500/oaktrail_crtc.c
+++ b/drivers/gpu/drm/gma500/oaktrail_crtc.c
@@ -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;
 
diff --git a/drivers/gpu/drm/gma500/psb_drv.h b/drivers/gpu/drm/gma500/psb_drv.h
index eb1568a..a84a9ec 100644
--- a/drivers/gpu/drm/gma500/psb_drv.h
+++ b/drivers/gpu/drm/gma500/psb_drv.h
@@ -397,33 +397,9 @@ struct drm_psb_private {
 	struct oaktrail_vbt vbt_data;
 	struct oaktrail_gct_data gct_data;
 
-	/* MIPI Panel type etc */
-	int panel_id;
-	bool dual_mipi;		/* dual display - DPI & DBI */
-	bool dpi_panel_on;	/* The DPI panel power is on */
-	bool dpi_panel_on2;	/* The DPI panel power is on */
-	bool dbi_panel_on;	/* The DBI panel power is on */
-	bool dbi_panel_on2;	/* The DBI panel power is on */
-	u32 dsr_fb_update;	/* DSR FB update counter */
-
-	/* Moorestown HDMI state */
+	/* Oaktrail HDMI state */
 	struct oaktrail_hdmi_dev *hdmi_priv;
-
-	/* Moorestown pipe config register value cache */
-	uint32_t pipeconf;
-	uint32_t pipeconf1;
-	uint32_t pipeconf2;
-
-	/* Moorestown plane control register value cache */
-	uint32_t dspcntr;
-	uint32_t dspcntr1;
-	uint32_t dspcntr2;
-
-	/* Moorestown MM backlight cache */
-	uint8_t saveBKLTCNT;
-	uint8_t saveBKLTREQ;
-	uint8_t saveBKLTBRTL;
-
+	
 	/*
 	 * Register state
 	 */
@@ -535,78 +511,12 @@ struct drm_psb_private {
 	uint32_t msi_addr;
 	uint32_t msi_data;
 
-	/* Medfield specific register save state */
-	uint32_t saveHDMIPHYMISCCTL;
-	uint32_t saveHDMIB_CONTROL;
-	uint32_t saveDSPCCNTR;
-	uint32_t savePIPECCONF;
-	uint32_t savePIPECSRC;
-	uint32_t saveHTOTAL_C;
-	uint32_t saveHBLANK_C;
-	uint32_t saveHSYNC_C;
-	uint32_t saveVTOTAL_C;
-	uint32_t saveVBLANK_C;
-	uint32_t saveVSYNC_C;
-	uint32_t saveDSPCSTRIDE;
-	uint32_t saveDSPCSIZE;
-	uint32_t saveDSPCPOS;
-	uint32_t saveDSPCSURF;
-	uint32_t saveDSPCSTATUS;
-	uint32_t saveDSPCLINOFF;
-	uint32_t saveDSPCTILEOFF;
-	uint32_t saveDSPCCURSOR_CTRL;
-	uint32_t saveDSPCCURSOR_BASE;
-	uint32_t saveDSPCCURSOR_POS;
-	uint32_t save_palette_c[256];
-	uint32_t saveOV_OVADD_C;
-	uint32_t saveOV_OGAMC0_C;
-	uint32_t saveOV_OGAMC1_C;
-	uint32_t saveOV_OGAMC2_C;
-	uint32_t saveOV_OGAMC3_C;
-	uint32_t saveOV_OGAMC4_C;
-	uint32_t saveOV_OGAMC5_C;
-
-	/* DSI register save */
-	uint32_t saveDEVICE_READY_REG;
-	uint32_t saveINTR_EN_REG;
-	uint32_t saveDSI_FUNC_PRG_REG;
-	uint32_t saveHS_TX_TIMEOUT_REG;
-	uint32_t saveLP_RX_TIMEOUT_REG;
-	uint32_t saveTURN_AROUND_TIMEOUT_REG;
-	uint32_t saveDEVICE_RESET_REG;
-	uint32_t saveDPI_RESOLUTION_REG;
-	uint32_t saveHORIZ_SYNC_PAD_COUNT_REG;
-	uint32_t saveHORIZ_BACK_PORCH_COUNT_REG;
-	uint32_t saveHORIZ_FRONT_PORCH_COUNT_REG;
-	uint32_t saveHORIZ_ACTIVE_AREA_COUNT_REG;
-	uint32_t saveVERT_SYNC_PAD_COUNT_REG;
-	uint32_t saveVERT_BACK_PORCH_COUNT_REG;
-	uint32_t saveVERT_FRONT_PORCH_COUNT_REG;
-	uint32_t saveHIGH_LOW_SWITCH_COUNT_REG;
-	uint32_t saveINIT_COUNT_REG;
-	uint32_t saveMAX_RET_PAK_REG;
-	uint32_t saveVIDEO_FMT_REG;
-	uint32_t saveEOT_DISABLE_REG;
-	uint32_t saveLP_BYTECLK_REG;
-	uint32_t saveHS_LS_DBI_ENABLE_REG;
-	uint32_t saveTXCLKESC_REG;
-	uint32_t saveDPHY_PARAM_REG;
-	uint32_t saveMIPI_CONTROL_REG;
-	uint32_t saveMIPI;
-	uint32_t saveMIPI_C;
-
 	/* DPST register save */
 	uint32_t saveHISTOGRAM_INT_CONTROL_REG;
 	uint32_t saveHISTOGRAM_LOGIC_CONTROL_REG;
 	uint32_t savePWM_CONTROL_LOGIC;
 
 	/*
-	 * DSI info. 
-	 */
-	void * dbi_dsr_info;	
-	void * dbi_dpu_info;
-	void * dsi_configs[2];
-	/*
 	 * LID-Switch
 	 */
 	spinlock_t lid_lock;

  parent reply	other threads:[~2012-03-08 15:45 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-08 15:59 [PATCH 00/47] GMA500 updates for -next Alan Cox
2012-03-08 16:00 ` [PATCH 01/47] gma500: plug in more of the gamma functionality Alan Cox
2012-03-08 16:00 ` Alan Cox [this message]
2012-03-08 16:00 ` [PATCH 03/47] gma500: now move the Oaktrail save state into its own structure Alan Cox
2012-03-08 16:00 ` [PATCH 04/47] gma500: Kconfig documentation tweak Alan Cox
2012-03-08 16:00 ` [PATCH 05/47] intel, gma500, lvds: Fix use after free and mem leak in psb_intel_lvds_init() Alan Cox
2012-03-08 16:01 ` [PATCH 06/47] gma500: re-order calling on the fix setup so we set up after the DRM layer Alan Cox
2012-03-08 16:01 ` [PATCH 07/47] gma500: make init_pm callback in struct psb_op optional Alan Cox
2012-03-08 16:02 ` [PATCH 08/47] gma500: rework register stuff sanely Alan Cox
2012-03-08 16:02 ` [PATCH 09/47] gma500: initial medfield merge Alan Cox
2012-03-08 16:02 ` [PATCH 10/47] gma500: psbfb_create(): move depth initialization out of loop Alan Cox
2012-03-08 16:02 ` [PATCH 11/47] gma500: mdfld_dsi_output_init() drop unused parameter Alan Cox
2012-03-08 16:03 ` [PATCH 12/47] gma500: medfield: drop a bit of dead code Alan Cox
2012-03-08 16:03 ` [PATCH 13/47] gma500: gem_glue: add missing include Alan Cox
2012-03-08 16:03 ` [PATCH 14/47] gma500: drop unused psbfb_suspend()/psbfb_resume() Alan Cox
2012-03-08 16:03 ` [PATCH 15/47] gma500: mark psb_fbdev_destroy() and psb_fbdev_fini() as static Alan Cox
2012-03-08 16:03 ` [PATCH 16/47] gma500: gtt: mark psb_gtt_entry() and psb_gtt_alloc() " Alan Cox
2012-03-08 16:04 ` [PATCH 17/47] gma500: mmu: drop unused psb_get_default_pd_addr() Alan Cox
2012-03-08 16:04 ` [PATCH 18/47] gma500: mmu: mark psb_mmu_free_pt() and psb_mmu_pt_alloc_map_lock() as static Alan Cox
2012-03-08 16:04 ` [PATCH 19/47] gma500: use DRM_IOCTL_DEF_DRV instead of custom PSB_IOCTL_DEF Alan Cox
2012-03-08 16:04 ` [PATCH 20/47] gma500: fix ioctl confict Alan Cox
2012-03-08 16:05 ` [PATCH 21/47] gma500: psb_driver_load(): drop unused variables Alan Cox
2012-03-08 16:08 ` [PATCH 22/47] gma500: mark psb_driver_device_is_agp() and psb_driver_preclose() as static Alan Cox
2012-03-08 16:09 ` [PATCH 23/47] gma500: fix two -Wmissing-field-initializers warnings Alan Cox
2012-03-08 16:09 ` [PATCH 24/47] gma500: fix cdv_intel_wait_for_vblank() prototype Alan Cox
2012-03-08 16:09 ` [PATCH 25/47] gma500: cdv_intel_crt: add missing include Alan Cox
2012-03-08 16:09 ` [PATCH 26/47] gma500: cdv_intel_crt: drop dead code Alan Cox
2012-03-08 16:10 ` [PATCH 27/47] gma500: cdv_intel_crt: drop unused variables Alan Cox
2012-03-08 16:10 ` [PATCH 28/47] gma500: cdv_intel_crt: mark few functions as static Alan Cox
2012-03-08 16:10 ` [PATCH 29/47] gma500: cdv_intel_hdmi: add missing include Alan Cox
2012-03-08 16:10 ` [PATCH 30/47] gma500: cdv_intel_lvds: mark few functions as static Alan Cox
2012-03-08 16:11 ` [PATCH 31/47] gma500: cdv_intel_lvds: #if 0 currently unused functions Alan Cox
2012-03-08 16:11 ` [PATCH 32/47] gma500: mdfld_device: mark few functions as static Alan Cox
2012-03-08 16:11 ` [PATCH 33/47] gma500: mdfld_dsi_dpi: drop unused variables Alan Cox
2012-03-08 16:11 ` [PATCH 34/47] gma500: mdfld_dsi_pkg_sender: fix -Wtype-limits warning Alan Cox
2012-03-08 16:11 ` [PATCH 35/47] gma500: mdfld_intel_display: drop unused variables Alan Cox
2012-03-08 16:12 ` [PATCH 36/47] gma500: oaktrail_crtc: mark few functions as static Alan Cox
2012-03-08 16:12 ` [PATCH 37/47] gma500: oaktrail_crtc: drop unused variables Alan Cox
2012-03-08 16:12 ` [PATCH 38/47] gma500: oaktrail_hdmi: drop dead code Alan Cox
2012-03-08 16:12 ` [PATCH 39/47] gma500: oaktrail_hdmi: fix -Wmissing-field-initializers warning Alan Cox
2012-03-08 16:13 ` [PATCH 40/47] gma500: mark oaktrail_backlight_init() as static Alan Cox
2012-03-08 16:13 ` [PATCH 41/47] gma500: oaktrail_hdmi_i2c_access() drop unused variable Alan Cox
2012-03-08 16:14 ` [PATCH 42/47] gma500: oaktrail_lvds_init() " Alan Cox
2012-03-08 16:14 ` [PATCH 43/47] gma500: drop unused psb_intel_modeset_cleanup() Alan Cox
2012-03-08 16:14 ` [PATCH 44/47] gma500: mark psb_intel_pipe_set_base() as static Alan Cox
2012-03-08 16:15 ` [PATCH 45/47] gma500: psb_intel_display: drop unused variables Alan Cox
2012-03-08 16:15 ` [PATCH 46/47] gma500: mark psb_intel_sdvo_hdmi_sink_detect() as static Alan Cox
2012-03-08 16:15 ` [PATCH 47/47] gma500: psb_irq: mark mid_{enable, disable}_pipe_event() " Alan Cox

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120308160011.7973.11607.stgit@bob.linux.org.uk \
    --to=alan@lxorguk.ukuu.org.uk \
    --cc=airlied@linux.ie \
    --cc=dri-devel@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.