drm/nouveau/volt/gk20a: share reusable members & functions (0f952093) · Commits · 戴 / test

drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk20a.c

+6 −18

Original line number	Diff line number	Diff line
		@@ -24,21 +24,9 @@

		#include <core/tegra.h>

		struct cvb_coef {
		int c0;
		int c1;
		int c2;
		int c3;
		int c4;
		int c5;
		};

		struct gk20a_volt {
		struct nvkm_volt base;
		struct regulator *vdd;
		};
		#include "gk20a.h"

		const struct cvb_coef gk20a_cvb_coef[] = {
		static const struct cvb_coef gk20a_cvb_coef[] = {
		/* MHz, c0, c1, c2, c3, c4, c5 */
		/* 72 */ { 1209886, -36468, 515, 417, -13123, 203},
		/* 108 */ { 1130804, -27659, 296, 298, -10834, 221},
		@@ -89,7 +77,7 @@ gk20a_volt_get_cvb_t_voltage(int speedo, int temp, int s_scale, int t_scale,
		return mv;
		}

		static int
		int
		gk20a_volt_calc_voltage(const struct cvb_coef *coef, int speedo)
		{
		int mv;
		@@ -100,7 +88,7 @@ gk20a_volt_calc_voltage(const struct cvb_coef *coef, int speedo)
		return mv * 1000;
		}

		static int
		int
		gk20a_volt_vid_get(struct nvkm_volt *base)
		{
		struct gk20a_volt *volt = gk20a_volt(base);
		@@ -115,7 +103,7 @@ gk20a_volt_vid_get(struct nvkm_volt *base)
		return -EINVAL;
		}

		static int
		int
		gk20a_volt_vid_set(struct nvkm_volt *base, u8 vid)
		{
		struct gk20a_volt *volt = gk20a_volt(base);
		@@ -125,7 +113,7 @@ gk20a_volt_vid_set(struct nvkm_volt *base, u8 vid)
		return regulator_set_voltage(volt->vdd, volt->base.vid[vid].uv, 1200000);
		}

		static int
		int
		gk20a_volt_set_id(struct nvkm_volt *base, u8 id, int condition)
		{
		struct gk20a_volt *volt = gk20a_volt(base);

drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk20a.h

0 → 100644

+45 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved.
		*
		* Permission is hereby granted, free of charge, to any person obtaining a
		* copy of this software and associated documentation files (the "Software"),
		* to deal in the Software without restriction, including without limitation
		* the rights to use, copy, modify, merge, publish, distribute, sublicense,
		* and/or sell copies of the Software, and to permit persons to whom the
		* Software is furnished to do so, subject to the following conditions:
		*
		* The above copyright notice and this permission notice shall be included in
		* all copies or substantial portions of the Software.
		*
		* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
		* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
		* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
		* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
		* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
		* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
		* DEALINGS IN THE SOFTWARE.
		*/

		#ifndef __GK20A_VOLT_H__
		#define __GK20A_VOLT_H__

		struct cvb_coef {
		int c0;
		int c1;
		int c2;
		int c3;
		int c4;
		int c5;
		};

		struct gk20a_volt {
		struct nvkm_volt base;
		struct regulator *vdd;
		};

		int gk20a_volt_calc_voltage(const struct cvb_coef *coef, int speedo);
		int gk20a_volt_vid_get(struct nvkm_volt *volt);
		int gk20a_volt_vid_set(struct nvkm_volt *volt, u8 vid);
		int gk20a_volt_set_id(struct nvkm_volt *volt, u8 id, int condition);

		#endif

Admin message