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

Commit c838d719 authored by Joonas Lahtinen's avatar Joonas Lahtinen Committed by Daniel Vetter
Browse files

drm/i915: Decouple struct i915_params i915 into i915_params.h 



Otherwise usage in the i915 debug macros yields problems due to
i915_drv.h <-> i915_trace.h <-> intel_drv.h include loops.

v2:
- Document not-so-obvious need for linux/cache.h (Chris)

Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1450436898-20408-2-git-send-email-joonas.lahtinen@linux.intel.com


Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 1a5a9ce7

drivers/gpu/drm/i915/i915_drv.h

+2 −38
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <uapi/drm/drm_fourcc.h>



#include <drm/drmP.h>

#include "i915_params.h"

#include "i915_reg.h"

#include "intel_bios.h"

#include "intel_ringbuffer.h"
@@ -2670,43 +2671,6 @@ extern int i915_max_ioctl; 
extern int i915_suspend_switcheroo(struct drm_device *dev, pm_message_t state);

extern int i915_resume_switcheroo(struct drm_device *dev);



/* i915_params.c */

struct i915_params {

	int modeset;

	int panel_ignore_lid;

	int semaphores;

	int lvds_channel_mode;

	int panel_use_ssc;

	int vbt_sdvo_panel_type;

	int enable_rc6;

	int enable_dc;

	int enable_fbc;

	int enable_ppgtt;

	int enable_execlists;

	int enable_psr;

	unsigned int preliminary_hw_support;

	int disable_power_well;

	int enable_ips;

	int invert_brightness;

	int enable_cmd_parser;

	/* leave bools at the end to not create holes */

	bool enable_hangcheck;

	bool fastboot;

	bool prefault_disable;

	bool load_detect_test;

	bool reset;

	bool disable_display;

	bool disable_vtd_wa;

	bool enable_guc_submission;

	int guc_log_level;

	int use_mmio_flip;

	int mmio_debug;

	bool verbose_state_checks;

	bool nuclear_pageflip;

	int edp_vswing;

};

extern struct i915_params i915 __read_mostly;



/* i915_dma.c */

extern int i915_driver_load(struct drm_device *, unsigned long flags);

extern int i915_driver_unload(struct drm_device *);

drivers/gpu/drm/i915/i915_params.c

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
 * IN THE SOFTWARE.

 */



#include "i915_params.h"

#include "i915_drv.h"



struct i915_params i915 __read_mostly = {

drivers/gpu/drm/i915/i915_params.h

0 → 100644
+68 −0
Original line number Diff line number Diff line 
/*

 * Copyright © 2015 Intel Corporation

 *

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

 *

 */



#ifndef _I915_PARAMS_H_

#define _I915_PARAMS_H_



#include <linux/cache.h> /* for __read_mostly */



struct i915_params {

	int modeset;

	int panel_ignore_lid;

	int semaphores;

	int lvds_channel_mode;

	int panel_use_ssc;

	int vbt_sdvo_panel_type;

	int enable_rc6;

	int enable_dc;

	int enable_fbc;

	int enable_ppgtt;

	int enable_execlists;

	int enable_psr;

	unsigned int preliminary_hw_support;

	int disable_power_well;

	int enable_ips;

	int invert_brightness;

	int enable_cmd_parser;

	/* leave bools at the end to not create holes */

	bool enable_hangcheck;

	bool fastboot;

	bool prefault_disable;

	bool load_detect_test;

	bool reset;

	bool disable_display;

	bool disable_vtd_wa;

	bool enable_guc_submission;

	int guc_log_level;

	int use_mmio_flip;

	int mmio_debug;

	bool verbose_state_checks;

	bool nuclear_pageflip;

	int edp_vswing;

};



extern struct i915_params i915 __read_mostly;



#endif