Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ab76310 authored by Niels Ole Salscheider's avatar Niels Ole Salscheider Committed by Alex Deucher
Browse files

drm/radeon: Remove superfluous variable 



bool in_mode_set from struct radeon_crtc is not used anymore.

Signed-off-by: default avatarNiels Ole Salscheider <niels_ole@salscheider-online.de>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b7cb1c50

drivers/gpu/drm/radeon/atombios_crtc.c

+0 −6
Original line number Diff line number Diff line
@@ -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)

drivers/gpu/drm/radeon/radeon_legacy_crtc.c

+0 −4
Original line number Diff line number Diff line
@@ -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 = {

drivers/gpu/drm/radeon/radeon_mode.h

+0 −1
Original line number Diff line number Diff line
@@ -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;