Commit 5d5fb746 authored by Patrik Jakobsson's avatar Patrik Jakobsson
Browse files

drm/gma500: Cosmetic cleanup of irq code 



Use the gma_ prefix instead of psb_ since the code is common for all
chips. Various coding style fixes. Removal of unused code. Removal of
duplicate function declarations.

Signed-off-by: default avatarPatrik Jakobsson <patrik.r.jakobsson@gmail.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20220317092555.17882-4-patrik.r.jakobsson@gmail.com
parent 76feffd1

drivers/gpu/drm/gma500/gma_display.c

+4 −4
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include "framebuffer.h"

#include "gem.h"

#include "gma_display.h"

#include "psb_drv.h"

#include "psb_irq.h"

#include "psb_intel_drv.h"

#include "psb_intel_reg.h"
@@ -572,9 +572,9 @@ const struct drm_crtc_funcs gma_crtc_funcs = { 
	.set_config = gma_crtc_set_config,

	.destroy = gma_crtc_destroy,

	.page_flip = gma_crtc_page_flip,

	.enable_vblank = psb_enable_vblank,

	.disable_vblank = psb_disable_vblank,

	.get_vblank_counter = psb_get_vblank_counter,

	.enable_vblank = gma_enable_vblank,

	.disable_vblank = gma_disable_vblank,

	.get_vblank_counter = gma_get_vblank_counter,

};



/*

drivers/gpu/drm/gma500/opregion.c

+3 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
 */

#include <linux/acpi.h>

#include "psb_drv.h"

#include "psb_irq.h"

#include "psb_intel_reg.h"



#define PCI_ASLE 0xe4
@@ -217,8 +218,8 @@ void psb_intel_opregion_enable_asle(struct drm_device *dev) 
	if (asle && system_opregion ) {

		/* Don't do this on Medfield or other non PC like devices, they

		   use the bit for something different altogether */

		psb_enable_pipestat(dev_priv, 0, PIPE_LEGACY_BLC_EVENT_ENABLE);

		psb_enable_pipestat(dev_priv, 1, PIPE_LEGACY_BLC_EVENT_ENABLE);

		gma_enable_pipestat(dev_priv, 0, PIPE_LEGACY_BLC_EVENT_ENABLE);

		gma_enable_pipestat(dev_priv, 1, PIPE_LEGACY_BLC_EVENT_ENABLE);



		asle->tche = ASLE_ALS_EN | ASLE_BLC_EN | ASLE_PFIT_EN

								| ASLE_PFMB_EN;

drivers/gpu/drm/gma500/power.c

+5 −5
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ int gma_power_suspend(struct device *_dev) 
			dev_err(dev->dev, "GPU hardware busy, cannot suspend\n");

			return -EBUSY;

		}

		psb_irq_uninstall(dev);

		gma_irq_uninstall(dev);

		gma_suspend_display(dev);

		gma_suspend_pci(pdev);

	}
@@ -223,8 +223,8 @@ int gma_power_resume(struct device *_dev) 
	mutex_lock(&power_mutex);

	gma_resume_pci(pdev);

	gma_resume_display(pdev);

	psb_irq_preinstall(dev);

	psb_irq_postinstall(dev);

	gma_irq_preinstall(dev);

	gma_irq_postinstall(dev);

	mutex_unlock(&power_mutex);

	return 0;

}
@@ -270,8 +270,8 @@ bool gma_power_begin(struct drm_device *dev, bool force_on) 
	/* Ok power up needed */

	ret = gma_resume_pci(pdev);

	if (ret == 0) {

		psb_irq_preinstall(dev);

		psb_irq_postinstall(dev);

		gma_irq_preinstall(dev);

		gma_irq_postinstall(dev);

		pm_runtime_get(dev->dev);

		dev_priv->display_count++;

		spin_unlock_irqrestore(&power_ctrl_lock, flags);

drivers/gpu/drm/gma500/psb_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ static int psb_driver_load(struct drm_device *dev, unsigned long flags) 
	PSB_WVDC32(0xFFFFFFFF, PSB_INT_MASK_R);

	spin_unlock_irqrestore(&dev_priv->irqmask_lock, irqflags);



	psb_irq_install(dev, pdev->irq);

	gma_irq_install(dev, pdev->irq);



	dev->max_vblank_count = 0xffffff; /* only 24 bits of frame count */

drivers/gpu/drm/gma500/psb_drv.h

+0 −11
Original line number Diff line number Diff line
@@ -609,17 +609,6 @@ struct psb_ops { 
	int i2c_bus;		/* I2C bus identifier for Moorestown */

};



/* psb_irq.c */

extern int psb_enable_vblank(struct drm_crtc *crtc);

extern void psb_disable_vblank(struct drm_crtc *crtc);

void

psb_enable_pipestat(struct drm_psb_private *dev_priv, int pipe, u32 mask);



void

psb_disable_pipestat(struct drm_psb_private *dev_priv, int pipe, u32 mask);



extern u32 psb_get_vblank_counter(struct drm_crtc *crtc);



/* psb_lid.c */

extern void psb_lid_timer_init(struct drm_psb_private *dev_priv);

extern void psb_lid_timer_takedown(struct drm_psb_private *dev_priv);