From: Jani Nikula Date: Tue, 2 Feb 2021 12:39:24 +0000 (+0200) Subject: Merge tag 'topic/drm-device-pdev-2021-02-02' of git://anongit.freedesktop.org/drm... X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=eaf9a3465d9b1fd1dc5a9a151380d84ac3789964;p=kernel.git 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: Jani Nikula From: Jani Nikula Link: https://patchwork.freedesktop.org/patch/msgid/87y2g6fxxv.fsf@intel.com --- eaf9a3465d9b1fd1dc5a9a151380d84ac3789964 diff --cc drivers/gpu/drm/i915/display/intel_panel.c index 5fdf526431508,37bc7dad04505..4653b5ef382fd --- a/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)) {