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

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

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87y2g6fxxv.fsf@intel.com

diff --cc drivers/gpu/drm/i915/display/intel_bios.c
Simple merge

diff --cc drivers/gpu/drm/i915/display/intel_panel.c
index 5fdf526,37bc7da..4653b5e
--- 1/drivers/gpu/drm/i915/display/intel_panel.c
--- 2/drivers/gpu/drm/i915/display/intel_panel.c
+++ b/drivers/gpu/drm/i915/display/intel_panel.c
@@@ -662,9 -629,9 +662,9 @@@ static void i9xx_set_backlight(const st
        if (panel->backlight.combination_mode) {
                u8 lbpc;
  
 -              lbpc = level * 0xfe / panel->backlight.max + 1;
 +              lbpc = level * 0xfe / panel->backlight.pwm_level_max + 1;
                level /= lbpc;
-               pci_write_config_byte(dev_priv->drm.pdev, LBPC, lbpc);
+               pci_write_config_byte(to_pci_dev(dev_priv->drm.dev), LBPC, lbpc);
        }
  
        if (IS_GEN(dev_priv, 4)) {

diff --cc drivers/gpu/drm/i915/i915_drv.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_drv.h
Simple merge

diff --cc drivers/gpu/drm/i915/i915_irq.c
Simple merge