Commit abffa715 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: rename intel_sideband.[ch] to intel_sbi.[ch] 



Now that intel_sideband.[ch] has been decluttered, it's pure lpt/wpt
iosf sideband. Let's call it intel_sbi, following the function naming.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/183423ff23b2d259e4a197e74daf6bcd750bfe14.1634207064.git.jani.nikula@intel.com
parent 4dd4375b

drivers/gpu/drm/i915/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ i915-y += i915_drv.o \ 
	  intel_pm.o \

	  intel_region_ttm.o \

	  intel_runtime_pm.o \

	  intel_sideband.o \

	  intel_sbi.o \

	  intel_step.o \

	  intel_uncore.o \

	  intel_wakeref.o \

drivers/gpu/drm/i915/display/intel_display.c

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ 
#include "intel_pps.h"

#include "intel_psr.h"

#include "intel_quirks.h"

#include "intel_sideband.h"

#include "intel_sbi.h"

#include "intel_sprite.h"

#include "intel_tc.h"

#include "intel_vga.h"

drivers/gpu/drm/i915/display/intel_fdi.c

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
#include "intel_de.h"

#include "intel_display_types.h"

#include "intel_fdi.h"

#include "intel_sideband.h"

#include "intel_sbi.h"



static void assert_fdi_tx(struct drm_i915_private *dev_priv,

			  enum pipe pipe, bool state)

drivers/gpu/drm/i915/intel_sideband.c→drivers/gpu/drm/i915/intel_sbi.c

+4 −23
Original line number Diff line number Diff line 
// SPDX-License-Identifier: MIT

/*

 * Copyright © 2013 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.

 * Copyright © 2013-2021 Intel Corporation

 *

 * LPT/WPT IOSF sideband.

 */



#include <asm/iosf_mbi.h>



#include "i915_drv.h"

#include "intel_sideband.h"

#include "intel_sbi.h"



/* SBI access */

static int intel_sbi_rw(struct drm_i915_private *i915, u16 reg,

drivers/gpu/drm/i915/intel_sideband.h→drivers/gpu/drm/i915/intel_sbi.h

+6 −3
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: MIT */

/*

 * Copyright © 2013-2021 Intel Corporation

 */



#ifndef _INTEL_SIDEBAND_H_

#define _INTEL_SIDEBAND_H_

#ifndef _INTEL_SBI_H_

#define _INTEL_SBI_H_



#include <linux/types.h>
@@ -17,4 +20,4 @@ u32 intel_sbi_read(struct drm_i915_private *i915, u16 reg, 
void intel_sbi_write(struct drm_i915_private *i915, u16 reg, u32 value,

		     enum intel_sbi_destination destination);



#endif /* _INTEL_SIDEBAND_H */
 
#endif /* _INTEL_SBI_H_ */