diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-05-15 15:23:47 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-05-15 15:23:48 +1000 |
| commit | 9037d4b98b255979c6636045794775f5a89cc623 (patch) | |
| tree | 4eef5575a28ee4aaa3928c87d26fb89077add084 /drivers/gpu/drm/rcar-du/rcar_du_drv.h | |
| parent | 2989b3ced370aa8e23e572c9ecaa7404d96e1c7a (diff) | |
| parent | b06078de418d6f77c81aa74516f787663f51a262 (diff) | |
| download | linux-stable-9037d4b98b255979c6636045794775f5a89cc623.tar.gz linux-stable-9037d4b98b255979c6636045794775f5a89cc623.tar.bz2 linux-stable-9037d4b98b255979c6636045794775f5a89cc623.zip | |
Merge branch 'drm/du/next' of git://linuxtv.org/pinchartl/media into drm-next
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2792436.F0zlxykWp6@avalon
Diffstat (limited to 'drivers/gpu/drm/rcar-du/rcar_du_drv.h')
| -rw-r--r-- | drivers/gpu/drm/rcar-du/rcar_du_drv.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.h b/drivers/gpu/drm/rcar-du/rcar_du_drv.h index 131d8e88b06c..b3a25e8e07d0 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.h +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.h @@ -52,7 +52,7 @@ struct rcar_du_output_routing { * @gen: device generation (2 or 3) * @features: device features (RCAR_DU_FEATURE_*) * @quirks: device quirks (RCAR_DU_QUIRK_*) - * @num_crtcs: total number of CRTCs + * @channels_mask: bit mask of available DU channels * @routes: array of CRTC to output routes, indexed by output (RCAR_DU_OUTPUT_*) * @num_lvds: number of internal LVDS encoders */ @@ -60,7 +60,7 @@ struct rcar_du_device_info { unsigned int gen; unsigned int features; unsigned int quirks; - unsigned int num_crtcs; + unsigned int channels_mask; struct rcar_du_output_routing routes[RCAR_DU_OUTPUT_MAX]; unsigned int num_lvds; unsigned int dpll_ch; |