File drivers/gpu/alga/amd/dce6/mod.c changed (mode: 100644) (index 48604d2..3f37b67) |
... |
... |
static long dps_connected_dpcd_info(struct dce6 *dce) |
314 |
314 |
return 0; |
return 0; |
315 |
315 |
} |
} |
316 |
316 |
|
|
|
317 |
|
static void dps_used_active_info(struct dce6 *dce, u8 *active_cnt, |
|
318 |
|
u8 *active_first) |
|
319 |
|
{ |
|
320 |
|
u8 i; |
|
321 |
|
|
|
322 |
|
*active_cnt = 0; |
|
323 |
|
*active_first = 0; |
|
324 |
|
|
|
325 |
|
for (i = 0; i < dce->ddev.crtcs_n; ++i) { |
|
326 |
|
if ((dce->dps_used & BIT(i)) == 0) |
|
327 |
|
continue; |
|
328 |
|
|
|
329 |
|
if (dce->dps[i].active) |
|
330 |
|
++(*active_cnt); |
|
331 |
|
} |
|
332 |
|
|
|
333 |
|
if (!*active_cnt) |
|
334 |
|
return; |
|
335 |
|
|
|
336 |
|
for (i = 0; i < dce->ddev.crtcs_n; ++i) { |
|
337 |
|
if ((dce->dps_used & BIT(i)) == 0) |
|
338 |
|
continue; |
|
339 |
|
|
|
340 |
|
if (dce->dps[i].active) { |
|
341 |
|
*active_first = i; |
|
342 |
|
return; |
|
343 |
|
} |
|
344 |
|
} |
|
345 |
|
} |
|
346 |
|
|
317 |
347 |
long dce6_sink_mode_set(struct dce6 *dce, u8 i, struct dce_db_fb *db_fb) |
long dce6_sink_mode_set(struct dce6 *dce, u8 i, struct dce_db_fb *db_fb) |
318 |
348 |
{ |
{ |
319 |
349 |
long r; |
long r; |
320 |
350 |
struct sink_db_fb sink_db_fb; |
struct sink_db_fb sink_db_fb; |
321 |
351 |
struct alga_timing ts[ALGA_TIMINGS_MAX]; |
struct alga_timing ts[ALGA_TIMINGS_MAX]; |
322 |
352 |
u8 pixel_fmt; |
u8 pixel_fmt; |
|
353 |
|
u8 active_cnt; |
|
354 |
|
u8 active_first; |
323 |
355 |
|
|
324 |
356 |
lock(dce); |
lock(dce); |
325 |
357 |
|
|
|
... |
... |
long dce6_sink_mode_set(struct dce6 *dce, u8 i, struct dce_db_fb *db_fb) |
376 |
408 |
} |
} |
377 |
409 |
|
|
378 |
410 |
r = sink_mode_set(dce, i, &sink_db_fb); |
r = sink_mode_set(dce, i, &sink_db_fb); |
|
411 |
|
if (r == -DCE6_ERR) |
|
412 |
|
goto unlock; |
|
413 |
|
|
|
414 |
|
dce->dps[i].active = 1; |
|
415 |
|
|
|
416 |
|
dps_used_active_info(dce, &active_cnt, &active_first); |
|
417 |
|
|
|
418 |
|
/* this is some dynamic power management related notification */ |
|
419 |
|
dce->ddev.dyn_pm_new_display_notify(dce->ddev.dev, active_cnt, |
|
420 |
|
active_first); |
379 |
421 |
unlock: |
unlock: |
380 |
422 |
unlock(dce); |
unlock(dce); |
381 |
423 |
return r; |
return r; |
|
... |
... |
long dce6_dp_dpm(struct dce6 *dce, u8 i) |
398 |
440 |
goto unlock; |
goto unlock; |
399 |
441 |
} |
} |
400 |
442 |
r = dp_dpm_off(dce, i); |
r = dp_dpm_off(dce, i); |
|
443 |
|
if (r == -DCE6_ERR) |
|
444 |
|
goto unlock; |
|
445 |
|
|
|
446 |
|
dce->dps[i].active = 0; |
|
447 |
|
|
401 |
448 |
unlock: |
unlock: |
402 |
449 |
unlock(dce); |
unlock(dce); |
403 |
450 |
return r; |
return r; |
File drivers/gpu/alga/amd/si/dyn_pm/dyn_pm.c changed (mode: 100644) (index 56ea94e..2f10e4a) |
... |
... |
static void sstp_program(struct pci_dev *dev) |
424 |
424 |
| set(CS_SST, SSTP_SST_DEFAULT), CG_SSP); |
| set(CS_SST, SSTP_SST_DEFAULT), CG_SSP); |
425 |
425 |
} |
} |
426 |
426 |
|
|
427 |
|
#define DISP_GAP_VBLANK_OR_WM 0 |
|
428 |
|
#define DISP_GAP_VBLANK 1 |
|
429 |
|
#define DISP_GAP_WATERMARK 2 |
|
430 |
|
#define DISP_GAP_IGNORE 3 |
|
431 |
427 |
static void display_gap_ena(struct pci_dev *dev) |
static void display_gap_ena(struct pci_dev *dev) |
432 |
428 |
{ |
{ |
433 |
429 |
u32 cg_disp_gap_ctl; |
u32 cg_disp_gap_ctl; |
|
... |
... |
static void display_gap_ena(struct pci_dev *dev) |
435 |
431 |
cg_disp_gap_ctl = rr32(dev, CG_DISP_GAP_CTL); |
cg_disp_gap_ctl = rr32(dev, CG_DISP_GAP_CTL); |
436 |
432 |
|
|
437 |
433 |
cg_disp_gap_ctl &= ~(CDGC_DISP1_GAP | CDGC_DISP2_GAP); |
cg_disp_gap_ctl &= ~(CDGC_DISP1_GAP | CDGC_DISP2_GAP); |
438 |
|
cg_disp_gap_ctl |= set(CDGC_DISP1_GAP, DISP_GAP_IGNORE) |
|
439 |
|
| set(CDGC_DISP2_GAP, DISP_GAP_IGNORE); |
|
|
434 |
|
cg_disp_gap_ctl |= set(CDGC_DISP1_GAP, CDGC_IGNORE) |
|
435 |
|
| set(CDGC_DISP2_GAP, CDGC_IGNORE); |
440 |
436 |
|
|
441 |
437 |
cg_disp_gap_ctl &= ~(CDGC_DISP1_GAP_MCHG | CDGC_DISP2_GAP_MCHG); |
cg_disp_gap_ctl &= ~(CDGC_DISP1_GAP_MCHG | CDGC_DISP2_GAP_MCHG); |
442 |
|
cg_disp_gap_ctl |= set(CDGC_DISP1_GAP_MCHG, DISP_GAP_VBLANK) |
|
443 |
|
| set(CDGC_DISP2_GAP_MCHG, DISP_GAP_IGNORE); |
|
|
438 |
|
cg_disp_gap_ctl |= set(CDGC_DISP1_GAP_MCHG, CDGC_VBLANK) |
|
439 |
|
| set(CDGC_DISP2_GAP_MCHG, CDGC_IGNORE); |
444 |
440 |
LOG("display gap programming, CG_DISP_GAP_CTL=0x%08x", cg_disp_gap_ctl); |
LOG("display gap programming, CG_DISP_GAP_CTL=0x%08x", cg_disp_gap_ctl); |
445 |
441 |
wr32(dev, cg_disp_gap_ctl, CG_DISP_GAP_CTL); |
wr32(dev, cg_disp_gap_ctl, CG_DISP_GAP_CTL); |
446 |
442 |
} |
} |
447 |
443 |
|
|
|
444 |
|
/* |
|
445 |
|
* Callback for DCE code to notify the dynamic power management related |
|
446 |
|
* hardware. This hardware block is insane once you think more than 1/2 |
|
447 |
|
* display/s... |
|
448 |
|
*/ |
|
449 |
|
void dyn_pm_new_display_notify(struct device *dev, u8 dps_active_cnt, |
|
450 |
|
u8 dps_active_first) |
|
451 |
|
{ |
|
452 |
|
struct pci_dev *pdev; |
|
453 |
|
u32 cg_disp_gap_ctl; |
|
454 |
|
u32 dccg_disp_slow_select; |
|
455 |
|
u32 pipe; |
|
456 |
|
long r; |
|
457 |
|
|
|
458 |
|
pdev = container_of(dev, struct pci_dev, dev); |
|
459 |
|
|
|
460 |
|
cg_disp_gap_ctl = rr32(pdev, CG_DISP_GAP_CTL); |
|
461 |
|
cg_disp_gap_ctl &= ~(CDGC_DISP1_GAP | CDGC_DISP2_GAP); |
|
462 |
|
|
|
463 |
|
if (dps_active_cnt) { |
|
464 |
|
cg_disp_gap_ctl |= set(CDGC_DISP1_GAP, |
|
465 |
|
CDGC_VBLANK_OR_WATERMARK); |
|
466 |
|
pipe = dps_active_first; |
|
467 |
|
} else { |
|
468 |
|
cg_disp_gap_ctl |= set(CDGC_DISP1_GAP, CDGC_IGNORE); |
|
469 |
|
pipe = 0; |
|
470 |
|
} |
|
471 |
|
|
|
472 |
|
if (dps_active_cnt >= 2) |
|
473 |
|
cg_disp_gap_ctl |= set(CDGC_DISP2_GAP, |
|
474 |
|
CDGC_VBLANK_OR_WATERMARK); |
|
475 |
|
else |
|
476 |
|
cg_disp_gap_ctl |= set(CDGC_DISP2_GAP, CDGC_IGNORE); |
|
477 |
|
|
|
478 |
|
/*-------------------------------------------------------------------*/ |
|
479 |
|
|
|
480 |
|
wr32(pdev, cg_disp_gap_ctl, CG_DISP_GAP_CTL); |
|
481 |
|
|
|
482 |
|
dccg_disp_slow_select = rr32(pdev, DCCG_DISP_SLOW_SELECT); |
|
483 |
|
dccg_disp_slow_select &= ~DDSSR_DISP1_SLOW_SELECT; |
|
484 |
|
dccg_disp_slow_select |= set(DDSSR_DISP1_SLOW_SELECT, pipe); |
|
485 |
|
wr32(pdev, dccg_disp_slow_select, DCCG_DISP_SLOW_SELECT); |
|
486 |
|
|
|
487 |
|
/*-------------------------------------------------------------------*/ |
|
488 |
|
|
|
489 |
|
/* |
|
490 |
|
* XXX: always tell the smc we have displays in order to use GPU |
|
491 |
|
* to full performance even with no connected displays |
|
492 |
|
*/ |
|
493 |
|
r = smc_msg(pdev, SMC_MSG_HAS_DISPLAY); |
|
494 |
|
if (r == -SI_ERR) |
|
495 |
|
dev_err(dev, "dyn_pm:display_notify:smc:unable to notify the smc of display new configuration\n"); |
|
496 |
|
} |
|
497 |
|
|
448 |
498 |
#define VRC_DEFAULT 0xc000b3 |
#define VRC_DEFAULT 0xc000b3 |
449 |
499 |
static void vc_program(struct pci_dev *dev) |
static void vc_program(struct pci_dev *dev) |
450 |
500 |
{ |
{ |
File drivers/gpu/alga/amd/si/regs.h changed (mode: 100644) (index 9d3982e..cbc339f) |
... |
... |
static inline u32 get(u32 mask, u32 v) |
35 |
35 |
|
|
36 |
36 |
#define MM_IDX_HI 0x18 |
#define MM_IDX_HI 0x18 |
37 |
37 |
|
|
38 |
|
#define CG_ENG_PLL_AUTOSCALE_CTL 0x62c |
|
39 |
|
#define CEPAC_AUTOSCALE_ON_SS_CLR BIT(9) |
|
|
38 |
|
#define DCCG_DISP_SLOW_SELECT 0x4fc |
|
39 |
|
#define DDSSR_DISP1_SLOW_SELECT 0x00000007 |
|
40 |
|
#define DDSSR_DISP2_SLOW_SELECT 0x00000070 |
40 |
41 |
|
|
41 |
42 |
#define CG_ENG_PLL_FUNC_CTL_0 0x600 |
#define CG_ENG_PLL_FUNC_CTL_0 0x600 |
42 |
43 |
#define CEPFC0_RESET BIT(0) |
#define CEPFC0_RESET BIT(0) |
|
... |
... |
static inline u32 get(u32 mask, u32 v) |
57 |
58 |
#define CG_ENG_PLL_SS_1 0x624 |
#define CG_ENG_PLL_SS_1 0x624 |
58 |
59 |
#define CEPS1_CLK_V 0x03ffffff |
#define CEPS1_CLK_V 0x03ffffff |
59 |
60 |
|
|
|
61 |
|
#define CG_ENG_PLL_AUTOSCALE_CTL 0x62c |
|
62 |
|
#define CEPAC_AUTOSCALE_ON_SS_CLR BIT(9) |
|
63 |
|
|
60 |
64 |
#define CG_CLK_PIN_CTL_0 0x660 |
#define CG_CLK_PIN_CTL_0 0x660 |
61 |
65 |
#define CCC0_XTAL_IN_DIVIDE BIT(1) |
#define CCC0_XTAL_IN_DIVIDE BIT(1) |
62 |
66 |
#define CCC0_BCLK_AS_XCLK BIT(2) |
#define CCC0_BCLK_AS_XCLK BIT(2) |
|
... |
... |
static inline u32 get(u32 mask, u32 v) |
143 |
147 |
#define CG_DISP_GAP_CTL 0x828 |
#define CG_DISP_GAP_CTL 0x828 |
144 |
148 |
#define CDGC_DISP1_GAP 0x00000003 |
#define CDGC_DISP1_GAP 0x00000003 |
145 |
149 |
#define CDGC_DISP2_GAP 0x0000000c |
#define CDGC_DISP2_GAP 0x0000000c |
|
150 |
|
#define CDGC_VBLANK_OR_WATERMARK 0 |
|
151 |
|
#define CDGC_VBLANK 1 |
|
152 |
|
#define CDGC_WATERMARK 2 |
|
153 |
|
#define CDGC_IGNORE 3 |
146 |
154 |
#define CDGC_VBI_TIMER_CNT 0x0003fff0 |
#define CDGC_VBI_TIMER_CNT 0x0003fff0 |
147 |
155 |
#define CDGC_VBI_TIMER_UNIT 0x00700000 |
#define CDGC_VBI_TIMER_UNIT 0x00700000 |
148 |
156 |
#define CDGC_DISP1_GAP_MCHG 0x03000000 |
#define CDGC_DISP1_GAP_MCHG 0x03000000 |