diff options
| author | Dave Airlie | 2017-11-02 20:32:08 +0100 |
|---|---|---|
| committer | Dave Airlie | 2017-11-02 20:32:08 +0100 |
| commit | 26c860d5579684528114c3875ef88f7796330eb5 (patch) | |
| tree | fbc71d3e54f0c823a6032727a303a47ffe1fe8b6 /drivers/gpu/drm/amd/display/dc/dm_services.h | |
| parent | Merge branch 'drm-next-4.15-dc' of git://people.freedesktop.org/~agd5f/linux ... (diff) | |
| parent | drm/amdgpu/display: fix integer arithmetic problem (diff) | |
| download | kernel-qcow2-linux-26c860d5579684528114c3875ef88f7796330eb5.tar.gz kernel-qcow2-linux-26c860d5579684528114c3875ef88f7796330eb5.tar.xz kernel-qcow2-linux-26c860d5579684528114c3875ef88f7796330eb5.zip | |
Merge branch 'drm-next-4.15-dc' of git://people.freedesktop.org/~agd5f/linux into drm-next
A few fixes for DC for 4.15.
* 'drm-next-4.15-dc' of git://people.freedesktop.org/~agd5f/linux:
drm/amdgpu/display: fix integer arithmetic problem
drm/amdgpu/display: remove unused REG_OFFSET macro
drm/amdgpu/display: provide ASSERT macros unconditionally
drm/amd/display: Read resource_straps from registers for DCE12
drm/amd: Add DCE12 resource strap registers
drm/amd/display: Explicitly call ->reset for each object
drm/amd/display: Use single fail label in init_drm_dev
drm/amd/display: Use plane pointer to avoid line breaks
drm/amd/display: fix null pointer dereference
amdgpu/dc: Avoid dereferencing NULL pointer
drm/amd/display: Don't print error when bo_pin is interrupted
drm/amd/display: Use constants from atom.h for HDMI caps read
drm/amd/display: check if modeset is required before adding plane
drm/amd/display: fix high part address in dm_plane_helper_prepare_fb()
drm/amd/display : add high part address calculation for underlay
drm/amd/display: Fix no display on Fiji
Revert "drm/amd/display: Match actual state during S3 resume."
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/dm_services.h')
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dm_services.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dm_services.h b/drivers/gpu/drm/amd/display/dc/dm_services.h index c8190c38a644..d4917037ac42 100644 --- a/drivers/gpu/drm/amd/display/dc/dm_services.h +++ b/drivers/gpu/drm/amd/display/dc/dm_services.h @@ -160,9 +160,6 @@ unsigned int generic_reg_wait(const struct dc_context *ctx, /* These macros need to be used with soc15 registers in order to retrieve * the actual offset. */ -#define REG_OFFSET(reg) (reg + DCE_BASE.instance[0].segment[reg##_BASE_IDX]) -#define REG_BIF_OFFSET(reg) (reg + NBIF_BASE.instance[0].segment[reg##_BASE_IDX]) - #define dm_write_reg_soc15(ctx, reg, inst_offset, value) \ dm_write_reg_func(ctx, reg + DCE_BASE.instance[0].segment[reg##_BASE_IDX] + inst_offset, value, __func__) |