Commit eaf9a346 authored by Jani Nikula's avatar Jani Nikula
Browse files

Merge tag 'topic/drm-device-pdev-2021-02-02' of... 

Merge tag 'topic/drm-device-pdev-2021-02-02' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-intel-next

Driver Changes:
- drm/i915: Remove references to struct drm_device.pdev

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87y2g6fxxv.fsf@intel.com
parents 29e92559 9ff06c38

drivers/gpu/drm/i915/display/intel_bios.c

+1 −1
Original line number Diff line number Diff line
@@ -2127,7 +2127,7 @@ bool intel_bios_is_valid_vbt(const void *buf, size_t size) 


static struct vbt_header *oprom_get_vbt(struct drm_i915_private *dev_priv)

{

	struct pci_dev *pdev = dev_priv->drm.pdev;

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

	void __iomem *p = NULL, *oprom;

	struct vbt_header *vbt;

	u16 vbt_size;

drivers/gpu/drm/i915/display/intel_cdclk.c

+7 −7
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static void fixed_450mhz_get_cdclk(struct drm_i915_private *dev_priv, 
static void i85x_get_cdclk(struct drm_i915_private *dev_priv,

			   struct intel_cdclk_config *cdclk_config)

{

	struct pci_dev *pdev = dev_priv->drm.pdev;

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

	u16 hpllcc = 0;



	/*
@@ -138,7 +138,7 @@ static void i85x_get_cdclk(struct drm_i915_private *dev_priv, 
static void i915gm_get_cdclk(struct drm_i915_private *dev_priv,

			     struct intel_cdclk_config *cdclk_config)

{

	struct pci_dev *pdev = dev_priv->drm.pdev;

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

	u16 gcfgc = 0;



	pci_read_config_word(pdev, GCFGC, &gcfgc);
@@ -162,7 +162,7 @@ static void i915gm_get_cdclk(struct drm_i915_private *dev_priv, 
static void i945gm_get_cdclk(struct drm_i915_private *dev_priv,

			     struct intel_cdclk_config *cdclk_config)

{

	struct pci_dev *pdev = dev_priv->drm.pdev;

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

	u16 gcfgc = 0;



	pci_read_config_word(pdev, GCFGC, &gcfgc);
@@ -256,7 +256,7 @@ static unsigned int intel_hpll_vco(struct drm_i915_private *dev_priv) 
static void g33_get_cdclk(struct drm_i915_private *dev_priv,

			  struct intel_cdclk_config *cdclk_config)

{

	struct pci_dev *pdev = dev_priv->drm.pdev;

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

	static const u8 div_3200[] = { 12, 10,  8,  7, 5, 16 };

	static const u8 div_4000[] = { 14, 12, 10,  8, 6, 20 };

	static const u8 div_4800[] = { 20, 14, 12, 10, 8, 24 };
@@ -305,7 +305,7 @@ static void g33_get_cdclk(struct drm_i915_private *dev_priv, 
static void pnv_get_cdclk(struct drm_i915_private *dev_priv,

			  struct intel_cdclk_config *cdclk_config)

{

	struct pci_dev *pdev = dev_priv->drm.pdev;

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

	u16 gcfgc = 0;



	pci_read_config_word(pdev, GCFGC, &gcfgc);
@@ -339,7 +339,7 @@ static void pnv_get_cdclk(struct drm_i915_private *dev_priv, 
static void i965gm_get_cdclk(struct drm_i915_private *dev_priv,

			     struct intel_cdclk_config *cdclk_config)

{

	struct pci_dev *pdev = dev_priv->drm.pdev;

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

	static const u8 div_3200[] = { 16, 10,  8 };

	static const u8 div_4000[] = { 20, 12, 10 };

	static const u8 div_5333[] = { 24, 16, 14 };
@@ -384,7 +384,7 @@ static void i965gm_get_cdclk(struct drm_i915_private *dev_priv, 
static void gm45_get_cdclk(struct drm_i915_private *dev_priv,

			   struct intel_cdclk_config *cdclk_config)

{

	struct pci_dev *pdev = dev_priv->drm.pdev;

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

	unsigned int cdclk_sel;

	u16 tmp = 0;

drivers/gpu/drm/i915/display/intel_csr.c

+1 −1
Original line number Diff line number Diff line
@@ -644,7 +644,7 @@ static void csr_load_work_fn(struct work_struct *work) 
	dev_priv = container_of(work, typeof(*dev_priv), csr.work);

	csr = &dev_priv->csr;



	request_firmware(&fw, dev_priv->csr.fw_path, &dev_priv->drm.pdev->dev);

	request_firmware(&fw, dev_priv->csr.fw_path, dev_priv->drm.dev);

	parse_csr_fw(dev_priv, fw);



	if (dev_priv->csr.dmc_payload) {

drivers/gpu/drm/i915/display/intel_dsi_vbt.c

+1 −1
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ static void i2c_acpi_find_adapter(struct intel_dsi *intel_dsi, 
				  const u16 slave_addr)

{

	struct drm_device *drm_dev = intel_dsi->base.base.dev;

	struct device *dev = &drm_dev->pdev->dev;

	struct device *dev = drm_dev->dev;

	struct acpi_device *acpi_dev;

	struct list_head resource_list;

	struct i2c_adapter_lookup lookup;

drivers/gpu/drm/i915/display/intel_fbdev.c

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ static int intelfb_create(struct drm_fb_helper *helper, 
	struct intel_framebuffer *intel_fb = ifbdev->fb;

	struct drm_device *dev = helper->dev;

	struct drm_i915_private *dev_priv = to_i915(dev);

	struct pci_dev *pdev = dev_priv->drm.pdev;

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

	struct i915_ggtt *ggtt = &dev_priv->ggtt;

	const struct i915_ggtt_view view = {

		.type = I915_GGTT_VIEW_NORMAL,