diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-07-06 06:28:05 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-07-06 06:29:24 +1000 |
| commit | 96b2bb0b9637df1a68bb5b6853903a207fabcefd (patch) | |
| tree | 6f9d61aeb2a46c0492aa18a98b77106c84306724 /drivers/gpu/drm/omapdrm/dss/dss.h | |
| parent | f29135ee4e0d4e01911ed569f731bfdb841cea6d (diff) | |
| parent | f8466184bd5b5c21eb6196cd0e44668725a2e47a (diff) | |
Merge tag 'omapdrm-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux into drm-next
omapdrm changes for 4.19
* Workaround for DRA7 errata i932
* Fix mm_list locking
* Cleanups
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/88b2e77f-9646-d15f-645b-ba45af2a1966@ti.com
Diffstat (limited to 'drivers/gpu/drm/omapdrm/dss/dss.h')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/dss/dss.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/dss.h b/drivers/gpu/drm/omapdrm/dss/dss.h index 847c78ade024..38302631b64b 100644 --- a/drivers/gpu/drm/omapdrm/dss/dss.h +++ b/drivers/gpu/drm/omapdrm/dss/dss.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2009 Nokia Corporation - * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com> + * Author: Tomi Valkeinen <tomi.valkeinen@ti.com> * * Some code and ideas taken from drivers/video/omap/ driver * by Imre Deak. @@ -180,6 +180,9 @@ struct dss_pll_hw { /* DRA7 errata i886: use high N & M to avoid jitter */ bool errata_i886; + + /* DRA7 errata i932: retry pll lock on failure */ + bool errata_i932; }; struct dss_pll { |