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

Commit cbdb7f99 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/sde: update 1.8G BW vote during cont-splash"

parents 61f16b84 b0a25be0

drivers/gpu/drm/msm/sde/sde_kms.c

+15 −0
Original line number Diff line number Diff line
@@ -699,6 +699,14 @@ static void sde_kms_complete_commit(struct msm_kms *kms, 
		rc = _sde_kms_splash_smmu_unmap(sde_kms);

		SDE_DEBUG("Disabling cont_splash feature\n");

		sde_kms->splash_data.cont_splash_en = false;



		for (i = 0; i < SDE_POWER_HANDLE_DBUS_ID_MAX; i++)

			sde_power_data_bus_set_quota(&priv->phandle,

				sde_kms->core_client,

				SDE_POWER_HANDLE_DATA_BUS_CLIENT_RT, i,

				SDE_POWER_HANDLE_ENABLE_BUS_AB_QUOTA,

				SDE_POWER_HANDLE_ENABLE_BUS_IB_QUOTA);



		sde_power_resource_enable(&priv->phandle,

				sde_kms->core_client, false);

		SDE_DEBUG("removing Vote for MDP Resources\n");
@@ -2818,6 +2826,13 @@ static int sde_kms_hw_init(struct msm_kms *kms) 
		goto error;

	}



	for (i = 0; i < SDE_POWER_HANDLE_DBUS_ID_MAX; i++)

		sde_power_data_bus_set_quota(&priv->phandle,

			sde_kms->core_client,

			SDE_POWER_HANDLE_DATA_BUS_CLIENT_RT, i,

			SDE_POWER_HANDLE_CONT_SPLASH_BUS_AB_QUOTA,

			SDE_POWER_HANDLE_CONT_SPLASH_BUS_IB_QUOTA);



	_sde_kms_core_hw_rev_init(sde_kms);



	pr_info("sde hardware revision:0x%x\n", sde_kms->core_rev);

drivers/gpu/drm/msm/sde_power_handle.h

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ 
#define SDE_POWER_HANDLE_ENABLE_NRT_BUS_IB_QUOTA	0

#define SDE_POWER_HANDLE_DISABLE_BUS_IB_QUOTA	0



#define SDE_POWER_HANDLE_CONT_SPLASH_BUS_IB_QUOTA	1800000000

#define SDE_POWER_HANDLE_CONT_SPLASH_BUS_AB_QUOTA	1800000000



#include <linux/sde_io_util.h>



/* event will be triggered before power handler disable */