Commit f71635e8 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/gma500: Replace references to dev_private with helper function 



Replace most references to struct drm_device.dev_private with the new
helper function to_drm_psb_private(). The only references left are in
assignments and the helper itself.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarPatrik Jakobsson <patrik.r.jakobsson@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210920141051.30988-2-tzimmermann@suse.de
parent c6dc899e

drivers/gpu/drm/gma500/backlight.c

+6 −6
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE

static void do_gma_backlight_set(struct drm_device *dev)

{

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct drm_psb_private *dev_priv = to_drm_psb_private(dev);

	backlight_update_status(dev_priv->backlight_device);

}

#endif
@@ -24,7 +24,7 @@ static void do_gma_backlight_set(struct drm_device *dev) 
void gma_backlight_enable(struct drm_device *dev)

{

#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct drm_psb_private *dev_priv = to_drm_psb_private(dev);

	dev_priv->backlight_enabled = true;

	if (dev_priv->backlight_device) {

		dev_priv->backlight_device->props.brightness = dev_priv->backlight_level;
@@ -36,7 +36,7 @@ void gma_backlight_enable(struct drm_device *dev) 
void gma_backlight_disable(struct drm_device *dev)

{

#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct drm_psb_private *dev_priv = to_drm_psb_private(dev);

	dev_priv->backlight_enabled = false;

	if (dev_priv->backlight_device) {

		dev_priv->backlight_device->props.brightness = 0;
@@ -48,7 +48,7 @@ void gma_backlight_disable(struct drm_device *dev) 
void gma_backlight_set(struct drm_device *dev, int v)

{

#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct drm_psb_private *dev_priv = to_drm_psb_private(dev);

	dev_priv->backlight_level = v;

	if (dev_priv->backlight_device && dev_priv->backlight_enabled) {

		dev_priv->backlight_device->props.brightness = v;
@@ -60,7 +60,7 @@ void gma_backlight_set(struct drm_device *dev, int v) 
int gma_backlight_init(struct drm_device *dev)

{

#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct drm_psb_private *dev_priv = to_drm_psb_private(dev);

	dev_priv->backlight_enabled = true;

	return dev_priv->ops->backlight_init(dev);

#else
@@ -71,7 +71,7 @@ int gma_backlight_init(struct drm_device *dev) 
void gma_backlight_exit(struct drm_device *dev)

{

#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct drm_psb_private *dev_priv = to_drm_psb_private(dev);

	if (dev_priv->backlight_device) {

		dev_priv->backlight_device->props.brightness = 0;

		backlight_update_status(dev_priv->backlight_device);

drivers/gpu/drm/gma500/cdv_device.c

+11 −11
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ static void cdv_disable_vga(struct drm_device *dev) 


static int cdv_output_init(struct drm_device *dev)

{

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct drm_psb_private *dev_priv = to_drm_psb_private(dev);



	drm_mode_create_scaling_mode_property(dev);
@@ -146,7 +146,7 @@ static const struct backlight_ops cdv_ops = { 


static int cdv_backlight_init(struct drm_device *dev)

{

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct drm_psb_private *dev_priv = to_drm_psb_private(dev);

	struct backlight_properties props;



	memset(&props, 0, sizeof(struct backlight_properties));
@@ -206,7 +206,7 @@ static inline void CDV_MSG_WRITE32(int domain, uint port, uint offset, 


static void cdv_init_pm(struct drm_device *dev)

{

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct drm_psb_private *dev_priv = to_drm_psb_private(dev);

	struct pci_dev *pdev = to_pci_dev(dev->dev);

	u32 pwr_cnt;

	int domain = pci_domain_nr(pdev->bus);
@@ -259,7 +259,7 @@ static void cdv_errata(struct drm_device *dev) 
 */

static int cdv_save_display_registers(struct drm_device *dev)

{

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct drm_psb_private *dev_priv = to_drm_psb_private(dev);

	struct pci_dev *pdev = to_pci_dev(dev->dev);

	struct psb_save_area *regs = &dev_priv->regs;

	struct drm_connector *connector;
@@ -314,7 +314,7 @@ static int cdv_save_display_registers(struct drm_device *dev) 
 */

static int cdv_restore_display_registers(struct drm_device *dev)

{

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct drm_psb_private *dev_priv = to_drm_psb_private(dev);

	struct pci_dev *pdev = to_pci_dev(dev->dev);

	struct psb_save_area *regs = &dev_priv->regs;

	struct drm_connector *connector;
@@ -383,7 +383,7 @@ static int cdv_restore_display_registers(struct drm_device *dev) 


static int cdv_power_down(struct drm_device *dev)

{

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct drm_psb_private *dev_priv = to_drm_psb_private(dev);

	u32 pwr_cnt, pwr_mask, pwr_sts;

	int tries = 5;
@@ -405,7 +405,7 @@ static int cdv_power_down(struct drm_device *dev) 


static int cdv_power_up(struct drm_device *dev)

{

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct drm_psb_private *dev_priv = to_drm_psb_private(dev);

	u32 pwr_cnt, pwr_mask, pwr_sts;

	int tries = 5;
@@ -440,7 +440,7 @@ static void cdv_hotplug_work_func(struct work_struct *work) 


static int cdv_hotplug_event(struct drm_device *dev)

{

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct drm_psb_private *dev_priv = to_drm_psb_private(dev);

	schedule_work(&dev_priv->hotplug_work);

	REG_WRITE(PORT_HOTPLUG_STAT, REG_READ(PORT_HOTPLUG_STAT));

	return 1;
@@ -468,7 +468,7 @@ static const char *force_audio_names[] = { 
void cdv_intel_attach_force_audio_property(struct drm_connector *connector)

{

	struct drm_device *dev = connector->dev;

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct drm_psb_private *dev_priv = to_drm_psb_private(dev);

	struct drm_property *prop;

	int i;
@@ -497,7 +497,7 @@ static const char *broadcast_rgb_names[] = { 
void cdv_intel_attach_broadcast_rgb_property(struct drm_connector *connector)

{

	struct drm_device *dev = connector->dev;

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct drm_psb_private *dev_priv = to_drm_psb_private(dev);

	struct drm_property *prop;

	int i;
@@ -574,7 +574,7 @@ static const struct psb_offset cdv_regmap[2] = { 


static int cdv_chip_setup(struct drm_device *dev)

{

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct drm_psb_private *dev_priv = to_drm_psb_private(dev);

	struct pci_dev *pdev = to_pci_dev(dev->dev);

	INIT_WORK(&dev_priv->hotplug_work, cdv_hotplug_work_func);

drivers/gpu/drm/gma500/cdv_intel_display.c

+5 −5
Original line number Diff line number Diff line
@@ -455,7 +455,7 @@ static bool cdv_intel_find_dp_pll(const struct gma_limit_t *limit, 
static bool cdv_intel_pipe_enabled(struct drm_device *dev, int pipe)

{

	struct drm_crtc *crtc;

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct drm_psb_private *dev_priv = to_drm_psb_private(dev);

	struct gma_crtc *gma_crtc = NULL;



	crtc = dev_priv->pipe_to_crtc_mapping[pipe];
@@ -489,7 +489,7 @@ void cdv_disable_sr(struct drm_device *dev) 


void cdv_update_wm(struct drm_device *dev, struct drm_crtc *crtc)

{

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct drm_psb_private *dev_priv = to_drm_psb_private(dev);

	struct gma_crtc *gma_crtc = to_gma_crtc(crtc);



	/* Is only one pipe enabled? */
@@ -574,7 +574,7 @@ static int cdv_intel_crtc_mode_set(struct drm_crtc *crtc, 
			       struct drm_framebuffer *old_fb)

{

	struct drm_device *dev = crtc->dev;

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct drm_psb_private *dev_priv = to_drm_psb_private(dev);

	struct gma_crtc *gma_crtc = to_gma_crtc(crtc);

	int pipe = gma_crtc->pipe;

	const struct psb_offset *map = &dev_priv->regmap[pipe];
@@ -829,7 +829,7 @@ static void i8xx_clock(int refclk, struct gma_clock_t *clock) 
static int cdv_intel_crtc_clock_get(struct drm_device *dev,

				struct drm_crtc *crtc)

{

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct drm_psb_private *dev_priv = to_drm_psb_private(dev);

	struct gma_crtc *gma_crtc = to_gma_crtc(crtc);

	int pipe = gma_crtc->pipe;

	const struct psb_offset *map = &dev_priv->regmap[pipe];
@@ -910,7 +910,7 @@ struct drm_display_mode *cdv_intel_crtc_mode_get(struct drm_device *dev, 
{

	struct gma_crtc *gma_crtc = to_gma_crtc(crtc);

	int pipe = gma_crtc->pipe;

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct drm_psb_private *dev_priv = to_drm_psb_private(dev);

	struct psb_pipe *p = &dev_priv->regs.pipe[pipe];

	const struct psb_offset *map = &dev_priv->regmap[pipe];

	struct drm_display_mode *mode;

drivers/gpu/drm/gma500/cdv_intel_dp.c

+6 −6
Original line number Diff line number Diff line
@@ -515,7 +515,7 @@ cdv_intel_dp_mode_valid(struct drm_connector *connector, 
	struct cdv_intel_dp *intel_dp = encoder->dev_priv;

	int max_link_clock = cdv_intel_dp_link_clock(cdv_intel_dp_max_link_bw(encoder));

	int max_lanes = cdv_intel_dp_max_lane_count(encoder);

	struct drm_psb_private *dev_priv = connector->dev->dev_private;

	struct drm_psb_private *dev_priv = to_drm_psb_private(connector->dev);



	if (is_edp(encoder) && intel_dp->panel_fixed_mode) {

		if (mode->hdisplay > intel_dp->panel_fixed_mode->hdisplay)
@@ -896,7 +896,7 @@ static bool 
cdv_intel_dp_mode_fixup(struct drm_encoder *encoder, const struct drm_display_mode *mode,

		    struct drm_display_mode *adjusted_mode)

{

	struct drm_psb_private *dev_priv = encoder->dev->dev_private;

	struct drm_psb_private *dev_priv = to_drm_psb_private(encoder->dev);

	struct gma_encoder *intel_encoder = to_gma_encoder(encoder);

	struct cdv_intel_dp *intel_dp = intel_encoder->dev_priv;

	int lane_count, clock;
@@ -988,7 +988,7 @@ cdv_intel_dp_set_m_n(struct drm_crtc *crtc, struct drm_display_mode *mode, 
		 struct drm_display_mode *adjusted_mode)

{

	struct drm_device *dev = crtc->dev;

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct drm_psb_private *dev_priv = to_drm_psb_private(dev);

	struct drm_mode_config *mode_config = &dev->mode_config;

	struct drm_encoder *encoder;

	struct gma_crtc *gma_crtc = to_gma_crtc(crtc);
@@ -1744,7 +1744,7 @@ static int cdv_intel_dp_get_modes(struct drm_connector *connector) 


	if (is_edp(intel_encoder)) {

		struct drm_device *dev = connector->dev;

		struct drm_psb_private *dev_priv = dev->dev_private;

		struct drm_psb_private *dev_priv = to_drm_psb_private(dev);



		cdv_intel_edp_panel_vdd_off(intel_encoder);

		if (ret) {
@@ -1809,7 +1809,7 @@ cdv_intel_dp_set_property(struct drm_connector *connector, 
		      struct drm_property *property,

		      uint64_t val)

{

	struct drm_psb_private *dev_priv = connector->dev->dev_private;

	struct drm_psb_private *dev_priv = to_drm_psb_private(connector->dev);

	struct gma_encoder *encoder = gma_attached_encoder(connector);

	struct cdv_intel_dp *intel_dp = encoder->dev_priv;

	int ret;
@@ -1908,7 +1908,7 @@ static void cdv_intel_dp_add_properties(struct drm_connector *connector) 
/* check the VBT to see whether the eDP is on DP-D port */

static bool cdv_intel_dpc_is_edp(struct drm_device *dev)

{

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct drm_psb_private *dev_priv = to_drm_psb_private(dev);

	struct child_device_config *p_child;

	int i;

drivers/gpu/drm/gma500/cdv_intel_lvds.c

+11 −11
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ struct cdv_intel_lvds_priv { 
 */

static u32 cdv_intel_lvds_get_max_backlight(struct drm_device *dev)

{

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct drm_psb_private *dev_priv = to_drm_psb_private(dev);

	u32 retval;



	if (gma_power_begin(dev, false)) {
@@ -81,7 +81,7 @@ static u32 cdv_intel_lvds_get_max_backlight(struct drm_device *dev) 
 */

static void cdv_intel_lvds_set_backlight(struct drm_device *dev, int level)

{

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct drm_psb_private *dev_priv = to_drm_psb_private(dev);

	u32 blc_pwm_ctl;



	if (gma_power_begin(dev, false)) {
@@ -105,7 +105,7 @@ static void cdv_intel_lvds_set_backlight(struct drm_device *dev, int level) 
static void cdv_intel_lvds_set_power(struct drm_device *dev,

				     struct drm_encoder *encoder, bool on)

{

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct drm_psb_private *dev_priv = to_drm_psb_private(dev);

	u32 pp_status;



	if (!gma_power_begin(dev, true))
@@ -154,7 +154,7 @@ static enum drm_mode_status cdv_intel_lvds_mode_valid(struct drm_connector *conn 
			      struct drm_display_mode *mode)

{

	struct drm_device *dev = connector->dev;

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct drm_psb_private *dev_priv = to_drm_psb_private(dev);

	struct drm_display_mode *fixed_mode =

					dev_priv->mode_dev.panel_fixed_mode;
@@ -180,7 +180,7 @@ static bool cdv_intel_lvds_mode_fixup(struct drm_encoder *encoder, 
				  struct drm_display_mode *adjusted_mode)

{

	struct drm_device *dev = encoder->dev;

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct drm_psb_private *dev_priv = to_drm_psb_private(dev);

	struct psb_intel_mode_device *mode_dev = &dev_priv->mode_dev;

	struct drm_encoder *tmp_encoder;

	struct drm_display_mode *panel_fixed_mode = mode_dev->panel_fixed_mode;
@@ -227,7 +227,7 @@ static bool cdv_intel_lvds_mode_fixup(struct drm_encoder *encoder, 
static void cdv_intel_lvds_prepare(struct drm_encoder *encoder)

{

	struct drm_device *dev = encoder->dev;

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct drm_psb_private *dev_priv = to_drm_psb_private(dev);

	struct psb_intel_mode_device *mode_dev = &dev_priv->mode_dev;



	if (!gma_power_begin(dev, true))
@@ -245,7 +245,7 @@ static void cdv_intel_lvds_prepare(struct drm_encoder *encoder) 
static void cdv_intel_lvds_commit(struct drm_encoder *encoder)

{

	struct drm_device *dev = encoder->dev;

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct drm_psb_private *dev_priv = to_drm_psb_private(dev);

	struct psb_intel_mode_device *mode_dev = &dev_priv->mode_dev;



	if (mode_dev->backlight_duty_cycle == 0)
@@ -260,7 +260,7 @@ static void cdv_intel_lvds_mode_set(struct drm_encoder *encoder, 
				struct drm_display_mode *adjusted_mode)

{

	struct drm_device *dev = encoder->dev;

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct drm_psb_private *dev_priv = to_drm_psb_private(dev);

	struct gma_crtc *gma_crtc = to_gma_crtc(encoder->crtc);

	u32 pfit_control;
@@ -297,7 +297,7 @@ static void cdv_intel_lvds_mode_set(struct drm_encoder *encoder, 
static int cdv_intel_lvds_get_modes(struct drm_connector *connector)

{

	struct drm_device *dev = connector->dev;

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct drm_psb_private *dev_priv = to_drm_psb_private(dev);

	struct gma_encoder *gma_encoder = gma_attached_encoder(connector);

	struct psb_intel_mode_device *mode_dev = &dev_priv->mode_dev;

	int ret;
@@ -428,7 +428,7 @@ static const struct drm_connector_funcs cdv_intel_lvds_connector_funcs = { 
static bool lvds_is_present_in_vbt(struct drm_device *dev,

				   u8 *i2c_pin)

{

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct drm_psb_private *dev_priv = to_drm_psb_private(dev);

	int i;



	if (!dev_priv->child_dev_num)
@@ -486,7 +486,7 @@ void cdv_intel_lvds_init(struct drm_device *dev, 
	struct drm_encoder *encoder;

	struct drm_display_mode *scan;

	struct drm_crtc *crtc;

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct drm_psb_private *dev_priv = to_drm_psb_private(dev);

	u32 lvds;

	int pipe;

	u8 pin;