On Tue, May 14, 2013 at 4:27 PM, Niels Ole Salscheider
<niels_ole@xxxxxxxxxxxxxxxxxxxxx> wrote:
> bool in_mode_set from struct radeon_crtc is not used anymore.
>
> Signed-off-by: Niels Ole Salscheider <niels_ole@xxxxxxxxxxxxxxxxxxxxx>
Applied. thanks!
Alex
> ---
> drivers/gpu/drm/radeon/atombios_crtc.c | 6 ------
> drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 4 ----
> drivers/gpu/drm/radeon/radeon_mode.h | 1 -
> 3 files changed, 11 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)
> diff --git a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
> index 6857cb4..7cb178a 100644
> --- a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
> +++ b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
> @@ -1031,11 +1031,9 @@ static int radeon_crtc_mode_set(struct drm_crtc *crtc,
>
> static void radeon_crtc_prepare(struct drm_crtc *crtc)
> {
> - struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);
> struct drm_device *dev = crtc->dev;
> struct drm_crtc *crtci;
>
> - radeon_crtc->in_mode_set = true;
> /*
> * The hardware wedges sometimes if you reconfigure one CRTC
> * whilst another is running (see fdo bug #24611).
> @@ -1046,7 +1044,6 @@ static void radeon_crtc_prepare(struct drm_crtc *crtc)
>
> static void radeon_crtc_commit(struct drm_crtc *crtc)
> {
> - struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);
> struct drm_device *dev = crtc->dev;
> struct drm_crtc *crtci;
>
> @@ -1057,7 +1054,6 @@ static void radeon_crtc_commit(struct drm_crtc *crtc)
> if (crtci->enabled)
> radeon_crtc_dpms(crtci, DRM_MODE_DPMS_ON);
> }
> - radeon_crtc->in_mode_set = false;
> }
>
> static const struct drm_crtc_helper_funcs legacy_helper_funcs = {
> diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h
> index 44e579e..69ad4fe 100644
> --- a/drivers/gpu/drm/radeon/radeon_mode.h
> +++ b/drivers/gpu/drm/radeon/radeon_mode.h
> @@ -302,7 +302,6 @@ struct radeon_crtc {
> u16 lut_r[256], lut_g[256], lut_b[256];
> bool enabled;
> bool can_tile;
> - bool in_mode_set;
> uint32_t crtc_offset;
> struct drm_gem_object *cursor_bo;
> uint64_t cursor_addr;
> --
> 1.8.2.3
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@xxxxxxxxxxxxxxxxxxxxx
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/dri-devel
