mirror of
https://github.com/torvalds/linux.git
synced 2026-04-20 07:43:57 -04:00
318e82583c
This reverts commit 0d82a0d6f5.
The commit failed to take into account that the parameter duplication
and debugfs for char * parameters were subtly different between i915
core and display, and caused the DMC and PM to be disabled. Moreover,
the patch was pushed with failing CI results. Revert, and get back to
the drawing board.
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
82 lines
3.2 KiB
C
82 lines
3.2 KiB
C
/*
|
|
* 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/bitops.h>
|
|
#include <linux/cache.h> /* for __read_mostly */
|
|
|
|
struct drm_printer;
|
|
|
|
#define ENABLE_GUC_SUBMISSION BIT(0)
|
|
#define ENABLE_GUC_LOAD_HUC BIT(1)
|
|
#define ENABLE_GUC_MASK GENMASK(1, 0)
|
|
|
|
/*
|
|
* Invoke param, a function-like macro, for each i915 param, with arguments:
|
|
*
|
|
* param(type, name, value, mode)
|
|
*
|
|
* type: parameter type, one of {bool, int, unsigned int, unsigned long, char *}
|
|
* name: name of the parameter
|
|
* value: initial/default value of the parameter
|
|
* mode: debugfs file permissions, one of {0400, 0600, 0}, use 0 to not create
|
|
* debugfs file
|
|
*/
|
|
#define I915_PARAMS_FOR_EACH(param) \
|
|
param(int, modeset, -1, 0400) \
|
|
param(int, enable_guc, -1, 0400) \
|
|
param(int, guc_log_level, -1, 0400) \
|
|
param(char *, guc_firmware_path, NULL, 0400) \
|
|
param(char *, huc_firmware_path, NULL, 0400) \
|
|
param(char *, dmc_firmware_path, NULL, 0400) \
|
|
param(char *, gsc_firmware_path, NULL, 0400) \
|
|
param(bool, memtest, false, 0400) \
|
|
param(int, mmio_debug, -IS_ENABLED(CONFIG_DRM_I915_DEBUG_MMIO), 0600) \
|
|
param(unsigned int, reset, 3, 0600) \
|
|
param(unsigned int, inject_probe_failure, 0, 0) \
|
|
param(char *, force_probe, CONFIG_DRM_I915_FORCE_PROBE, 0400) \
|
|
param(unsigned int, request_timeout_ms, CONFIG_DRM_I915_REQUEST_TIMEOUT, CONFIG_DRM_I915_REQUEST_TIMEOUT ? 0600 : 0) \
|
|
param(unsigned int, lmem_size, 0, 0400) \
|
|
param(unsigned int, lmem_bar_size, 0, 0400) \
|
|
/* leave bools at the end to not create holes */ \
|
|
param(bool, enable_hangcheck, true, 0600) \
|
|
param(bool, error_capture, true, IS_ENABLED(CONFIG_DRM_I915_CAPTURE_ERROR) ? 0600 : 0) \
|
|
param(bool, enable_gvt, false, IS_ENABLED(CONFIG_DRM_I915_GVT) ? 0400 : 0)
|
|
|
|
#define MEMBER(T, member, ...) T member;
|
|
struct i915_params {
|
|
I915_PARAMS_FOR_EACH(MEMBER);
|
|
};
|
|
#undef MEMBER
|
|
|
|
extern struct i915_params i915_modparams __read_mostly;
|
|
|
|
void i915_params_dump(const struct i915_params *params, struct drm_printer *p);
|
|
void i915_params_copy(struct i915_params *dest, const struct i915_params *src);
|
|
void i915_params_free(struct i915_params *params);
|
|
|
|
#endif
|