Skip to content

Commit 98f3a1d

Browse files
jnikulajnikula
committed
drm/i915/bios: prefer using dev_priv over dev pointer
dev_priv is the new black. Or something. Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1450271061-32646-3-git-send-email-jani.nikula@intel.com
1 parent 3556dd4 commit 98f3a1d

File tree

3 files changed

+11
-15
lines changed

3 files changed

+11
-15
lines changed

‎drivers/gpu/drm/i915/i915_dma.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ static int i915_load_modeset_init(struct drm_device *dev)
370370
struct drm_i915_private *dev_priv = dev->dev_private;
371371
int ret;
372372

373-
ret = intel_bios_init(dev);
373+
ret = intel_bios_init(dev_priv);
374374
if (ret)
375375
DRM_INFO("failed to find VBIOS tables\n");
376376

‎drivers/gpu/drm/i915/i915_drv.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3355,7 +3355,7 @@ static inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter)
33553355
extern void intel_i2c_reset(struct drm_device *dev);
33563356

33573357
/* intel_bios.c */
3358-
int intel_bios_init(struct drm_device *dev);
3358+
int intel_bios_init(struct drm_i915_private *dev_priv);
33593359
bool intel_bios_is_valid_vbt(const void *buf, size_t size);
33603360

33613361
/* intel_opregion.c */

‎drivers/gpu/drm/i915/intel_bios.c

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -332,10 +332,10 @@ parse_sdvo_panel_data(struct drm_i915_private *dev_priv,
332332
drm_mode_debug_printmodeline(panel_fixed_mode);
333333
}
334334

335-
static int intel_bios_ssc_frequency(struct drm_device *dev,
335+
static int intel_bios_ssc_frequency(struct drm_i915_private *dev_priv,
336336
bool alternate)
337337
{
338-
switch (INTEL_INFO(dev)->gen) {
338+
switch (INTEL_INFO(dev_priv)->gen) {
339339
case 2:
340340
return alternate ? 66667 : 48000;
341341
case 3:
@@ -350,7 +350,6 @@ static void
350350
parse_general_features(struct drm_i915_private *dev_priv,
351351
const struct bdb_header *bdb)
352352
{
353-
struct drm_device *dev = dev_priv->dev;
354353
const struct bdb_general_features *general;
355354

356355
general = find_section(bdb, BDB_GENERAL_FEATURES);
@@ -362,7 +361,7 @@ parse_general_features(struct drm_i915_private *dev_priv,
362361
dev_priv->vbt.int_crt_support = general->int_crt_support;
363362
dev_priv->vbt.lvds_use_ssc = general->enable_ssc;
364363
dev_priv->vbt.lvds_ssc_freq =
365-
intel_bios_ssc_frequency(dev, general->ssc_freq);
364+
intel_bios_ssc_frequency(dev_priv, general->ssc_freq);
366365
dev_priv->vbt.display_clock_mode = general->display_clock_mode;
367366
dev_priv->vbt.fdi_rx_polarity_inverted = general->fdi_rx_polarity_inverted;
368367
DRM_DEBUG_KMS("BDB_GENERAL_FEATURES int_tv_support %d int_crt_support %d lvds_use_ssc %d lvds_ssc_freq %d display_clock_mode %d fdi_rx_polarity_inverted %d\n",
@@ -1057,10 +1056,9 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port,
10571056
static void parse_ddi_ports(struct drm_i915_private *dev_priv,
10581057
const struct bdb_header *bdb)
10591058
{
1060-
struct drm_device *dev = dev_priv->dev;
10611059
enum port port;
10621060

1063-
if (!HAS_DDI(dev))
1061+
if (!HAS_DDI(dev_priv))
10641062
return;
10651063

10661064
if (!dev_priv->vbt.child_dev_num)
@@ -1173,7 +1171,6 @@ parse_device_mapping(struct drm_i915_private *dev_priv,
11731171
static void
11741172
init_vbt_defaults(struct drm_i915_private *dev_priv)
11751173
{
1176-
struct drm_device *dev = dev_priv->dev;
11771174
enum port port;
11781175

11791176
dev_priv->vbt.crt_ddc_pin = GMBUS_PIN_VGADDC;
@@ -1198,8 +1195,8 @@ init_vbt_defaults(struct drm_i915_private *dev_priv)
11981195
* Core/SandyBridge/IvyBridge use alternative (120MHz) reference
11991196
* clock for LVDS.
12001197
*/
1201-
dev_priv->vbt.lvds_ssc_freq = intel_bios_ssc_frequency(dev,
1202-
!HAS_PCH_SPLIT(dev));
1198+
dev_priv->vbt.lvds_ssc_freq = intel_bios_ssc_frequency(dev_priv,
1199+
!HAS_PCH_SPLIT(dev_priv));
12031200
DRM_DEBUG_KMS("Set default to SSC at %d kHz\n", dev_priv->vbt.lvds_ssc_freq);
12041201

12051202
for (port = PORT_A; port < I915_MAX_PORTS; port++) {
@@ -1295,15 +1292,14 @@ static const struct vbt_header *find_vbt(void __iomem *bios, size_t size)
12951292
* Returns 0 on success, nonzero on failure.
12961293
*/
12971294
int
1298-
intel_bios_init(struct drm_device *dev)
1295+
intel_bios_init(struct drm_i915_private *dev_priv)
12991296
{
1300-
struct drm_i915_private *dev_priv = dev->dev_private;
1301-
struct pci_dev *pdev = dev->pdev;
1297+
struct pci_dev *pdev = dev_priv->dev->pdev;
13021298
const struct vbt_header *vbt = dev_priv->opregion.vbt;
13031299
const struct bdb_header *bdb;
13041300
u8 __iomem *bios = NULL;
13051301

1306-
if (HAS_PCH_NOP(dev))
1302+
if (HAS_PCH_NOP(dev_priv))
13071303
return -ENODEV;
13081304

13091305
init_vbt_defaults(dev_priv);

0 commit comments

Comments
 (0)