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

Commit 058a9b43 authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Chris Wilson
Browse files

drm/i915: Make header i915_pmu.h more robust 



Definitions in i915_pmu.h header depend on other types and
declarations that were not explicitly included. Fix that by
adding related headers and forward declarations.
While here, change license text to SPDX format.

v2: don't drop "intel_ringbuffer.h" (Tvrtko)

Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20180308095037.18264-4-michal.wajdeczko@intel.com
parent c5781351

drivers/gpu/drm/i915/i915_pmu.c

+3 −24
Original line number Original line Diff line number Diff line 
/*

/*

 * Copyright © 2017 Intel Corporation

 * SPDX-License-Identifier: MIT

 *

 * 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 (including the next

 * paragraph) 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.

 *

 *

 * Copyright © 2017-2018 Intel Corporation

 */

 */





#include <linux/perf_event.h>

#include <linux/pm_runtime.h>



#include "i915_drv.h"

#include "i915_pmu.h"

#include "i915_pmu.h"

#include "intel_ringbuffer.h"

#include "intel_ringbuffer.h"

#include "i915_drv.h"





/* Frequency for the sampling timer for events which need it. */

/* Frequency for the sampling timer for events which need it. */

#define FREQUENCY 200

#define FREQUENCY 200

drivers/gpu/drm/i915/i915_pmu.h

+10 −20
Original line number Original line Diff line number Diff line 
/*

/*

 * Copyright © 2017 Intel Corporation

 * SPDX-License-Identifier: MIT

 *

 * 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 (including the next

 * paragraph) 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.

 *

 *

 * Copyright © 2017-2018 Intel Corporation

 */

 */



#ifndef __I915_PMU_H__

#ifndef __I915_PMU_H__

#define __I915_PMU_H__

#define __I915_PMU_H__





#include <linux/hrtimer.h>

#include <linux/perf_event.h>

#include <linux/spinlock_types.h>

#include <drm/i915_drm.h>



struct drm_i915_private;



enum {

enum {

	__I915_SAMPLE_FREQ_ACT = 0,

	__I915_SAMPLE_FREQ_ACT = 0,

	__I915_SAMPLE_FREQ_REQ,

	__I915_SAMPLE_FREQ_REQ,