diff options
| author | Sean Paul <seanpaul@chromium.org> | 2017-07-17 11:43:05 -0400 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2017-07-17 11:56:07 -0400 |
| commit | ef434a0c2ce765ad33026375db7d23aebd5e9532 (patch) | |
| tree | 4bdac59f0bac3a6508741e6bd62da6e770fc3bc1 /drivers/gpu/drm/amd/amdgpu/atombios_crtc.c | |
| parent | 76250f2b743b72cb685cc51ac0cdabb32957180b (diff) | |
| parent | 1ed134e6526b1b513a14fba938f6d96aa1c7f3dd (diff) | |
| download | talos-op-linux-ef434a0c2ce765ad33026375db7d23aebd5e9532.tar.gz talos-op-linux-ef434a0c2ce765ad33026375db7d23aebd5e9532.zip | |
Merge branch 'drm-misc-next-fixes' into drm-misc-fixes
Pick up
1ed134e6526b drm/vc4: Fix VBLANK handling in crtc->enable() path
From drm-misc-next-fixes, it was applied after the last pull request
was sent from that branch. We'll send it through drm-fixes instead.
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/atombios_crtc.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/atombios_crtc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/atombios_crtc.c b/drivers/gpu/drm/amd/amdgpu/atombios_crtc.c index 8c9bc75a9c2d..8a0818b23ea4 100644 --- a/drivers/gpu/drm/amd/amdgpu/atombios_crtc.c +++ b/drivers/gpu/drm/amd/amdgpu/atombios_crtc.c @@ -165,7 +165,7 @@ void amdgpu_atombios_crtc_powergate(struct drm_crtc *crtc, int state) struct drm_device *dev = crtc->dev; struct amdgpu_device *adev = dev->dev_private; int index = GetIndexIntoMasterTable(COMMAND, EnableDispPowerGating); - ENABLE_DISP_POWER_GATING_PARAMETERS_V2_1 args; + ENABLE_DISP_POWER_GATING_PS_ALLOCATION args; memset(&args, 0, sizeof(args)); @@ -178,7 +178,7 @@ void amdgpu_atombios_crtc_powergate(struct drm_crtc *crtc, int state) void amdgpu_atombios_crtc_powergate_init(struct amdgpu_device *adev) { int index = GetIndexIntoMasterTable(COMMAND, EnableDispPowerGating); - ENABLE_DISP_POWER_GATING_PARAMETERS_V2_1 args; + ENABLE_DISP_POWER_GATING_PS_ALLOCATION args; memset(&args, 0, sizeof(args)); |
