diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-05-21 09:41:33 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-05-21 09:41:33 +1000 |
| commit | a3f6902672c9fa3868722ef6ab8a7dd9141def6a (patch) | |
| tree | d5067d8752d7d5f29213168a589d025d3b7100e7 /drivers/gpu/drm/radeon/atombios_crtc.c | |
| parent | b7cb1c50c828adaee95e8ada0e55918686245992 (diff) | |
| parent | 731da21b7b205efb388481f7a9731c4c1ca3b48c (diff) | |
| download | kernel_goldelico_gta04-a3f6902672c9fa3868722ef6ab8a7dd9141def6a.zip kernel_goldelico_gta04-a3f6902672c9fa3868722ef6ab8a7dd9141def6a.tar.gz kernel_goldelico_gta04-a3f6902672c9fa3868722ef6ab8a7dd9141def6a.tar.bz2 | |
Merge branch 'drm-fixes-3.10' of git://people.freedesktop.org/~agd5f/linux into drm-next
Minor bug fixes.
* 'drm-fixes-3.10' of git://people.freedesktop.org/~agd5f/linux:
drm/radeon/dce2: use 10khz units for audio dto calculation
drm/radeon: Fix VRAM size calculation for VRAM >= 4GB
drm/radeon: Remove superfluous variable
Diffstat (limited to 'drivers/gpu/drm/radeon/atombios_crtc.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/atombios_crtc.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c index 6d6fdb3..d5df8fd 100644 --- a/drivers/gpu/drm/radeon/atombios_crtc.c +++ b/drivers/gpu/drm/radeon/atombios_crtc.c @@ -1811,12 +1811,9 @@ static bool atombios_crtc_mode_fixup(struct drm_crtc *crtc, static void atombios_crtc_prepare(struct drm_crtc *crtc) { - struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc); struct drm_device *dev = crtc->dev; struct radeon_device *rdev = dev->dev_private; - radeon_crtc->in_mode_set = true; - /* disable crtc pair power gating before programming */ if (ASIC_IS_DCE6(rdev)) atombios_powergate_crtc(crtc, ATOM_DISABLE); @@ -1827,11 +1824,8 @@ static void atombios_crtc_prepare(struct drm_crtc *crtc) static void atombios_crtc_commit(struct drm_crtc *crtc) { - struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc); - atombios_crtc_dpms(crtc, DRM_MODE_DPMS_ON); atombios_lock_crtc(crtc, ATOM_DISABLE); - radeon_crtc->in_mode_set = false; } static void atombios_crtc_disable(struct drm_crtc *crtc) |