diff options
| author | Dave Airlie | 2018-05-25 02:28:14 +0200 |
|---|---|---|
| committer | Dave Airlie | 2018-05-25 02:28:33 +0200 |
| commit | dd41fb8547c2422f3a3a75e7226525e8bba9381c (patch) | |
| tree | 0e94d33f1fc940999d7b05d5e383fb6e13625ac8 /drivers/gpu/drm/amd/display/dc/i2caux/i2caux.c | |
| parent | Merge tag 'drm/tegra/for-4.18-rc1' of git://anongit.freedesktop.org/tegra/lin... (diff) | |
| parent | drm/amd/display: Remove use of division operator for long longs (diff) | |
| download | kernel-qcow2-linux-dd41fb8547c2422f3a3a75e7226525e8bba9381c.tar.gz kernel-qcow2-linux-dd41fb8547c2422f3a3a75e7226525e8bba9381c.tar.xz kernel-qcow2-linux-dd41fb8547c2422f3a3a75e7226525e8bba9381c.zip | |
Merge branch 'drm-next-4.18' of git://people.freedesktop.org/~agd5f/linux into drm-next
Last feature request for 4.18. Mostly vega20 support.
- Vega20 support
- clock and powergating for VCN
- misc bug fixes
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180524152427.32713-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/i2caux/i2caux.c')
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/i2caux/i2caux.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/i2caux/i2caux.c b/drivers/gpu/drm/amd/display/dc/i2caux/i2caux.c index c3d7c320fdba..14dc8c94d862 100644 --- a/drivers/gpu/drm/amd/display/dc/i2caux/i2caux.c +++ b/drivers/gpu/drm/amd/display/dc/i2caux/i2caux.c @@ -83,9 +83,7 @@ struct i2caux *dal_i2caux_create( case DCE_VERSION_8_3: return dal_i2caux_dce80_create(ctx); case DCE_VERSION_11_2: -#if defined(CONFIG_DRM_AMD_DC_VEGAM) case DCE_VERSION_11_22: -#endif return dal_i2caux_dce112_create(ctx); case DCE_VERSION_11_0: return dal_i2caux_dce110_create(ctx); |