diff options
| author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2021-10-12 12:03:58 -0400 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2021-10-12 12:03:58 -0400 |
| commit | d9f673051ab54dd5263fef6da97ef08feedaa754 (patch) | |
| tree | 6d7e19bd3345bd43e3488d17f6cb60ff16289b3d /drivers/gpu/drm/gma500/psb_lid.c | |
| parent | 814c8757115f9d7135126ac43d3a178b31e796dd (diff) | |
| parent | 1176d15f0f6e556d54ced510ac4a91694960332b (diff) | |
Merge drm/drm-next into drm-intel-next
Need to resync drm-intel-next with TTM and PXP stuff from
drm-intel-gt-next that is now in drm/drm-next.
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'drivers/gpu/drm/gma500/psb_lid.c')
| -rw-r--r-- | drivers/gpu/drm/gma500/psb_lid.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/gma500/psb_lid.c b/drivers/gpu/drm/gma500/psb_lid.c index 97b0c52bfd8a..58a7fe392636 100644 --- a/drivers/gpu/drm/gma500/psb_lid.c +++ b/drivers/gpu/drm/gma500/psb_lid.c @@ -14,7 +14,7 @@ static void psb_lid_timer_func(struct timer_list *t) { struct drm_psb_private *dev_priv = from_timer(dev_priv, t, lid_timer); - struct drm_device *dev = (struct drm_device *)dev_priv->dev; + struct drm_device *dev = (struct drm_device *)&dev_priv->dev; struct timer_list *lid_timer = &dev_priv->lid_timer; unsigned long irq_flags; u32 __iomem *lid_state = dev_priv->opregion.lid_state; |